447 files changed, 49400 insertions, 30012 deletions

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 8ff55df..8181483 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -58,13 +58,14 @@ where we are today.
 
 
 = Additional OpenSim Contributors =
-These folks have contributed code patches to OpenSim to help make it
+These folks have contributed code patches or content to OpenSimulator to help make it
 what it is today.  
 
 * aduffy70
 * A_Biondi
 * alex_carnell
 * Alan Webb (IBM)
+* Aleric
 * Allen Kerensky
 * BigFootAg
 * BlueWall Slade
@@ -75,11 +76,12 @@ what it is today.
 * controlbreak
 * coyled
 * Daedius
-* Dong Jun Lan (IBM)
-* DoranZemlja
 * daTwitch 
 * devalnor-#708
 * dmiles (Daxtron Labs)
+* Dong Jun Lan (IBM)
+* DoranZemlja
+* dr0b3rts
 * dslake (Intel)
 * FredoChaplin
 * Garmin Kawaguichi
@@ -101,6 +103,7 @@ what it is today.
 * jhurliman
 * John R Sohn (XenReborn)
 * jonc
+* Jon Cundill
 * Junta Kohime
 * Kayne
 * Kevin Cozens
@@ -161,6 +164,7 @@ what it is today.
 * webmage (IBM)
 * Xantor
 * Y. Nitta
+* YoshikoFazuku
 * YZh
 * Zackary Geers aka Kunnis Basiat
 * Zha Ewry
@@ -213,5 +217,3 @@ In addition, we would like to thank:
 * The Mono Project
 * The NANT Developers
 * Microsoft (.NET, MSSQL-Adapters)
-*x
-  
diff --git a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
index 4642b2a..7d48516 100644
--- a/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
+++ b/OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
@@ -623,10 +623,13 @@ namespace OpenSim.Groups
                 if (agent != null)
                     break;
             }
-            if (agent == null) // oops
-                return AgentID.ToString();
+            if (agent != null)
+                return Util.ProduceUserUniversalIdentifier(agent);
+            
+            // we don't know anything about this foreign user
+            // try asking the user management module, which may know more
+            return m_UserManagement.GetUserUUI(AgentID);
 
-            return Util.ProduceUserUniversalIdentifier(agent);
         }
 
         private string AgentUUIForOutside(string AgentIDStr)
diff --git a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs
index 6f58922..d2bcba5 100644
--- a/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs
+++ b/OpenSim/Addons/Groups/Hypergrid/HGGroupsServiceRobustConnector.cs
@@ -112,7 +112,7 @@ namespace OpenSim.Groups
             m_GroupsService = service;
         }
 
-        public override byte[] Handle(string path, Stream requestData,
+        protected override byte[] ProcessRequest(string path, Stream requestData,
                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             StreamReader sr = new StreamReader(requestData);
diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs
index 7e55d3c..249d974 100644
--- a/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs
+++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRobustConnector.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Groups
             m_GroupsService = service;
         }
 
-        public override byte[] Handle(string path, Stream requestData,
+        protected override byte[] ProcessRequest(string path, Stream requestData,
                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             StreamReader sr = new StreamReader(requestData);
diff --git a/OpenSim/Addons/OfflineIM/Remote/OfflineIMServiceRobustConnector.cs b/OpenSim/Addons/OfflineIM/Remote/OfflineIMServiceRobustConnector.cs
index 2b3a01d..32c24db 100644
--- a/OpenSim/Addons/OfflineIM/Remote/OfflineIMServiceRobustConnector.cs
+++ b/OpenSim/Addons/OfflineIM/Remote/OfflineIMServiceRobustConnector.cs
@@ -75,7 +75,7 @@ namespace OpenSim.OfflineIM
             m_OfflineIMService = service;
         }
 
-        public override byte[] Handle(string path, Stream requestData,
+        protected override byte[] ProcessRequest(string path, Stream requestData,
                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             StreamReader sr = new StreamReader(requestData);
diff --git a/OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs b/OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs
index 6ba022c..6731923 100644
--- a/OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs
+++ b/OpenSim/Addons/OfflineIM/Service/OfflineIMService.cs
@@ -46,7 +46,7 @@ namespace OpenSim.OfflineIM
 {
     public class OfflineIMService : OfflineIMServiceBase, IOfflineIMService
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private const int MAX_IM = 25;
 
         private XmlSerializer m_serializer;
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
index fcb6991..1d63d26 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
@@ -115,6 +115,8 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
                 Environment.Exit(1);
             }
 
+            List<IScene> createdScenes = new List<IScene>();
+
             for (int i = 0; i < regionsToLoad.Length; i++)
             {
                 IScene scene;
@@ -123,17 +125,22 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
                             ")");
                 
                 bool changed = m_openSim.PopulateRegionEstateInfo(regionsToLoad[i]);
+
                 m_openSim.CreateRegion(regionsToLoad[i], true, out scene);
+                createdScenes.Add(scene);
+
                 if (changed)
-                  regionsToLoad[i].EstateSettings.Save();
-                
-                if (scene != null)
+                    regionsToLoad[i].EstateSettings.Save();
+            }
+
+            foreach (IScene scene in createdScenes)
+            {
+                scene.Start();
+
+                m_newRegionCreatedHandler = OnNewRegionCreated;
+                if (m_newRegionCreatedHandler != null)
                 {
-                    m_newRegionCreatedHandler = OnNewRegionCreated;
-                    if (m_newRegionCreatedHandler != null)
-                    {
-                        m_newRegionCreatedHandler(scene);
-                    }
+                    m_newRegionCreatedHandler(scene);
                 }
             }
         }
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index e50dac6..f3490fb 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -161,6 +161,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     availableMethods["admin_acl_add"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcAccessListAdd);
                     availableMethods["admin_acl_remove"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcAccessListRemove);
                     availableMethods["admin_acl_list"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcAccessListList);
+                    availableMethods["admin_estate_reload"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcEstateReload);
 
                     // Misc
                     availableMethods["admin_refresh_search"] = (req, ep) => InvokeXmlRpcMethod(req, ep, XmlRpcRefreshSearch);
@@ -438,18 +439,26 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             //                       k, (string)requestData[k], ((string)requestData[k]).Length);
             // }
 
-            CheckStringParameters(requestData, responseData, new string[] {"filename", "regionid"});
+            CheckStringParameters(requestData, responseData, new string[] { "filename" });
             CheckRegionParams(requestData, responseData);
 
             Scene scene = null;
             GetSceneFromRegionParams(requestData, responseData, out scene);
-            string file = (string)requestData["filename"];
 
-            responseData["accepted"] = true;
+            if (scene != null)
+            {
+                string file = (string)requestData["filename"];
 
-            LoadHeightmap(file, scene.RegionInfo.RegionID);
+                responseData["accepted"] = true;
 
-            responseData["success"] = true;
+                LoadHeightmap(file, scene.RegionInfo.RegionID);
+
+                responseData["success"] = true;
+            }
+            else
+            {
+                responseData["success"] = false;
+            }
 
             m_log.Info("[RADMIN]: Load height maps request complete");
         }
@@ -463,23 +472,30 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
 //                m_log.DebugFormat("[RADMIN]: Save Terrain: XmlRpc {0}", request.ToString());
 
-            CheckStringParameters(requestData, responseData, new string[] { "filename", "regionid" });
+            CheckStringParameters(requestData, responseData, new string[] { "filename" });
             CheckRegionParams(requestData, responseData);
 
-            Scene region = null;
-            GetSceneFromRegionParams(requestData, responseData, out region);
+            Scene scene = null;
+            GetSceneFromRegionParams(requestData, responseData, out scene);
 
-            string file = (string)requestData["filename"];
-            m_log.InfoFormat("[RADMIN]: Terrain Saving: {0}", file);
+            if (scene != null)
+            {
+                string file = (string)requestData["filename"];
+                m_log.InfoFormat("[RADMIN]: Terrain Saving: {0}", file);
 
-            responseData["accepted"] = true;
+                responseData["accepted"] = true;
 
-            ITerrainModule terrainModule = region.RequestModuleInterface<ITerrainModule>();
-            if (null == terrainModule) throw new Exception("terrain module not available");
+                ITerrainModule terrainModule = scene.RequestModuleInterface<ITerrainModule>();
+                if (null == terrainModule) throw new Exception("terrain module not available");
 
-            terrainModule.SaveToFile(file);
+                terrainModule.SaveToFile(file);
 
-            responseData["success"] = true;
+                responseData["success"] = true;
+            }
+            else
+            {
+                responseData["success"] = false;
+            }
 
             m_log.Info("[RADMIN]: Save height maps request complete");
         }
@@ -831,6 +847,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
 
                 IScene newScene;
                 m_application.CreateRegion(region, out newScene);
+                newScene.Start();
 
                 // If an access specification was provided, use it.
                 // Otherwise accept the default.
@@ -1225,7 +1242,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             {
                 GridUserInfo userInfo = m_application.SceneManager.CurrentOrFirstScene.GridUserService.GetGridUserInfo(account.PrincipalID.ToString());
                 if (userInfo != null)
-                    responseData["lastlogin"] = userInfo.Login;
+                    responseData["lastlogin"] = Util.ToUnixTime(userInfo.Login);
                 else
                     responseData["lastlogin"] = 0;
 
@@ -1902,6 +1919,22 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             m_log.Info("[RADMIN]: Access List List Request complete");
         }
 
+        private void XmlRpcEstateReload(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient)
+        {
+            m_log.Info("[RADMIN]: Received Estate Reload Request");
+
+            Hashtable responseData = (Hashtable)response.Value;
+//            Hashtable requestData = (Hashtable)request.Params[0];
+
+            m_application.SceneManager.ForEachScene(s => 
+                s.RegionInfo.EstateSettings = m_application.EstateDataService.LoadEstateSettings(s.RegionInfo.RegionID, false)                
+            );
+
+            responseData["success"] = true;
+
+            m_log.Info("[RADMIN]: Estate Reload Request complete");
+        }
+
         private void XmlRpcGetAgentsMethod(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient)
         {
             Hashtable responseData = (Hashtable)response.Value;
diff --git a/OpenSim/Capabilities/Caps.cs b/OpenSim/Capabilities/Caps.cs
index 241fef3..30a323e 100644
--- a/OpenSim/Capabilities/Caps.cs
+++ b/OpenSim/Capabilities/Caps.cs
@@ -64,7 +64,11 @@ namespace OpenSim.Framework.Capabilities
         public string CapsObjectPath { get { return m_capsObjectPath; } }
 
         private CapsHandlers m_capsHandlers;
-        private Dictionary<string, string> m_externalCapsHandlers;
+
+        private Dictionary<string, PollServiceEventArgs> m_pollServiceHandlers 
+            = new Dictionary<string, PollServiceEventArgs>();
+
+        private Dictionary<string, string> m_externalCapsHandlers = new Dictionary<string, string>();
 
         private IHttpServer m_httpListener;
         private UUID m_agentID;
@@ -134,7 +138,6 @@ namespace OpenSim.Framework.Capabilities
 
             m_agentID = agent;
             m_capsHandlers = new CapsHandlers(httpServer, httpListen, httpPort, (httpServer == null) ? false : httpServer.UseSSL);
-            m_externalCapsHandlers = new Dictionary<string, string>();
             m_regionName = regionName;
         }
 
@@ -145,8 +148,29 @@ namespace OpenSim.Framework.Capabilities
         /// <param name="handler"></param>
         public void RegisterHandler(string capName, IRequestHandler handler)
         {
-            m_capsHandlers[capName] = handler;
             //m_log.DebugFormat("[CAPS]: Registering handler for \"{0}\": path {1}", capName, handler.Path);
+            m_capsHandlers[capName] = handler;
+        }
+
+        public void RegisterPollHandler(string capName, PollServiceEventArgs pollServiceHandler)
+        {
+            m_pollServiceHandlers.Add(capName, pollServiceHandler);
+
+            m_httpListener.AddPollServiceHTTPHandler(pollServiceHandler.Url, pollServiceHandler);
+
+//            uint port = (MainServer.Instance == null) ? 0 : MainServer.Instance.Port;
+//            string protocol = "http";
+//            string hostName = m_httpListenerHostName;
+//            
+//            if (MainServer.Instance.UseSSL)
+//            {
+//                hostName = MainServer.Instance.SSLCommonName;
+//                port = MainServer.Instance.SSLPort;
+//                protocol = "https";
+//            }
+
+//            RegisterHandler(
+//                capName, String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, pollServiceHandler.Url));
         }
 
         /// <summary>
@@ -165,13 +189,70 @@ namespace OpenSim.Framework.Capabilities
         /// </summary>
         public void DeregisterHandlers()
         {
-            if (m_capsHandlers != null)
+            foreach (string capsName in m_capsHandlers.Caps)
+            {
+                m_capsHandlers.Remove(capsName);
+            }
+
+            foreach (PollServiceEventArgs handler in m_pollServiceHandlers.Values)
+            {
+                m_httpListener.RemovePollServiceHTTPHandler("", handler.Url);
+            }
+        }
+
+        public bool TryGetPollHandler(string name, out PollServiceEventArgs pollHandler)
+        {
+            return m_pollServiceHandlers.TryGetValue(name, out pollHandler);
+        }
+
+        public Dictionary<string, PollServiceEventArgs> GetPollHandlers()
+        {
+            return new Dictionary<string, PollServiceEventArgs>(m_pollServiceHandlers);
+        }
+
+        /// <summary>
+        /// Return an LLSD-serializable Hashtable describing the
+        /// capabilities and their handler details.
+        /// </summary>
+        /// <param name="excludeSeed">If true, then exclude the seed cap.</param>
+        public Hashtable GetCapsDetails(bool excludeSeed, List<string> requestedCaps)
+        {
+            Hashtable caps = CapsHandlers.GetCapsDetails(excludeSeed, requestedCaps);
+
+            lock (m_pollServiceHandlers)
             {
-                foreach (string capsName in m_capsHandlers.Caps)
+                foreach (KeyValuePair <string, PollServiceEventArgs> kvp in m_pollServiceHandlers)
                 {
-                    m_capsHandlers.Remove(capsName);
+                    if (!requestedCaps.Contains(kvp.Key))
+                        continue;
+
+                        string hostName = m_httpListenerHostName;
+                        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("FetchInventoryDescendents2", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl));
+
+                        caps[kvp.Key] = string.Format("{0}://{1}:{2}{3}", protocol, hostName, port, kvp.Value.Url);
                 }
             }
+
+            // Add the external too
+            foreach (KeyValuePair<string, string> kvp in ExternalCapsHandlers)
+            {
+                if (!requestedCaps.Contains(kvp.Key))
+                    continue;
+
+                caps[kvp.Key] = kvp.Value;
+            }
+
+            return caps;
         }
 
         public void Activate()
@@ -185,4 +266,4 @@ namespace OpenSim.Framework.Capabilities
             return m_capsActive.WaitOne(30000);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Capabilities/CapsHandlers.cs b/OpenSim/Capabilities/CapsHandlers.cs
index 458272d..890df90 100644
--- a/OpenSim/Capabilities/CapsHandlers.cs
+++ b/OpenSim/Capabilities/CapsHandlers.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Framework.Capabilities
     /// </summary>
     public class CapsHandlers
     {
-        private Dictionary <string, IRequestHandler> m_capsHandlers = new Dictionary<string, IRequestHandler>();
+        private Dictionary<string, IRequestHandler> m_capsHandlers = new Dictionary<string, IRequestHandler>();
         private IHttpServer m_httpListener;
         private string m_httpListenerHostName;
         private uint m_httpListenerPort;
@@ -184,5 +184,17 @@ namespace OpenSim.Framework.Capabilities
 
             return caps;
         }
+
+        /// <summary>
+        /// Returns a copy of the dictionary of all the HTTP cap handlers
+        /// </summary>
+        /// <returns>
+        /// The dictionary copy.  The key is the capability name, the value is the HTTP handler.
+        /// </returns>
+        public Dictionary<string, IRequestHandler> GetCapsHandlers()
+        {
+            lock (m_capsHandlers)
+                return new Dictionary<string, IRequestHandler>(m_capsHandlers);
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs b/OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs
new file mode 100644
index 0000000..426174d
--- /dev/null
+++ b/OpenSim/Capabilities/Handlers/AvatarPickerSearch/AvatarPickerSearchHandler.cs
@@ -0,0 +1,116 @@
+/*
+ * 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.Collections.Specialized;
+using System.IO;
+using System.Reflection;
+using System.Web;
+using log4net;
+using Nini.Config;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Capabilities;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+//using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Services.Interfaces;
+using Caps = OpenSim.Framework.Capabilities.Caps;
+
+namespace OpenSim.Capabilities.Handlers
+{
+    public class AvatarPickerSearchHandler : BaseStreamHandler
+    {
+        private static readonly ILog m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private IPeople m_PeopleService;
+
+        public AvatarPickerSearchHandler(string path, IPeople peopleService, string name, string description)
+            : base("GET", path, name, description)
+        {
+            m_PeopleService = peopleService;
+        }
+
+        protected override byte[] ProcessRequest(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        {
+            // Try to parse the texture ID from the request URL
+            NameValueCollection query = HttpUtility.ParseQueryString(httpRequest.Url.Query);
+            string names = query.GetOne("names");
+            string psize = query.GetOne("page_size");
+            string pnumber = query.GetOne("page");
+
+            if (m_PeopleService == null)
+                return FailureResponse(names, (int)System.Net.HttpStatusCode.InternalServerError, httpResponse);
+
+            if (string.IsNullOrEmpty(names) || names.Length < 3)
+                return FailureResponse(names, (int)System.Net.HttpStatusCode.BadRequest, httpResponse);
+
+            m_log.DebugFormat("[AVATAR PICKER SEARCH]: search for {0}", names);
+
+            int page_size = (string.IsNullOrEmpty(psize) ? 500 : Int32.Parse(psize));
+            int page_number = (string.IsNullOrEmpty(pnumber) ? 1 : Int32.Parse(pnumber));
+            
+            // Full content request
+            httpResponse.StatusCode = (int)System.Net.HttpStatusCode.OK;
+            //httpResponse.ContentLength = ??;
+            httpResponse.ContentType = "application/llsd+xml";
+
+            List<UserData> users = m_PeopleService.GetUserData(names, page_size, page_number);
+
+            LLSDAvatarPicker osdReply = new LLSDAvatarPicker();
+            osdReply.next_page_url = httpRequest.RawUrl;
+            foreach (UserData u in users)
+                osdReply.agents.Array.Add(ConvertUserData(u));
+
+            string reply = LLSDHelpers.SerialiseLLSDReply(osdReply);
+            return System.Text.Encoding.UTF8.GetBytes(reply);
+        }
+
+        private LLSDPerson ConvertUserData(UserData user)
+        {
+            LLSDPerson p = new LLSDPerson();
+            p.legacy_first_name = user.FirstName;
+            p.legacy_last_name = user.LastName;
+            p.display_name = user.FirstName + " " + user.LastName;
+            if (user.LastName.StartsWith("@"))
+                p.username = user.FirstName.ToLower() + user.LastName.ToLower();
+            else
+                p.username = user.FirstName.ToLower() + "." + user.LastName.ToLower();
+            p.id = user.Id;
+            p.is_display_name_default = false;
+            return p;
+        }
+
+        private byte[] FailureResponse(string names, int statuscode, IOSHttpResponse httpResponse)
+        {
+            m_log.Error("[AVATAR PICKER SEARCH]: Error searching for " + names);
+            httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
+            return System.Text.Encoding.UTF8.GetBytes(string.Empty);
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs b/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs
index c305797..d1503ee 100644
--- a/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs
+++ b/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2Handler.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Capabilities.Handlers
 {
     public class FetchInventory2Handler
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private IInventoryService m_inventoryService;
 
@@ -121,4 +121,4 @@ namespace OpenSim.Capabilities.Handlers
             return llsdItem;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
index aa6203b..57b4667 100644
--- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
@@ -174,6 +174,7 @@ namespace OpenSim.Capabilities.Handlers
 
                         newTexture.Flags = AssetFlags.Collectable;
                         newTexture.Temporary = true;
+                        newTexture.Local = true;
                         m_assetService.Store(newTexture);
                         WriteTextureData(request, response, newTexture, format);
                         return true;
diff --git a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureServerConnector.cs b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureServerConnector.cs
new file mode 100644
index 0000000..10ea8ee
--- /dev/null
+++ b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureServerConnector.cs
@@ -0,0 +1,76 @@
+/*
+ * 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 OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Server.Handlers.Base;
+using OpenMetaverse;
+
+namespace OpenSim.Capabilities.Handlers
+{
+    public class UploadBakedTextureServerConnector : ServiceConnector
+    {
+        private IAssetService m_AssetService;
+        private string m_ConfigName = "CapsService";
+
+        public UploadBakedTextureServerConnector(IConfigSource config, IHttpServer server, string configName) :
+                base(config, server, configName)
+        {
+            if (configName != String.Empty)
+                m_ConfigName = configName;
+
+            IConfig serverConfig = config.Configs[m_ConfigName];
+            if (serverConfig == null)
+                throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName));
+
+            string assetService = serverConfig.GetString("AssetService", String.Empty);
+
+            if (assetService == String.Empty)
+                throw new Exception("No AssetService in config file");
+
+            Object[] args = new Object[] { config };
+            m_AssetService =
+                    ServerUtils.LoadPlugin<IAssetService>(assetService, args);
+
+            if (m_AssetService == null)
+                throw new Exception(String.Format("Failed to load AssetService from {0}; config is {1}", assetService, m_ConfigName));
+
+            // NEED TO FIX THIS
+            OpenSim.Framework.Capabilities.Caps caps = new OpenSim.Framework.Capabilities.Caps(server, "", server.Port, "", UUID.Zero, "");
+            server.AddStreamHandler(new RestStreamHandler(
+                        "POST",
+                        "/CAPS/UploadBakedTexture/",
+                        new UploadBakedTextureHandler(caps, m_AssetService, true).UploadBakedTexture,
+                        "UploadBakedTexture",
+                        "Upload Baked Texture Capability"));
+
+         }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Capabilities/LLSDAvatarPicker.cs b/OpenSim/Capabilities/LLSDAvatarPicker.cs
new file mode 100644
index 0000000..d0b3f3a
--- /dev/null
+++ b/OpenSim/Capabilities/LLSDAvatarPicker.cs
@@ -0,0 +1,51 @@
+/*
+ * 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.Capabilities
+{
+    [OSDMap]
+    public class LLSDAvatarPicker
+    {
+        public string next_page_url;
+        // an array of LLSDPerson
+        public OSDArray agents = new OSDArray();
+    }
+
+    [OSDMap]
+    public class LLSDPerson
+    {
+        public string username;
+        public string display_name;
+        //'display_name_next_update':d"1970-01-01T00:00:00Z" 
+        public string legacy_first_name;
+        public string legacy_last_name;
+        public UUID id;
+        public bool is_display_name_default;
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Capabilities/LLSDStreamHandler.cs b/OpenSim/Capabilities/LLSDStreamHandler.cs
index 5df24b2..4fa1153 100644
--- a/OpenSim/Capabilities/LLSDStreamHandler.cs
+++ b/OpenSim/Capabilities/LLSDStreamHandler.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Framework.Capabilities
             m_method = method;
         }
 
-        public override byte[] Handle(string path, Stream request,
+        protected override byte[] ProcessRequest(string path, Stream request,
                                       IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             //Encoding encoding = Util.UTF8;
diff --git a/OpenSim/Data/IGridUserData.cs b/OpenSim/Data/IGridUserData.cs
index e15a1f8..9afa477 100644
--- a/OpenSim/Data/IGridUserData.cs
+++ b/OpenSim/Data/IGridUserData.cs
@@ -50,6 +50,7 @@ namespace OpenSim.Data
     public interface IGridUserData 
     {
         GridUserData Get(string userID);
+        GridUserData[] GetAll(string query);
         bool Store(GridUserData data);
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Data/IHGTravelingData.cs b/OpenSim/Data/IHGTravelingData.cs
new file mode 100644
index 0000000..452af7b
--- /dev/null
+++ b/OpenSim/Data/IHGTravelingData.cs
@@ -0,0 +1,59 @@
+/*
+ * 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.Data
+{
+    // This MUST be a ref type!
+    public class HGTravelingData
+    {
+        public UUID SessionID;
+        public UUID UserID;
+        public Dictionary<string, string> Data;
+
+        public HGTravelingData()
+        {
+            Data = new Dictionary<string, string>();
+        }
+    }
+
+    /// <summary>
+    /// An interface for connecting to the user grid datastore
+    /// </summary>
+    public interface IHGTravelingData 
+    {
+        HGTravelingData Get(UUID sessionID);
+        HGTravelingData[] GetSessions(UUID userID);
+        bool Store(HGTravelingData data);
+        bool Delete(UUID sessionID);
+        void DeleteOld();
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Data/IProfilesData.cs b/OpenSim/Data/IProfilesData.cs
new file mode 100644
index 0000000..0de7f68
--- /dev/null
+++ b/OpenSim/Data/IProfilesData.cs
@@ -0,0 +1,56 @@
+/*
+ * 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 OpenMetaverse.StructuredData;
+using OpenSim.Framework;
+
+namespace OpenSim.Data
+{
+
+    public interface IProfilesData
+    {
+        OSDArray GetClassifiedRecords(UUID creatorId);
+        bool UpdateClassifiedRecord(UserClassifiedAdd ad, ref string result);
+        bool DeleteClassifiedRecord(UUID recordId);
+        OSDArray GetAvatarPicks(UUID avatarId);
+        UserProfilePick GetPickInfo(UUID avatarId, UUID pickId);
+        bool UpdatePicksRecord(UserProfilePick pick);
+        bool DeletePicksRecord(UUID pickId);
+        bool GetAvatarNotes(ref UserProfileNotes note);
+        bool UpdateAvatarNotes(ref UserProfileNotes note, ref string result);
+        bool GetAvatarProperties(ref UserProfileProperties props, ref string result);
+        bool UpdateAvatarProperties(ref UserProfileProperties props, ref string result);
+        bool UpdateAvatarInterests(UserProfileProperties up, ref string result);
+        bool GetClassifiedInfo(ref UserClassifiedAdd ad, ref string result);
+        bool GetUserAppData(ref UserAppData props, ref string result);
+        bool SetUserAppData(UserAppData props, ref string result);
+        OSDArray GetUserImageAssets(UUID avatarId);
+    }
+}
+
diff --git a/OpenSim/Data/IRegionData.cs b/OpenSim/Data/IRegionData.cs
index 70e1065..463c621 100644
--- a/OpenSim/Data/IRegionData.cs
+++ b/OpenSim/Data/IRegionData.cs
@@ -81,6 +81,7 @@ namespace OpenSim.Data
         bool Delete(UUID regionID);
 
         List<RegionData> GetDefaultRegions(UUID scopeID);
+        List<RegionData> GetDefaultHypergridRegions(UUID scopeID);
         List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y);
         List<RegionData> GetHyperlinks(UUID scopeID);
     }
diff --git a/OpenSim/Data/MSSQL/MSSQLGridUserData.cs b/OpenSim/Data/MSSQL/MSSQLGridUserData.cs
index 1870273..fd52122 100644
--- a/OpenSim/Data/MSSQL/MSSQLGridUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGridUserData.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Data.MSSQL
         {
         }
 
-        public GridUserData Get(string userID)
+        public new GridUserData Get(string userID)
         {
             GridUserData[] ret = Get("UserID", userID);
 
@@ -60,5 +60,10 @@ namespace OpenSim.Data.MSSQL
             return ret[0];
         }
 
+        public GridUserData[] GetAll(string userID)
+        {
+            return base.Get(String.Format("UserID LIKE '{0}%'", userID));
+        }
+
     }
 }
diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
index 0d89706..c0589df 100644
--- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
@@ -315,6 +315,11 @@ namespace OpenSim.Data.MSSQL
             return Get((int)RegionFlags.DefaultRegion, scopeID);
         }
 
+        public List<RegionData> GetDefaultHypergridRegions(UUID scopeID)
+        {
+            return Get((int)RegionFlags.DefaultHGRegion, scopeID);
+        }
+
         public List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y)
         {
             List<RegionData> regions = Get((int)RegionFlags.FallbackRegion, scopeID);
diff --git a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
index 00af3a0..bc5beeb 100644
--- a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs
@@ -2100,7 +2100,7 @@ VALUES
             parameters.Add(_Database.CreateParameter("LinkNumber", prim.LinkNum));
             parameters.Add(_Database.CreateParameter("MediaURL", prim.MediaUrl));
             
-            if (prim.DynAttrs.Count > 0)
+            if (prim.DynAttrs.CountNamespaces > 0)
                 parameters.Add(_Database.CreateParameter("DynAttrs", prim.DynAttrs.ToXml()));
             else
                 parameters.Add(_Database.CreateParameter("DynAttrs", null));
diff --git a/OpenSim/Data/MSSQL/Resources/RegionStore.migrations b/OpenSim/Data/MSSQL/Resources/RegionStore.migrations
index b84c2a4..4549801 100644
--- a/OpenSim/Data/MSSQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/MSSQL/Resources/RegionStore.migrations
@@ -1153,7 +1153,7 @@ COMMIT
 
 BEGIN TRANSACTION
 
-ALTER TABLE prims ADD COLUMN DynAttrs TEXT;
+ALTER TABLE prims ADD DynAttrs TEXT;
 
 COMMIT
 
@@ -1161,10 +1161,10 @@ COMMIT
 
 BEGIN TRANSACTION
 
-ALTER TABLE prims ADD COLUMN `PhysicsShapeType` tinyint(4) NOT NULL default '0';
-ALTER TABLE prims ADD COLUMN `Density` double NOT NULL default '1000';
-ALTER TABLE prims ADD COLUMN `GravityModifier` double NOT NULL default '1';
-ALTER TABLE prims ADD COLUMN `Friction` double NOT NULL default '0.6';
-ALTER TABLE prims ADD COLUMN `Restitution` double NOT NULL default '0.5';
+ALTER TABLE prims ADD `PhysicsShapeType` tinyint(4) NOT NULL default '0';
+ALTER TABLE prims ADD `Density` double NOT NULL default '1000';
+ALTER TABLE prims ADD `GravityModifier` double NOT NULL default '1';
+ALTER TABLE prims ADD `Friction` double NOT NULL default '0.6';
+ALTER TABLE prims ADD `Restitution` double NOT NULL default '0.5';
 
 COMMIT
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 21dd5aa..59cc22a 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -142,7 +142,8 @@ namespace OpenSim.Data.MySQL
                         }
                         catch (Exception e)
                         {
-                            m_log.Error("[ASSETS DB]: MySql failure fetching asset " + assetID + ": " + e.Message);
+                            m_log.Error(
+                                string.Format("[ASSETS DB]: MySql failure fetching asset {0}.  Exception  ", assetID), e);
                         }
                     }
                 }
@@ -243,10 +244,11 @@ namespace OpenSim.Data.MySQL
                         }
                         catch (Exception e)
                         {
-                            m_log.ErrorFormat(
-                                "[ASSETS DB]: " +
-                                "MySql failure updating access_time for asset {0} with name {1}" + Environment.NewLine + e.ToString()
-                                + Environment.NewLine + "Attempting reconnection", asset.FullID, asset.Name);
+                            m_log.Error(
+                                string.Format(
+                                    "[ASSETS DB]: Failure updating access_time for asset {0} with name {1}.  Exception  ", 
+                                    asset.FullID, asset.Name), 
+                                e);
                         }
                     }
                 }
@@ -286,8 +288,8 @@ namespace OpenSim.Data.MySQL
                         }
                         catch (Exception e)
                         {
-                            m_log.ErrorFormat(
-                                "[ASSETS DB]: MySql failure fetching asset {0}" + Environment.NewLine + e.ToString(), uuid);
+                            m_log.Error(
+                                string.Format("[ASSETS DB]: MySql failure fetching asset {0}.  Exception  ", uuid), e);
                         }
                     }
                 }
@@ -346,7 +348,11 @@ namespace OpenSim.Data.MySQL
                         }
                         catch (Exception e)
                         {
-                            m_log.Error("[ASSETS DB]: MySql failure fetching asset set" + Environment.NewLine + e.ToString());
+                            m_log.Error(
+                                string.Format(
+                                    "[ASSETS DB]: MySql failure fetching asset set from {0}, count {1}.  Exception  ", 
+                                    start, count), 
+                                e);
                         }
                     }
                 }
diff --git a/OpenSim/Data/MySQL/MySQLGridUserData.cs b/OpenSim/Data/MySQL/MySQLGridUserData.cs
index a9ce94d..00560c1 100644
--- a/OpenSim/Data/MySQL/MySQLGridUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLGridUserData.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Data.MySQL
 
         public MySQLGridUserData(string connectionString, string realm) : base(connectionString, realm, "GridUserStore") {}
 
-        public GridUserData Get(string userID)
+        public new GridUserData Get(string userID)
         {
             GridUserData[] ret = Get("UserID", userID);
 
@@ -56,6 +56,9 @@ namespace OpenSim.Data.MySQL
             return ret[0];
         }
 
-
+        public GridUserData[] GetAll(string userID)
+        {
+            return base.Get(String.Format("UserID LIKE '{0}%'", userID));
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Data/MySQL/MySQLGroupsData.cs b/OpenSim/Data/MySQL/MySQLGroupsData.cs
index 2a1bd6c..0318284 100644
--- a/OpenSim/Data/MySQL/MySQLGroupsData.cs
+++ b/OpenSim/Data/MySQL/MySQLGroupsData.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Data.MySQL
             if (string.IsNullOrEmpty(pattern))
                 pattern = "1 ORDER BY Name LIMIT 100";
             else
-                pattern = string.Format("Name LIKE %{0}% ORDER BY Name LIMIT 100", pattern);
+                pattern = string.Format("Name LIKE '%{0}%' ORDER BY Name LIMIT 100", pattern);
 
             return m_Groups.Get(pattern);
         }
diff --git a/OpenSim/Data/MySQL/MySQLHGTravelData.cs b/OpenSim/Data/MySQL/MySQLHGTravelData.cs
new file mode 100644
index 0000000..e81b880
--- /dev/null
+++ b/OpenSim/Data/MySQL/MySQLHGTravelData.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 System;
+using System.Collections.Generic;
+using System.Data;
+using System.Reflection;
+using System.Threading;
+using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
+using MySql.Data.MySqlClient;
+
+namespace OpenSim.Data.MySQL
+{
+    /// <summary>
+    /// A MySQL Interface for user grid data
+    /// </summary>
+    public class MySQLHGTravelData : MySQLGenericTableHandler<HGTravelingData>, IHGTravelingData
+    {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        public MySQLHGTravelData(string connectionString, string realm) : base(connectionString, realm, "HGTravelStore") { }
+
+        public HGTravelingData Get(UUID sessionID)
+        {
+            HGTravelingData[] ret = Get("SessionID", sessionID.ToString());
+
+            if (ret.Length == 0)
+                return null;
+
+            return ret[0];
+        }
+
+        public HGTravelingData[] GetSessions(UUID userID)
+        {
+            return base.Get("UserID", userID.ToString());
+        }
+
+        public bool Delete(UUID sessionID)
+        {
+            return Delete("SessionID", sessionID.ToString());
+        }
+
+        public void DeleteOld()
+        {
+            using (MySqlCommand cmd = new MySqlCommand())
+            {
+                cmd.CommandText = String.Format("delete from {0} where TMStamp < NOW() - INTERVAL 2 DAY", m_Realm);
+
+                ExecuteNonQuery(cmd);
+            }
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Data/MySQL/MySQLOfflineIMData.cs b/OpenSim/Data/MySQL/MySQLOfflineIMData.cs
index 252f358..bafd204 100644
--- a/OpenSim/Data/MySQL/MySQLOfflineIMData.cs
+++ b/OpenSim/Data/MySQL/MySQLOfflineIMData.cs
@@ -47,13 +47,10 @@ namespace OpenSim.Data.MySQL
 
         public void DeleteOld()
         {
-            uint now = (uint)Util.UnixTimeSinceEpoch();
-
             using (MySqlCommand cmd = new MySqlCommand())
             {
-                cmd.CommandText = String.Format("delete from {0} where TMStamp < ?tstamp", m_Realm);
-                cmd.Parameters.AddWithValue("?tstamp", now - 14 * 24 * 60 * 60); // > 2 weeks old
-
+                cmd.CommandText = String.Format("delete from {0} where TMStamp < NOW() - INTERVAL 2 WEEK", m_Realm);
+         
                 ExecuteNonQuery(cmd);
             }
 
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index a2d4ae4..2ad7590 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -310,6 +310,11 @@ namespace OpenSim.Data.MySQL
             return Get((int)RegionFlags.DefaultRegion, scopeID);
         }
 
+        public List<RegionData> GetDefaultHypergridRegions(UUID scopeID)
+        {
+            return Get((int)RegionFlags.DefaultHGRegion, scopeID);
+        }
+
         public List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y)
         {
             List<RegionData> regions = Get((int)RegionFlags.FallbackRegion, scopeID);
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index 537ec85..feacbb2 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -1730,7 +1730,7 @@ namespace OpenSim.Data.MySQL
             else
                 cmd.Parameters.AddWithValue("Vehicle", String.Empty);
 
-            if (prim.DynAttrs.Count > 0)
+            if (prim.DynAttrs.CountNamespaces > 0)
                 cmd.Parameters.AddWithValue("DynAttrs", prim.DynAttrs.ToXml());
             else
                 cmd.Parameters.AddWithValue("DynAttrs", null);
diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
new file mode 100644
index 0000000..4c6c8e3
--- /dev/null
+++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs
@@ -0,0 +1,1096 @@
+/*
+ * 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.Data;
+using System.Reflection;
+using OpenSim.Data;
+using OpenSim.Framework;
+using MySql.Data.MySqlClient;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using log4net;
+
+namespace OpenSim.Data.MySQL
+{
+    public class UserProfilesData: IProfilesData
+    {
+        static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        
+        #region Properites
+        string ConnectionString
+        {
+            get; set;
+        }
+
+        protected object Lock
+        {
+            get; set;
+        }
+        
+        protected virtual Assembly Assembly
+        {
+            get { return GetType().Assembly; }
+        }
+        
+        #endregion Properties
+        
+        #region class Member Functions
+        public UserProfilesData(string connectionString)
+        {
+            ConnectionString = connectionString;
+            Init();
+        }
+        
+        void Init()
+        {
+            using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
+            {
+                dbcon.Open();
+                
+                Migration m = new Migration(dbcon, Assembly, "UserProfiles");
+                m.Update();
+            }
+        }
+        #endregion Member Functions
+        
+        #region Classifieds Queries
+        /// <summary>
+        /// Gets the classified records.
+        /// </summary>
+        /// <returns>
+        /// Array of classified records
+        /// </returns>
+        /// <param name='creatorId'>
+        /// Creator identifier.
+        /// </param>
+        public OSDArray GetClassifiedRecords(UUID creatorId)
+        {
+            OSDArray data = new OSDArray();
+            
+            using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
+            {
+                string query = "SELECT classifieduuid, name FROM classifieds WHERE creatoruuid = ?Id";
+                dbcon.Open();
+                using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
+                {
+                    cmd.Parameters.AddWithValue("?Id", creatorId);
+                    using( MySqlDataReader reader = cmd.ExecuteReader(CommandBehavior.Default))
+                    {
+                        if(reader.HasRows)
+                        {
+                            while (reader.Read())
+                            {
+                                OSDMap n = new OSDMap();
+                                UUID Id = UUID.Zero;
+                                
+                                string Name = null;
+                                try
+                                {
+                                    UUID.TryParse(Convert.ToString( reader["classifieduuid"]), out Id);
+                                    Name = Convert.ToString(reader["name"]);
+                                }
+                                catch (Exception e)
+                                {
+                                    m_log.DebugFormat("[PROFILES_DATA]" +
+                                                     ": UserAccount exception {0}", e.Message);
+                                }
+                                n.Add("classifieduuid", OSD.FromUUID(Id));
+                                n.Add("name", OSD.FromString(Name));
+                                data.Add(n);
+                            }
+                        }
+                    }
+                }
+            }
+            return data;
+        }
+        
+        public bool UpdateClassifiedRecord(UserClassifiedAdd ad, ref string result)
+        {
+            string query = string.Empty;
+            
+            
+            query += "INSERT INTO classifieds (";
+            query += "`classifieduuid`,";
+            query += "`creatoruuid`,";
+            query += "`creationdate`,";
+            query += "`expirationdate`,";
+            query += "`category`,";
+            query += "`name`,";
+            query += "`description`,";
+            query += "`parceluuid`,";
+            query += "`parentestate`,";
+            query += "`snapshotuuid`,";
+            query += "`simname`,";
+            query += "`posglobal`,";
+            query += "`parcelname`,";
+            query += "`classifiedflags`,";
+            query += "`priceforlisting`) ";
+            query += "VALUES (";
+            query += "?ClassifiedId,";
+            query += "?CreatorId,";
+            query += "?CreatedDate,";
+            query += "?ExpirationDate,";
+            query += "?Category,";
+            query += "?Name,";
+            query += "?Description,";
+            query += "?ParcelId,";
+            query += "?ParentEstate,";
+            query += "?SnapshotId,";
+            query += "?SimName,";
+            query += "?GlobalPos,";
+            query += "?ParcelName,";
+            query += "?Flags,";
+            query += "?ListingPrice ) ";
+            query += "ON DUPLICATE KEY UPDATE ";
+            query += "category=?Category, ";
+            query += "expirationdate=?ExpirationDate, ";
+            query += "name=?Name, ";
+            query += "description=?Description, ";
+            query += "parentestate=?ParentEstate, ";
+            query += "posglobal=?GlobalPos, ";
+            query += "parcelname=?ParcelName, ";
+            query += "classifiedflags=?Flags, ";
+            query += "priceforlisting=?ListingPrice, ";
+            query += "snapshotuuid=?SnapshotId";
+            
+            if(string.IsNullOrEmpty(ad.ParcelName))
+                ad.ParcelName = "Unknown";
+            if(ad.ParcelId == null)
+                ad.ParcelId = UUID.Zero;
+            if(string.IsNullOrEmpty(ad.Description))
+                ad.Description = "No Description";
+            
+            DateTime epoch = new DateTime(1970, 1, 1);
+            DateTime now = DateTime.Now;
+            TimeSpan epochnow = now - epoch;
+            TimeSpan duration;
+            DateTime expiration;
+            TimeSpan epochexp;
+            
+            if(ad.Flags == 2)
+            {
+                duration = new TimeSpan(7,0,0,0);
+                expiration = now.Add(duration);
+                epochexp = expiration - epoch;
+            }
+            else
+            {
+                duration = new TimeSpan(365,0,0,0);
+                expiration = now.Add(duration);
+                epochexp = expiration - epoch;
+            }
+            ad.CreationDate = (int)epochnow.TotalSeconds;
+            ad.ExpirationDate = (int)epochexp.TotalSeconds;
+            
+            try
+            {
+                using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("?ClassifiedId", ad.ClassifiedId.ToString());
+                        cmd.Parameters.AddWithValue("?CreatorId", ad.CreatorId.ToString());
+                        cmd.Parameters.AddWithValue("?CreatedDate", ad.CreationDate.ToString());
+                        cmd.Parameters.AddWithValue("?ExpirationDate", ad.ExpirationDate.ToString());
+                        cmd.Parameters.AddWithValue("?Category", ad.Category.ToString());
+                        cmd.Parameters.AddWithValue("?Name", ad.Name.ToString());
+                        cmd.Parameters.AddWithValue("?Description", ad.Description.ToString());
+                        cmd.Parameters.AddWithValue("?ParcelId", ad.ParcelId.ToString());
+                        cmd.Parameters.AddWithValue("?ParentEstate", ad.ParentEstate.ToString());
+                        cmd.Parameters.AddWithValue("?SnapshotId", ad.SnapshotId.ToString ());
+                        cmd.Parameters.AddWithValue("?SimName", ad.SimName.ToString());
+                        cmd.Parameters.AddWithValue("?GlobalPos", ad.GlobalPos.ToString());
+                        cmd.Parameters.AddWithValue("?ParcelName", ad.ParcelName.ToString());
+                        cmd.Parameters.AddWithValue("?Flags", ad.Flags.ToString());
+                        cmd.Parameters.AddWithValue("?ListingPrice", ad.Price.ToString ());
+                        
+                        cmd.ExecuteNonQuery();
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                 ": ClassifiedesUpdate exception {0}", e.Message);
+                result = e.Message;
+                return false;
+            }
+            return true;
+        }
+        
+        public bool DeleteClassifiedRecord(UUID recordId)
+        {
+            string query = string.Empty;
+            
+            query += "DELETE FROM classifieds WHERE ";
+            query += "classifieduuid = ?ClasifiedId";
+            
+            try
+            {
+                using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    
+                    using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("?ClassifiedId", recordId.ToString());
+                        
+                        lock(Lock)
+                        {
+                            cmd.ExecuteNonQuery();
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                 ": DeleteClassifiedRecord exception {0}", e.Message);
+                return false;
+            }
+            return true;
+        }
+        
+        public bool GetClassifiedInfo(ref UserClassifiedAdd ad, ref string result)
+        {
+            string query = string.Empty;
+            
+            query += "SELECT * FROM classifieds WHERE ";
+            query += "classifieduuid = ?AdId";
+            
+            try
+            {
+                using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("?AdId", ad.ClassifiedId.ToString());
+                        
+                        using (MySqlDataReader reader = cmd.ExecuteReader())
+                        {
+                            if(reader.Read ())
+                            {
+                                ad.CreatorId = new UUID(reader.GetGuid("creatoruuid"));
+                                ad.ParcelId = new UUID(reader.GetGuid("parceluuid"));
+                                ad.SnapshotId = new UUID(reader.GetGuid("snapshotuuid"));
+                                ad.CreationDate = Convert.ToInt32(reader["creationdate"]);
+                                ad.ExpirationDate = Convert.ToInt32(reader["expirationdate"]);
+                                ad.ParentEstate = Convert.ToInt32(reader["parentestate"]);
+                                ad.Flags = (byte)reader.GetUInt32("classifiedflags");
+                                ad.Category = reader.GetInt32("category");
+                                ad.Price = reader.GetInt16("priceforlisting");
+                                ad.Name = reader.GetString("name");
+                                ad.Description = reader.GetString("description");
+                                ad.SimName = reader.GetString("simname");
+                                ad.GlobalPos = reader.GetString("posglobal");
+                                ad.ParcelName = reader.GetString("parcelname");
+                                
+                            }
+                        }
+                    }
+                    dbcon.Close();
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                 ": GetPickInfo exception {0}", e.Message);
+            }
+            return true;
+        }
+        #endregion Classifieds Queries
+        
+        #region Picks Queries
+        public OSDArray GetAvatarPicks(UUID avatarId)
+        {
+            string query = string.Empty;
+            
+            query += "SELECT `pickuuid`,`name` FROM userpicks WHERE ";
+            query += "creatoruuid = ?Id";
+            OSDArray data = new OSDArray();
+            
+            try
+            {
+                using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("?Id", avatarId.ToString());
+                        
+                        using (MySqlDataReader reader = cmd.ExecuteReader())
+                        {
+                            if(reader.HasRows)
+                            {
+                                while (reader.Read())
+                                {
+                                    OSDMap record = new OSDMap();
+                                    
+                                    record.Add("pickuuid",OSD.FromString((string)reader["pickuuid"]));
+                                    record.Add("name",OSD.FromString((string)reader["name"]));
+                                    data.Add(record);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                 ": GetAvatarPicks exception {0}", e.Message);
+            }
+            return data;
+        }
+        
+        public UserProfilePick GetPickInfo(UUID avatarId, UUID pickId)
+        {
+            string query = string.Empty;
+            UserProfilePick pick = new UserProfilePick();
+            
+            query += "SELECT * FROM userpicks WHERE ";
+            query += "creatoruuid = ?CreatorId AND ";
+            query += "pickuuid =  ?PickId";
+            
+            try
+            {
+                using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("?CreatorId", avatarId.ToString());
+                        cmd.Parameters.AddWithValue("?PickId", pickId.ToString());
+                        
+                        using (MySqlDataReader reader = cmd.ExecuteReader())
+                        {
+                            if(reader.HasRows)
+                            {
+                                reader.Read();
+                                
+                                string description = (string)reader["description"];
+                                
+                                if (string.IsNullOrEmpty(description))
+                                    description = "No description given.";
+                                
+                                UUID.TryParse((string)reader["pickuuid"], out pick.PickId);
+                                UUID.TryParse((string)reader["creatoruuid"], out pick.CreatorId);
+                                UUID.TryParse((string)reader["parceluuid"], out pick.ParcelId);
+                                UUID.TryParse((string)reader["snapshotuuid"], out pick.SnapshotId);
+                                pick.GlobalPos = (string)reader["posglobal"];
+                                bool.TryParse((string)reader["toppick"], out pick.TopPick);
+                                bool.TryParse((string)reader["enabled"], out pick.Enabled);
+                                pick.Name = (string)reader["name"];
+                                pick.Desc = description;
+                                pick.User = (string)reader["user"];
+                                pick.OriginalName = (string)reader["originalname"];
+                                pick.SimName = (string)reader["simname"];
+                                pick.SortOrder = (int)reader["sortorder"];
+                            }
+                        }
+                    }
+                    dbcon.Close();
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                 ": GetPickInfo exception {0}", e.Message);
+            }
+            return pick;
+        }
+        
+        public bool UpdatePicksRecord(UserProfilePick pick)
+        {       
+            string query = string.Empty;
+            
+            query += "INSERT INTO userpicks VALUES (";
+            query += "?PickId,";
+            query += "?CreatorId,";
+            query += "?TopPick,";
+            query += "?ParcelId,";
+            query += "?Name,";
+            query += "?Desc,";
+            query += "?SnapshotId,";
+            query += "?User,";
+            query += "?Original,";
+            query += "?SimName,";
+            query += "?GlobalPos,";
+            query += "?SortOrder,";
+            query += "?Enabled) ";
+            query += "ON DUPLICATE KEY UPDATE ";
+            query += "parceluuid=?ParcelId,";
+            query += "name=?Name,";
+            query += "description=?Desc,";
+            query += "snapshotuuid=?SnapshotId,";
+            query += "pickuuid=?PickId,";
+            query += "posglobal=?GlobalPos";
+            
+            try
+            {
+                using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("?PickId", pick.PickId.ToString());
+                        cmd.Parameters.AddWithValue("?CreatorId", pick.CreatorId.ToString());
+                        cmd.Parameters.AddWithValue("?TopPick", pick.TopPick.ToString());
+                        cmd.Parameters.AddWithValue("?ParcelId", pick.ParcelId.ToString());
+                        cmd.Parameters.AddWithValue("?Name", pick.Name.ToString());
+                        cmd.Parameters.AddWithValue("?Desc", pick.Desc.ToString());
+                        cmd.Parameters.AddWithValue("?SnapshotId", pick.SnapshotId.ToString());
+                        cmd.Parameters.AddWithValue("?User", pick.User.ToString());
+                        cmd.Parameters.AddWithValue("?Original", pick.OriginalName.ToString());
+                        cmd.Parameters.AddWithValue("?SimName",pick.SimName.ToString());
+                        cmd.Parameters.AddWithValue("?GlobalPos", pick.GlobalPos);
+                        cmd.Parameters.AddWithValue("?SortOrder", pick.SortOrder.ToString ());
+                        cmd.Parameters.AddWithValue("?Enabled", pick.Enabled.ToString());
+                        
+                        cmd.ExecuteNonQuery();
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                 ": UpdateAvatarNotes exception {0}", e.Message);
+                return false;
+            }
+            return true;
+        }
+        
+        public bool DeletePicksRecord(UUID pickId)
+        {
+            string query = string.Empty;
+            
+            query += "DELETE FROM userpicks WHERE ";
+            query += "pickuuid = ?PickId";
+            
+            try
+            {
+                using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    
+                    using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("?PickId", pickId.ToString());
+                        
+                        cmd.ExecuteNonQuery();
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                 ": DeleteUserPickRecord exception {0}", e.Message);
+                return false;
+            }
+            return true;
+        }
+        #endregion Picks Queries
+        
+        #region Avatar Notes Queries
+        public bool GetAvatarNotes(ref UserProfileNotes notes)
+        {  // WIP
+            string query = string.Empty;
+            
+            query += "SELECT `notes` FROM usernotes WHERE ";
+            query += "useruuid = ?Id AND ";
+            query += "targetuuid = ?TargetId";
+            OSDArray data = new OSDArray();
+            
+            try
+            {
+                using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("?Id", notes.UserId.ToString());
+                        cmd.Parameters.AddWithValue("?TargetId", notes.TargetId.ToString());
+                        
+                        using (MySqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
+                        {
+                            if(reader.HasRows)
+                            {
+                                reader.Read();
+                                notes.Notes = OSD.FromString((string)reader["notes"]);
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                 ": GetAvatarNotes exception {0}", e.Message);
+            }
+            return true;
+        }
+        
+        public bool UpdateAvatarNotes(ref UserProfileNotes note, ref string result)
+        {          
+            string query = string.Empty;
+            bool remove;
+            
+            if(string.IsNullOrEmpty(note.Notes))
+            {
+                remove = true;
+                query += "DELETE FROM usernotes WHERE ";
+                query += "useruuid=?UserId AND ";
+                query += "targetuuid=?TargetId";
+            }
+            else
+            {
+                remove = false;
+                query += "INSERT INTO usernotes VALUES ( ";
+                query += "?UserId,";
+                query += "?TargetId,";
+                query += "?Notes )";
+                query += "ON DUPLICATE KEY ";
+                query += "UPDATE ";
+                query += "notes=?Notes";
+            }
+            
+            try
+            {
+                using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
+                    {
+                        if(!remove)
+                            cmd.Parameters.AddWithValue("?Notes", note.Notes);
+                        cmd.Parameters.AddWithValue("?TargetId", note.TargetId.ToString ());
+                        cmd.Parameters.AddWithValue("?UserId", note.UserId.ToString());
+                        
+                        cmd.ExecuteNonQuery();
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                 ": UpdateAvatarNotes exception {0}", e.Message);
+                return false;
+            }
+            return true;
+            
+        }
+        #endregion Avatar Notes Queries
+        
+        #region Avatar Properties
+        public bool GetAvatarProperties(ref UserProfileProperties props, ref string result)
+        {
+            string query = string.Empty;
+            
+            query += "SELECT * FROM userprofile WHERE ";
+            query += "useruuid = ?Id";
+            
+            try
+            {
+                using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("?Id", props.UserId.ToString());
+                        
+                        using (MySqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
+                        {
+                            if(reader.HasRows)
+                            {
+                                m_log.DebugFormat("[PROFILES_DATA]" +
+                                                  ": Getting data for {0}.", props.UserId);
+                                reader.Read();
+                                props.WebUrl = (string)reader["profileURL"];
+                                UUID.TryParse((string)reader["profileImage"], out props.ImageId);
+                                props.AboutText = (string)reader["profileAboutText"];
+                                UUID.TryParse((string)reader["profileFirstImage"], out props.FirstLifeImageId);
+                                props.FirstLifeText = (string)reader["profileFirstText"];
+                                UUID.TryParse((string)reader["profilePartner"], out props.PartnerId);
+                                props.WantToMask = (int)reader["profileWantToMask"];
+                                props.WantToText = (string)reader["profileWantToText"];
+                                props.SkillsMask = (int)reader["profileSkillsMask"];
+                                props.SkillsText = (string)reader["profileSkillsText"];
+                                props.Language = (string)reader["profileLanguages"];
+                            }
+                            else
+                            {
+                                m_log.DebugFormat("[PROFILES_DATA]" +
+                                                 ": No data for {0}", props.UserId);
+                               
+                                props.WebUrl = string.Empty;
+                                props.ImageId = UUID.Zero;
+                                props.AboutText = string.Empty;
+                                props.FirstLifeImageId = UUID.Zero;
+                                props.FirstLifeText = string.Empty;
+                                props.PartnerId = UUID.Zero;
+                                props.WantToMask = 0;
+                                props.WantToText = string.Empty;
+                                props.SkillsMask = 0;
+                                props.SkillsText = string.Empty;
+                                props.Language = string.Empty;
+                                props.PublishProfile = false;
+                                props.PublishMature = false;
+
+                                query = "INSERT INTO userprofile (";
+                                query += "useruuid, ";
+                                query += "profilePartner, ";
+                                query += "profileAllowPublish, ";
+                                query += "profileMaturePublish, ";
+                                query += "profileURL, ";
+                                query += "profileWantToMask, ";
+                                query += "profileWantToText, ";
+                                query += "profileSkillsMask, ";
+                                query += "profileSkillsText, ";
+                                query += "profileLanguages, ";
+                                query += "profileImage, ";
+                                query += "profileAboutText, ";
+                                query += "profileFirstImage, ";
+                                query += "profileFirstText) VALUES (";
+                                query += "?userId, ";
+                                query += "?profilePartner, ";
+                                query += "?profileAllowPublish, ";
+                                query += "?profileMaturePublish, ";
+                                query += "?profileURL, ";
+                                query += "?profileWantToMask, ";
+                                query += "?profileWantToText, ";
+                                query += "?profileSkillsMask, ";
+                                query += "?profileSkillsText, ";
+                                query += "?profileLanguages, ";
+                                query += "?profileImage, ";
+                                query += "?profileAboutText, ";
+                                query += "?profileFirstImage, ";
+                                query += "?profileFirstText)";
+
+                                dbcon.Close();
+                                dbcon.Open();
+
+                                using (MySqlCommand put = new MySqlCommand(query, dbcon))
+                                {
+                                    put.Parameters.AddWithValue("?userId", props.UserId.ToString());
+                                    put.Parameters.AddWithValue("?profilePartner", props.PartnerId.ToString());
+                                    put.Parameters.AddWithValue("?profileAllowPublish", props.PublishProfile);
+                                    put.Parameters.AddWithValue("?profileMaturePublish", props.PublishMature);
+                                    put.Parameters.AddWithValue("?profileURL", props.WebUrl);
+                                    put.Parameters.AddWithValue("?profileWantToMask", props.WantToMask);
+                                    put.Parameters.AddWithValue("?profileWantToText", props.WantToText);
+                                    put.Parameters.AddWithValue("?profileSkillsMask", props.SkillsMask);
+                                    put.Parameters.AddWithValue("?profileSkillsText", props.SkillsText);
+                                    put.Parameters.AddWithValue("?profileLanguages", props.Language);
+                                    put.Parameters.AddWithValue("?profileImage", props.ImageId.ToString());
+                                    put.Parameters.AddWithValue("?profileAboutText", props.AboutText);
+                                    put.Parameters.AddWithValue("?profileFirstImage", props.FirstLifeImageId.ToString());
+                                    put.Parameters.AddWithValue("?profileFirstText", props.FirstLifeText);
+
+                                    put.ExecuteNonQuery();
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                 ": Requst properties exception {0}", e.Message);
+                result = e.Message;
+                return false;
+            }
+            return true;
+        }
+        
+        public bool UpdateAvatarProperties(ref UserProfileProperties props, ref string result)
+        {            
+            string query = string.Empty;
+            
+            query += "UPDATE userprofile SET ";
+            query += "profilePartner=?profilePartner, ";
+            query += "profileURL=?profileURL, ";
+            query += "profileImage=?image, ";
+            query += "profileAboutText=?abouttext,";
+            query += "profileFirstImage=?firstlifeimage,";
+            query += "profileFirstText=?firstlifetext ";
+            query += "WHERE useruuid=?uuid";
+            
+            try
+            {
+                using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("?profileURL", props.WebUrl);
+                        cmd.Parameters.AddWithValue("?profilePartner", props.PartnerId.ToString());
+                        cmd.Parameters.AddWithValue("?image", props.ImageId.ToString());
+                        cmd.Parameters.AddWithValue("?abouttext", props.AboutText);
+                        cmd.Parameters.AddWithValue("?firstlifeimage", props.FirstLifeImageId.ToString());
+                        cmd.Parameters.AddWithValue("?firstlifetext", props.FirstLifeText);
+                        cmd.Parameters.AddWithValue("?uuid", props.UserId.ToString());
+                        
+                        cmd.ExecuteNonQuery();
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                 ": AgentPropertiesUpdate exception {0}", e.Message);
+                
+                return false;
+            }
+            return true;
+        }
+        #endregion Avatar Properties
+        
+        #region Avatar Interests
+        public bool UpdateAvatarInterests(UserProfileProperties up, ref string result)
+        {           
+            string query = string.Empty;
+            
+            query += "UPDATE userprofile SET ";
+            query += "profileWantToMask=?WantMask, ";
+            query += "profileWantToText=?WantText,";
+            query += "profileSkillsMask=?SkillsMask,";
+            query += "profileSkillsText=?SkillsText, ";
+            query += "profileLanguages=?Languages ";
+            query += "WHERE useruuid=?uuid";
+            
+            try
+            {
+                using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("?WantMask", up.WantToMask);
+                        cmd.Parameters.AddWithValue("?WantText", up.WantToText);
+                        cmd.Parameters.AddWithValue("?SkillsMask", up.SkillsMask);
+                        cmd.Parameters.AddWithValue("?SkillsText", up.SkillsText);
+                        cmd.Parameters.AddWithValue("?Languages", up.Language);
+                        cmd.Parameters.AddWithValue("?uuid", up.UserId.ToString());
+                        
+                        cmd.ExecuteNonQuery();
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                 ": AgentInterestsUpdate exception {0}", e.Message);
+                result = e.Message;
+                return false;
+            }
+            return true;
+        }
+        #endregion Avatar Interests
+
+        public OSDArray GetUserImageAssets(UUID avatarId)
+        {
+            OSDArray data = new OSDArray();
+            string query = "SELECT `snapshotuuid` FROM {0} WHERE `creatoruuid` = ?Id";
+
+            // Get classified image assets
+            
+            
+            try
+            {
+                using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+
+                    using (MySqlCommand cmd = new MySqlCommand(string.Format (query,"`classifieds`"), dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("?Id", avatarId.ToString());
+                        
+                        using (MySqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
+                        {
+                            if(reader.HasRows)
+                            {
+                                while (reader.Read())
+                                {
+                                    data.Add(new OSDString((string)reader["snapshotuuid"].ToString ()));
+                                }
+                            }
+                        }
+                    }
+
+                    dbcon.Close();
+                    dbcon.Open();
+
+                    using (MySqlCommand cmd = new MySqlCommand(string.Format (query,"`userpicks`"), dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("?Id", avatarId.ToString());
+                        
+                        using (MySqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
+                        {
+                            if(reader.HasRows)
+                            {
+                                while (reader.Read())
+                                {
+                                    data.Add(new OSDString((string)reader["snapshotuuid"].ToString ()));
+                                }
+                            }
+                        }
+                    }
+                    
+                    dbcon.Close();
+                    dbcon.Open();
+
+                    query = "SELECT `profileImage`, `profileFirstImage` FROM `userprofile` WHERE `useruuid` = ?Id";
+
+                    using (MySqlCommand cmd = new MySqlCommand(string.Format (query,"`userpicks`"), dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("?Id", avatarId.ToString());
+                        
+                        using (MySqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
+                        {
+                            if(reader.HasRows)
+                            {
+                                while (reader.Read())
+                                {
+                                    data.Add(new OSDString((string)reader["profileImage"].ToString ()));
+                                    data.Add(new OSDString((string)reader["profileFirstImage"].ToString ()));
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                  ": GetAvatarNotes exception {0}", e.Message);
+            }
+            return data;
+        }
+        
+        #region User Preferences
+        public OSDArray GetUserPreferences(UUID avatarId)
+        {
+            string query = string.Empty;
+            
+            query += "SELECT imviaemail,visible,email FROM ";
+            query += "usersettings WHERE ";
+            query += "useruuid = ?Id";
+            
+            OSDArray data = new OSDArray();
+            
+            try
+            {
+                using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("?Id", avatarId.ToString());
+                        
+                        using (MySqlDataReader reader = cmd.ExecuteReader())
+                        {
+                            if(reader.HasRows)
+                            {
+                                reader.Read();
+                                OSDMap record = new OSDMap();
+                                
+                                record.Add("imviaemail",OSD.FromString((string)reader["imviaemail"]));
+                                record.Add("visible",OSD.FromString((string)reader["visible"]));
+                                record.Add("email",OSD.FromString((string)reader["email"]));
+                                data.Add(record);
+                            }
+                            else
+                            {
+                                using (MySqlCommand put = new MySqlCommand(query, dbcon))
+                                {
+                                    query = "INSERT INTO usersettings VALUES ";
+                                    query += "(?Id,'false','false', '')";
+                                    
+                                    lock(Lock)
+                                    {
+                                        put.ExecuteNonQuery();
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                 ": Get preferences exception {0}", e.Message);
+            }
+            return data;
+        }
+        
+        public bool UpdateUserPreferences(bool emailIm, bool visible, UUID avatarId )
+        {           
+            string query = string.Empty;
+            
+            query += "UPDATE userpsettings SET ";
+            query += "imviaemail=?ImViaEmail, ";
+            query += "visible=?Visible,";
+            query += "WHERE useruuid=?uuid";
+            
+            try
+            {
+                using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("?ImViaEmail", emailIm.ToString().ToLower ());
+                        cmd.Parameters.AddWithValue("?WantText", visible.ToString().ToLower ());
+                        cmd.Parameters.AddWithValue("?uuid", avatarId.ToString());
+                        
+                        lock(Lock)
+                        {
+                            cmd.ExecuteNonQuery();
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                 ": AgentInterestsUpdate exception {0}", e.Message);
+                return false;
+            }
+            return true;
+        }
+        #endregion User Preferences
+        
+        #region Integration
+        public bool GetUserAppData(ref UserAppData props, ref string result)
+        {
+            string query = string.Empty;
+            
+            query += "SELECT * FROM `userdata` WHERE ";
+            query += "UserId = ?Id AND ";
+            query += "TagId = ?TagId";
+            
+            try
+            {
+                using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("?Id", props.UserId.ToString());
+                        cmd.Parameters.AddWithValue ("?TagId", props.TagId.ToString());
+                        
+                        using (MySqlDataReader reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
+                        {
+                            if(reader.HasRows)
+                            {
+                                reader.Read();
+                                props.DataKey = (string)reader["DataKey"];
+                                props.DataVal = (string)reader["DataVal"];
+                            }
+                            else
+                            {
+                                query += "INSERT INTO userdata VALUES ( ";
+                                query += "?UserId,";
+                                query += "?TagId,";
+                                query += "?DataKey,";
+                                query +=  "?DataVal) ";
+                                
+                                using (MySqlCommand put = new MySqlCommand(query, dbcon))
+                                {
+                                    put.Parameters.AddWithValue("?Id", props.UserId.ToString());
+                                    put.Parameters.AddWithValue("?TagId", props.TagId.ToString());
+                                    put.Parameters.AddWithValue("?DataKey", props.DataKey.ToString());
+                                    put.Parameters.AddWithValue("?DataVal", props.DataVal.ToString());
+                                    
+                                    lock(Lock)
+                                    {
+                                        put.ExecuteNonQuery();
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                 ": Requst application data exception {0}", e.Message);
+                result = e.Message;
+                return false;
+            }
+            return true;
+        }
+
+        public bool SetUserAppData(UserAppData props, ref string result)
+        {         
+            string query = string.Empty;
+            
+            query += "UPDATE userdata SET ";
+            query += "TagId = ?TagId, ";
+            query += "DataKey = ?DataKey, ";
+            query += "DataVal = ?DataVal WHERE ";
+            query += "UserId = ?UserId AND ";
+            query += "TagId = ?TagId";
+            
+            try
+            {
+                using (MySqlConnection dbcon = new MySqlConnection(ConnectionString))
+                {
+                    dbcon.Open();
+                    using (MySqlCommand cmd = new MySqlCommand(query, dbcon))
+                    {
+                        cmd.Parameters.AddWithValue("?UserId", props.UserId.ToString());
+                        cmd.Parameters.AddWithValue("?TagId", props.TagId.ToString ());
+                        cmd.Parameters.AddWithValue("?DataKey", props.DataKey.ToString ());
+                        cmd.Parameters.AddWithValue("?DataVal", props.DataKey.ToString ());
+                        
+                        lock(Lock)
+                        {
+                            cmd.ExecuteNonQuery();
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                 ": SetUserData exception {0}", e.Message);
+                return false;
+            }
+            return true;
+        }
+        #endregion Integration
+    }
+}
+
diff --git a/OpenSim/Data/MySQL/MySQLXAssetData.cs b/OpenSim/Data/MySQL/MySQLXAssetData.cs
index 15ac921..5f1d2ee 100644
--- a/OpenSim/Data/MySQL/MySQLXAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLXAssetData.cs
@@ -199,6 +199,8 @@ namespace OpenSim.Data.MySQL
         /// <remarks>On failure : Throw an exception and attempt to reconnect to database</remarks>
         public void StoreAsset(AssetBase asset)
         {
+//            m_log.DebugFormat("[XASSETS DB]: Storing asset {0} {1}", asset.Name, asset.ID);
+
             lock (m_dbLock)
             {
                 using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
diff --git a/OpenSim/Data/MySQL/Resources/EstateStore.migrations b/OpenSim/Data/MySQL/Resources/EstateStore.migrations
index df82a2e..2d1c2b5 100644
--- a/OpenSim/Data/MySQL/Resources/EstateStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/EstateStore.migrations
@@ -77,5 +77,11 @@ BEGIN;
 ALTER TABLE estate_settings AUTO_INCREMENT = 100;
 COMMIT;
 
+:VERSION 33                     #--------------------- 
 
+BEGIN;
+ALTER TABLE estate_settings ADD COLUMN `AllowLandmark` tinyint(4) NOT NULL default '1';
+ALTER TABLE estate_settings ADD COLUMN `AllowParcelChanges` tinyint(4) NOT NULL default '1';
+ALTER TABLE estate_settings ADD COLUMN `AllowSetHome` tinyint(4) NOT NULL default '1';
+COMMIT;
 
diff --git a/OpenSim/Data/MySQL/Resources/FriendsStore.migrations b/OpenSim/Data/MySQL/Resources/FriendsStore.migrations
index 55d82ec..5faf956 100644
--- a/OpenSim/Data/MySQL/Resources/FriendsStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/FriendsStore.migrations
@@ -9,7 +9,7 @@ CREATE TABLE `Friends` (
         `Offered` VARCHAR(32) NOT NULL DEFAULT 0, 
         PRIMARY KEY(`PrincipalID`, `Friend`), 
         KEY(`PrincipalID`)
-);
+) ENGINE=InnoDB;
 
 COMMIT;
 
diff --git a/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations b/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations
new file mode 100644
index 0000000..b4e4422
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/HGTravelStore.migrations
@@ -0,0 +1,18 @@
+:VERSION 1         # -------------------------- 
+
+BEGIN;
+
+CREATE TABLE `hg_traveling_data` (
+    `SessionID` VARCHAR(36) NOT NULL,
+    `UserID` VARCHAR(36) NOT NULL,
+        `GridExternalName` VARCHAR(255) NOT NULL DEFAULT '',
+        `ServiceToken` VARCHAR(255) NOT NULL DEFAULT '',
+        `ClientIPAddress` VARCHAR(16) NOT NULL DEFAULT '',
+        `MyIPAddress` VARCHAR(16) NOT NULL DEFAULT '',
+    `TMStamp` timestamp NOT NULL,
+    PRIMARY KEY  (`SessionID`),
+        KEY (`UserID`)
+) ENGINE=InnoDB;
+
+COMMIT;
+
diff --git a/OpenSim/Data/MySQL/Resources/UserProfiles.migrations b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations
new file mode 100644
index 0000000..c29f1ab
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations
@@ -0,0 +1,83 @@
+:VERSION 1         # -------------------------------
+
+begin;
+
+CREATE TABLE IF NOT EXISTS `classifieds` (
+  `classifieduuid` char(36) NOT NULL,
+  `creatoruuid` char(36) NOT NULL,
+  `creationdate` int(20) NOT NULL,
+  `expirationdate` int(20) NOT NULL,
+  `category` varchar(20) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `description` text NOT NULL,
+  `parceluuid` char(36) NOT NULL,
+  `parentestate` int(11) NOT NULL,
+  `snapshotuuid` char(36) NOT NULL,
+  `simname` varchar(255) NOT NULL,
+  `posglobal` varchar(255) NOT NULL,
+  `parcelname` varchar(255) NOT NULL,
+  `classifiedflags` int(8) NOT NULL,
+  `priceforlisting` int(5) NOT NULL,
+  PRIMARY KEY (`classifieduuid`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+
+CREATE TABLE IF NOT EXISTS `usernotes` (
+  `useruuid` varchar(36) NOT NULL,
+  `targetuuid` varchar(36) NOT NULL,
+  `notes` text NOT NULL,
+  UNIQUE KEY `useruuid` (`useruuid`,`targetuuid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+
+CREATE TABLE IF NOT EXISTS `userpicks` (
+  `pickuuid` varchar(36) NOT NULL,
+  `creatoruuid` varchar(36) NOT NULL,
+  `toppick` enum('true','false') NOT NULL,
+  `parceluuid` varchar(36) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `description` text NOT NULL,
+  `snapshotuuid` varchar(36) NOT NULL,
+  `user` varchar(255) NOT NULL,
+  `originalname` varchar(255) NOT NULL,
+  `simname` varchar(255) NOT NULL,
+  `posglobal` varchar(255) NOT NULL,
+  `sortorder` int(2) NOT NULL,
+  `enabled` enum('true','false') NOT NULL,
+  PRIMARY KEY (`pickuuid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+
+CREATE TABLE IF NOT EXISTS `userprofile` (
+  `useruuid` varchar(36) NOT NULL,
+  `profilePartner` varchar(36) NOT NULL,
+  `profileAllowPublish` binary(1) NOT NULL,
+  `profileMaturePublish` binary(1) NOT NULL,
+  `profileURL` varchar(255) NOT NULL,
+  `profileWantToMask` int(3) NOT NULL,
+  `profileWantToText` text NOT NULL,
+  `profileSkillsMask` int(3) NOT NULL,
+  `profileSkillsText` text NOT NULL,
+  `profileLanguages` text NOT NULL,
+  `profileImage` varchar(36) NOT NULL,
+  `profileAboutText` text NOT NULL,
+  `profileFirstImage` varchar(36) NOT NULL,
+  `profileFirstText` text NOT NULL,
+  PRIMARY KEY (`useruuid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+commit;
+
+:VERSION 2         # -------------------------------
+ 
+begin;
+CREATE TABLE IF NOT EXISTS `userdata` (
+    `UserId` char(36) NOT NULL,
+    `TagId` varchar(64) NOT NULL,
+    `DataKey` varchar(255),
+    `DataVal` varchar(255),
+    PRIMARY KEY (`UserId`,`TagId`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+commit;
+
diff --git a/OpenSim/Data/Null/NullEstateData.cs b/OpenSim/Data/Null/NullEstateData.cs
index d64136d..1df397d 100755
--- a/OpenSim/Data/Null/NullEstateData.cs
+++ b/OpenSim/Data/Null/NullEstateData.cs
@@ -42,6 +42,22 @@ namespace OpenSim.Data.Null
 
 //        private string m_connectionString;
 
+        private Dictionary<uint, EstateSettings> m_knownEstates = new Dictionary<uint, EstateSettings>();
+        private EstateSettings m_estate = null;
+
+        private EstateSettings GetEstate()
+        {
+            if (m_estate == null)
+            {
+                // This fools the initialization caller into thinking an estate was fetched (a check in OpenSimBase).
+                // The estate info is pretty empty so don't try banning anyone.
+                m_estate = new EstateSettings();
+                m_estate.EstateID = 1;
+                m_estate.OnSave += StoreEstateSettings;
+            }
+            return m_estate;
+        }
+
         protected virtual Assembly Assembly
         {
             get { return GetType().Assembly; }
@@ -68,21 +84,18 @@ namespace OpenSim.Data.Null
 
         public EstateSettings LoadEstateSettings(UUID regionID, bool create)
         {
-            // This fools the initialization caller into thinking an estate was fetched (a check in OpenSimBase).
-            // The estate info is pretty empty so don't try banning anyone.
-            EstateSettings oneEstate = new EstateSettings();
-            oneEstate.EstateID = 1;
-            return oneEstate;
+            return GetEstate();
         }
 
         public void StoreEstateSettings(EstateSettings es)
         {
+            m_estate = es;
             return;
         }
 
         public EstateSettings LoadEstateSettings(int estateID)
         {
-            return new EstateSettings();
+            return GetEstate();
         }
 
         public EstateSettings CreateNewEstate()
@@ -93,13 +106,14 @@ namespace OpenSim.Data.Null
         public List<EstateSettings> LoadEstateSettingsAll()
         {
             List<EstateSettings> allEstateSettings = new List<EstateSettings>();
-            allEstateSettings.Add(new EstateSettings());
+            allEstateSettings.Add(GetEstate());
             return allEstateSettings;
         }
         
         public List<int> GetEstatesAll()
         {
             List<int> result = new List<int>();
+            result.Add((int)GetEstate().EstateID);
             return result;            
         }
 
diff --git a/OpenSim/Data/Null/NullRegionData.cs b/OpenSim/Data/Null/NullRegionData.cs
index f707d98..d28cd99 100644
--- a/OpenSim/Data/Null/NullRegionData.cs
+++ b/OpenSim/Data/Null/NullRegionData.cs
@@ -239,6 +239,11 @@ namespace OpenSim.Data.Null
             return Get((int)RegionFlags.DefaultRegion, scopeID);
         }
 
+        public List<RegionData> GetDefaultHypergridRegions(UUID scopeID)
+        {
+            return Get((int)RegionFlags.DefaultHGRegion, scopeID);
+        }
+
         public List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y)
         {
             List<RegionData> regions = Get((int)RegionFlags.FallbackRegion, scopeID);
diff --git a/OpenSim/Data/Null/NullSimulationData.cs b/OpenSim/Data/Null/NullSimulationData.cs
index e7e5c41..15824a9 100644
--- a/OpenSim/Data/Null/NullSimulationData.cs
+++ b/OpenSim/Data/Null/NullSimulationData.cs
@@ -77,20 +77,34 @@ namespace OpenSim.Data.Null
         }
 
         #region Environment Settings
+
+        private Dictionary<UUID, string> EnvironmentSettings = new Dictionary<UUID, string>();
+
         public string LoadRegionEnvironmentSettings(UUID regionUUID)
         {
-            //This connector doesn't support the Environment module yet
+            lock (EnvironmentSettings)
+            {
+                if (EnvironmentSettings.ContainsKey(regionUUID))
+                    return EnvironmentSettings[regionUUID];
+            }
             return string.Empty;
         }
 
         public void StoreRegionEnvironmentSettings(UUID regionUUID, string settings)
         {
-            //This connector doesn't support the Environment module yet
+            lock (EnvironmentSettings)
+            {
+                EnvironmentSettings[regionUUID] = settings;
+            }
         }
 
         public void RemoveRegionEnvironmentSettings(UUID regionUUID)
         {
-            //This connector doesn't support the Environment module yet
+            lock (EnvironmentSettings)
+            {
+                if (EnvironmentSettings.ContainsKey(regionUUID))
+                    EnvironmentSettings.Remove(regionUUID);
+            }
         }
         #endregion
 
diff --git a/OpenSim/Data/SQLite/Resources/EstateStore.migrations b/OpenSim/Data/SQLite/Resources/EstateStore.migrations
index 62f6464..0aec49b 100644
--- a/OpenSim/Data/SQLite/Resources/EstateStore.migrations
+++ b/OpenSim/Data/SQLite/Resources/EstateStore.migrations
@@ -86,3 +86,12 @@ begin;
 alter table estate_settings add column DenyMinors tinyint not null default 0;
 
 commit;
+
+:VERSION 9
+
+begin;
+alter table estate_settings add column AllowLandmark tinyint not null default '1';
+alter table estate_settings add column AllowParcelChanges tinyint not null default '1';
+alter table estate_settings add column AllowSetHome tinyint not null default '1';
+commit;
+
diff --git a/OpenSim/Data/SQLite/Resources/HGTravelStore.migrations b/OpenSim/Data/SQLite/Resources/HGTravelStore.migrations
new file mode 100644
index 0000000..02612ce
--- /dev/null
+++ b/OpenSim/Data/SQLite/Resources/HGTravelStore.migrations
@@ -0,0 +1,18 @@
+:VERSION 2         # -------------------------- 
+
+BEGIN;
+
+CREATE TABLE hg_traveling_data(
+    SessionID VARCHAR(36) NOT NULL,
+    UserID VARCHAR(36) NOT NULL,
+    GridExternalName VARCHAR(255) NOT NULL DEFAULT "",
+    ServiceToken VARCHAR(255) NOT NULL DEFAULT "",
+    ClientIPAddress VARCHAR(16) NOT NULL DEFAULT "",
+    MyIPAddress VARCHAR(16) NOT NULL DEFAULT "",
+    TMStamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    PRIMARY KEY(SessionID),
+    UNIQUE(UserID)
+);
+
+COMMIT;
+
diff --git a/OpenSim/Data/SQLite/Resources/RegionStore.migrations b/OpenSim/Data/SQLite/Resources/RegionStore.migrations
index c6f4b48..bff039d 100644
--- a/OpenSim/Data/SQLite/Resources/RegionStore.migrations
+++ b/OpenSim/Data/SQLite/Resources/RegionStore.migrations
@@ -592,3 +592,11 @@ 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;
+
+:VERSION 29       #---------------- Keyframes
+
+BEGIN;
+
+ALTER TABLE prims ADD COLUMN `KeyframeMotion` blob;
+
+COMMIT;
diff --git a/OpenSim/Data/SQLite/Resources/UserProfiles.migrations b/OpenSim/Data/SQLite/Resources/UserProfiles.migrations
new file mode 100644
index 0000000..16581f6
--- /dev/null
+++ b/OpenSim/Data/SQLite/Resources/UserProfiles.migrations
@@ -0,0 +1,90 @@
+:VERSION 1         # -------------------------------
+
+begin;
+
+CREATE TABLE IF NOT EXISTS classifieds (
+  classifieduuid char(36) NOT NULL PRIMARY KEY,
+  creatoruuid char(36) NOT NULL,
+  creationdate int(20) NOT NULL,
+  expirationdate int(20) NOT NULL,
+  category varchar(20) NOT NULL,
+  name varchar(255) NOT NULL,
+  description text NOT NULL,
+  parceluuid char(36) NOT NULL,
+  parentestate int(11) NOT NULL,
+  snapshotuuid char(36) NOT NULL,
+  simname varchar(255) NOT NULL,
+  posglobal varchar(255) NOT NULL,
+  parcelname varchar(255) NOT NULL,
+  classifiedflags int(8) NOT NULL,
+  priceforlisting int(5) NOT NULL
+);
+
+commit;
+
+begin;
+
+CREATE TABLE IF NOT EXISTS usernotes (
+  useruuid varchar(36) NOT NULL,
+  targetuuid varchar(36) NOT NULL,
+  notes text NOT NULL,
+  UNIQUE (useruuid,targetuuid) ON CONFLICT REPLACE
+);
+
+commit;
+
+begin;
+
+CREATE TABLE IF NOT EXISTS userpicks (
+  pickuuid varchar(36) NOT NULL PRIMARY KEY,
+  creatoruuid varchar(36) NOT NULL,
+  toppick int NOT NULL,
+  parceluuid varchar(36) NOT NULL,
+  name varchar(255) NOT NULL,
+  description text NOT NULL,
+  snapshotuuid varchar(36) NOT NULL,
+  user varchar(255) NOT NULL,
+  originalname varchar(255) NOT NULL,
+  simname varchar(255) NOT NULL,
+  posglobal varchar(255) NOT NULL,
+  sortorder int(2) NOT NULL,
+  enabled int NOT NULL
+);
+
+commit;
+
+begin;
+
+CREATE TABLE IF NOT EXISTS userprofile (
+  useruuid varchar(36) NOT NULL PRIMARY KEY,
+  profilePartner varchar(36) NOT NULL,
+  profileAllowPublish binary(1) NOT NULL,
+  profileMaturePublish binary(1) NOT NULL,
+  profileURL varchar(255) NOT NULL,
+  profileWantToMask int(3) NOT NULL,
+  profileWantToText text NOT NULL,
+  profileSkillsMask int(3) NOT NULL,
+  profileSkillsText text NOT NULL,
+  profileLanguages text NOT NULL,
+  profileImage varchar(36) NOT NULL,
+  profileAboutText text NOT NULL,
+  profileFirstImage varchar(36) NOT NULL,
+  profileFirstText text NOT NULL
+);
+
+commit;
+
+:VERSION 2         # -------------------------------
+ 
+begin;
+
+CREATE TABLE IF NOT EXISTS userdata (
+    UserId char(36) NOT NULL,
+    TagId varchar(64) NOT NULL,
+    DataKey varchar(255),
+    DataVal varchar(255),
+    PRIMARY KEY (UserId,TagId)
+);
+
+commit;
+
diff --git a/OpenSim/Data/SQLite/SQLiteGridUserData.cs b/OpenSim/Data/SQLite/SQLiteGridUserData.cs
index 1bb5ed8..d8c52f8 100644
--- a/OpenSim/Data/SQLite/SQLiteGridUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteGridUserData.cs
@@ -56,6 +56,10 @@ namespace OpenSim.Data.SQLite
             return ret[0];
         }
 
+        public GridUserData[] GetAll(string userID)
+        {
+            return base.Get(String.Format("UserID LIKE '{0}%'", userID));
+        }
 
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Data/SQLite/SQLiteHGTravelData.cs b/OpenSim/Data/SQLite/SQLiteHGTravelData.cs
new file mode 100644
index 0000000..db288b2
--- /dev/null
+++ b/OpenSim/Data/SQLite/SQLiteHGTravelData.cs
@@ -0,0 +1,82 @@
+/*
+ * 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.Data;
+using System.Reflection;
+using System.Threading;
+using log4net;
+using OpenMetaverse;
+using OpenSim.Framework;
+using Mono.Data.Sqlite;
+
+namespace OpenSim.Data.SQLite
+{
+    /// <summary>
+    /// A SQL Interface for user grid data
+    /// </summary>
+    public class SQLiteHGTravelData : SQLiteGenericTableHandler<HGTravelingData>, IHGTravelingData
+    {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        public SQLiteHGTravelData(string connectionString, string realm) 
+            : base(connectionString, realm, "HGTravelStore") {}
+
+        public HGTravelingData Get(UUID sessionID)
+        {
+            HGTravelingData[] ret = Get("SessionID", sessionID.ToString());
+
+            if (ret.Length == 0)
+                return null;
+
+            return ret[0];
+        }
+
+        public HGTravelingData[] GetSessions(UUID userID)
+        {
+            return base.Get("UserID", userID.ToString());
+        }
+
+        public bool Delete(UUID sessionID)
+        {
+            return Delete("SessionID", sessionID.ToString());
+        }
+
+        public void DeleteOld()
+        {
+            using (SqliteCommand cmd = new SqliteCommand())
+            {
+                cmd.CommandText = String.Format("delete from {0} where TMStamp < datetime('now', '-2 day') ", m_Realm);
+
+                DoQuery(cmd);
+            }
+
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
index 76f717d..52502b3 100644
--- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
@@ -1244,6 +1244,7 @@ namespace OpenSim.Data.SQLite
             createCol(prims, "Friction", typeof(Double));
             createCol(prims, "Restitution", typeof(Double));
 
+            createCol(prims, "KeyframeMotion", typeof(Byte[]));
             // Add in contraints
             prims.PrimaryKey = new DataColumn[] { prims.Columns["UUID"] };
 
@@ -1739,6 +1740,20 @@ namespace OpenSim.Data.SQLite
             prim.Friction = Convert.ToSingle(row["Friction"]);
             prim.Restitution = Convert.ToSingle(row["Restitution"]);
 
+            
+            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;
+            }
+            
             return prim;
         }
 
@@ -2161,7 +2176,7 @@ namespace OpenSim.Data.SQLite
 
             row["MediaURL"] = prim.MediaUrl;
 
-            if (prim.DynAttrs.Count > 0)
+            if (prim.DynAttrs.CountNamespaces > 0)
                 row["DynAttrs"] = prim.DynAttrs.ToXml();
             else
                 row["DynAttrs"] = null;
@@ -2171,6 +2186,13 @@ namespace OpenSim.Data.SQLite
             row["GravityModifier"] = (double)prim.GravityModifier;
             row["Friction"] = (double)prim.Friction;
             row["Restitution"] = (double)prim.Restitution;
+
+            if (prim.KeyframeMotion != null)
+                row["KeyframeMotion"] = prim.KeyframeMotion.Serialize();
+            else
+                row["KeyframeMotion"] = new Byte[0];
+            
+            
         }
 
         /// <summary>
diff --git a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
new file mode 100644
index 0000000..cc1dac1
--- /dev/null
+++ b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
@@ -0,0 +1,904 @@
+/*
+ * 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.Data;
+using System.Reflection;
+using log4net;
+#if CSharpSqlite
+using Community.CsharpSqlite.Sqlite;
+#else
+using Mono.Data.Sqlite;
+#endif
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+
+namespace OpenSim.Data.SQLite
+{
+    public class SQLiteUserProfilesData: IProfilesData
+    {
+        private static readonly ILog m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        
+        private SqliteConnection m_connection;
+        private string m_connectionString;
+        
+        private FieldInfo[] m_Fields;
+        private Dictionary<string, FieldInfo> m_FieldMap =
+            new Dictionary<string, FieldInfo>();
+        
+        protected virtual Assembly Assembly
+        {
+            get { return GetType().Assembly; }
+        }
+        
+        public SQLiteUserProfilesData()
+        {
+        }
+        
+        public SQLiteUserProfilesData(string connectionString)
+        {
+            Initialise(connectionString);
+        }
+        
+        public void Initialise(string connectionString)
+        {
+            if (Util.IsWindows())
+                Util.LoadArchSpecificWindowsDll("sqlite3.dll");
+            
+            m_connectionString = connectionString;
+            
+            m_log.Info("[PROFILES_DATA]: Sqlite - connecting: "+m_connectionString);
+            
+            m_connection = new SqliteConnection(m_connectionString);
+            m_connection.Open();
+            
+            Migration m = new Migration(m_connection, Assembly, "UserProfiles");
+            m.Update();
+        }
+        
+        private string[] FieldList
+        {
+            get { return new List<string>(m_FieldMap.Keys).ToArray(); }
+        }
+
+        #region IProfilesData implementation
+        public OSDArray GetClassifiedRecords(UUID creatorId)
+        {
+            OSDArray data = new OSDArray();
+            string query = "SELECT classifieduuid, name FROM classifieds WHERE creatoruuid = :Id";
+            IDataReader reader = null;
+
+            using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
+            {
+                cmd.CommandText = query;
+                cmd.Parameters.AddWithValue(":Id", creatorId);
+                reader = cmd.ExecuteReader();
+            }
+
+            while (reader.Read())
+            {
+                OSDMap n = new OSDMap();
+                UUID Id = UUID.Zero;
+                string Name = null;
+                try
+                {
+                    UUID.TryParse(Convert.ToString( reader["classifieduuid"]), out Id);
+                    Name = Convert.ToString(reader["name"]);
+                }
+                catch (Exception e)
+                {
+                    m_log.DebugFormat("[PROFILES_DATA]" +
+                                      ": UserAccount exception {0}", e.Message);
+                }
+                n.Add("classifieduuid", OSD.FromUUID(Id));
+                n.Add("name", OSD.FromString(Name));
+                data.Add(n);
+            }
+
+            reader.Close();
+            
+            return data;
+        }
+        public bool UpdateClassifiedRecord(UserClassifiedAdd ad, ref string result)
+        {
+            string query = string.Empty;
+
+            query += "INSERT OR REPLACE INTO classifieds (";
+            query += "`classifieduuid`,";
+            query += "`creatoruuid`,";
+            query += "`creationdate`,";
+            query += "`expirationdate`,";
+            query += "`category`,";
+            query += "`name`,";
+            query += "`description`,";
+            query += "`parceluuid`,";
+            query += "`parentestate`,";
+            query += "`snapshotuuid`,";
+            query += "`simname`,";
+            query += "`posglobal`,";
+            query += "`parcelname`,";
+            query += "`classifiedflags`,";
+            query += "`priceforlisting`) ";
+            query += "VALUES (";
+            query += ":ClassifiedId,";
+            query += ":CreatorId,";
+            query += ":CreatedDate,";
+            query += ":ExpirationDate,";
+            query += ":Category,";
+            query += ":Name,";
+            query += ":Description,";
+            query += ":ParcelId,";
+            query += ":ParentEstate,";
+            query += ":SnapshotId,";
+            query += ":SimName,";
+            query += ":GlobalPos,";
+            query += ":ParcelName,";
+            query += ":Flags,";
+            query += ":ListingPrice ) ";
+            
+            if(string.IsNullOrEmpty(ad.ParcelName))
+                ad.ParcelName = "Unknown";
+            if(ad.ParcelId == null)
+                ad.ParcelId = UUID.Zero;
+            if(string.IsNullOrEmpty(ad.Description))
+                ad.Description = "No Description";
+            
+            DateTime epoch = new DateTime(1970, 1, 1);
+            DateTime now = DateTime.Now;
+            TimeSpan epochnow = now - epoch;
+            TimeSpan duration;
+            DateTime expiration;
+            TimeSpan epochexp;
+            
+            if(ad.Flags == 2)
+            {
+                duration = new TimeSpan(7,0,0,0);
+                expiration = now.Add(duration);
+                epochexp = expiration - epoch;
+            }
+            else
+            {
+                duration = new TimeSpan(365,0,0,0);
+                expiration = now.Add(duration);
+                epochexp = expiration - epoch;
+            }
+            ad.CreationDate = (int)epochnow.TotalSeconds;
+            ad.ExpirationDate = (int)epochexp.TotalSeconds;
+
+            try {
+                using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
+                {
+                    cmd.CommandText = query;
+                    cmd.Parameters.AddWithValue(":ClassifiedId", ad.ClassifiedId.ToString());
+                    cmd.Parameters.AddWithValue(":CreatorId", ad.CreatorId.ToString());
+                    cmd.Parameters.AddWithValue(":CreatedDate", ad.CreationDate.ToString());
+                    cmd.Parameters.AddWithValue(":ExpirationDate", ad.ExpirationDate.ToString());
+                    cmd.Parameters.AddWithValue(":Category", ad.Category.ToString());
+                    cmd.Parameters.AddWithValue(":Name", ad.Name.ToString());
+                    cmd.Parameters.AddWithValue(":Description", ad.Description.ToString());
+                    cmd.Parameters.AddWithValue(":ParcelId", ad.ParcelId.ToString());
+                    cmd.Parameters.AddWithValue(":ParentEstate", ad.ParentEstate.ToString());
+                    cmd.Parameters.AddWithValue(":SnapshotId", ad.SnapshotId.ToString ());
+                    cmd.Parameters.AddWithValue(":SimName", ad.SimName.ToString());
+                    cmd.Parameters.AddWithValue(":GlobalPos", ad.GlobalPos.ToString());
+                    cmd.Parameters.AddWithValue(":ParcelName", ad.ParcelName.ToString());
+                    cmd.Parameters.AddWithValue(":Flags", ad.Flags.ToString());
+                    cmd.Parameters.AddWithValue(":ListingPrice", ad.Price.ToString ());
+                    
+                    cmd.ExecuteNonQuery();
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                  ": ClassifiedesUpdate exception {0}", e.Message);
+                result = e.Message;
+                return false;
+            }
+            return true;
+        }
+        public bool DeleteClassifiedRecord(UUID recordId)
+        {
+            string query = string.Empty;
+            
+            query += "DELETE FROM classifieds WHERE ";
+            query += "classifieduuid = :ClasifiedId";
+            
+            try
+            {
+                using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
+                {
+                    cmd.CommandText = query;
+                    cmd.Parameters.AddWithValue(":ClassifiedId", recordId.ToString());
+ 
+                    cmd.ExecuteNonQuery();
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                  ": DeleteClassifiedRecord exception {0}", e.Message);
+                return false;
+            }
+            return true;
+        }
+
+        public bool GetClassifiedInfo(ref UserClassifiedAdd ad, ref string result)
+        {
+            IDataReader reader = null;
+            string query = string.Empty;
+            
+            query += "SELECT * FROM classifieds WHERE ";
+            query += "classifieduuid = :AdId";
+            
+            try
+            {
+                using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
+                {
+                    cmd.CommandText = query;
+                    cmd.Parameters.AddWithValue(":AdId", ad.ClassifiedId.ToString());
+                    
+                    using (reader = cmd.ExecuteReader())
+                    {
+                        if(reader.Read ())
+                        {
+                            ad.CreatorId = new UUID(reader["creatoruuid"].ToString());
+                            ad.ParcelId = new UUID(reader["parceluuid"].ToString ());
+                            ad.SnapshotId = new UUID(reader["snapshotuuid"].ToString ());
+                            ad.CreationDate = Convert.ToInt32(reader["creationdate"]);
+                            ad.ExpirationDate = Convert.ToInt32(reader["expirationdate"]);
+                            ad.ParentEstate = Convert.ToInt32(reader["parentestate"]);
+                            ad.Flags = (byte) Convert.ToUInt32(reader["classifiedflags"]);
+                            ad.Category = Convert.ToInt32(reader["category"]);
+                            ad.Price = Convert.ToInt16(reader["priceforlisting"]);
+                            ad.Name = reader["name"].ToString();
+                            ad.Description = reader["description"].ToString();
+                            ad.SimName = reader["simname"].ToString();
+                            ad.GlobalPos = reader["posglobal"].ToString();
+                            ad.ParcelName = reader["parcelname"].ToString();
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                  ": GetPickInfo exception {0}", e.Message);
+            }
+            return true;
+        }
+
+        public OSDArray GetAvatarPicks(UUID avatarId)
+        {
+            IDataReader reader = null;
+            string query = string.Empty;
+            
+            query += "SELECT `pickuuid`,`name` FROM userpicks WHERE ";
+            query += "creatoruuid = :Id";
+            OSDArray data = new OSDArray();
+            
+            try
+            {
+                using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
+                {
+                    cmd.CommandText = query;
+                    cmd.Parameters.AddWithValue(":Id", avatarId.ToString());
+                    
+                    using (reader = cmd.ExecuteReader())
+                    {
+                        while (reader.Read())
+                        {
+                            OSDMap record = new OSDMap();
+                            
+                            record.Add("pickuuid",OSD.FromString((string)reader["pickuuid"]));
+                            record.Add("name",OSD.FromString((string)reader["name"]));
+                            data.Add(record);
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                  ": GetAvatarPicks exception {0}", e.Message);
+            }
+            return data;
+        }
+        public UserProfilePick GetPickInfo(UUID avatarId, UUID pickId)
+        {
+            IDataReader reader = null;
+            string query = string.Empty;
+            UserProfilePick pick = new UserProfilePick();
+            
+            query += "SELECT * FROM userpicks WHERE ";
+            query += "creatoruuid = :CreatorId AND ";
+            query += "pickuuid =  :PickId";
+            
+            try
+            {
+                using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
+                {
+                    cmd.CommandText = query;
+                    cmd.Parameters.AddWithValue(":CreatorId", avatarId.ToString());
+                    cmd.Parameters.AddWithValue(":PickId", pickId.ToString());
+                    
+                    using (reader = cmd.ExecuteReader())
+                    {
+                        
+                        while (reader.Read())
+                        {
+                            string description = (string)reader["description"];
+                            
+                            if (string.IsNullOrEmpty(description))
+                                description = "No description given.";
+                            
+                            UUID.TryParse((string)reader["pickuuid"], out pick.PickId);
+                            UUID.TryParse((string)reader["creatoruuid"], out pick.CreatorId);
+                            UUID.TryParse((string)reader["parceluuid"], out pick.ParcelId);
+                            UUID.TryParse((string)reader["snapshotuuid"], out pick.SnapshotId);
+                            pick.GlobalPos = (string)reader["posglobal"];
+                            bool.TryParse((string)reader["toppick"].ToString(), out pick.TopPick);
+                            bool.TryParse((string)reader["enabled"].ToString(), out pick.Enabled);
+                            pick.Name = (string)reader["name"];
+                            pick.Desc = description;
+                            pick.User = (string)reader["user"];
+                            pick.OriginalName = (string)reader["originalname"];
+                            pick.SimName = (string)reader["simname"];
+                            pick.SortOrder = (int)reader["sortorder"];
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                  ": GetPickInfo exception {0}", e.Message);
+            }
+            return pick;
+        }
+
+        public bool UpdatePicksRecord(UserProfilePick pick)
+        {      
+            string query = string.Empty;
+
+            query += "INSERT OR REPLACE INTO userpicks (";
+            query += "pickuuid, ";
+            query += "creatoruuid, ";
+            query += "toppick, ";
+            query += "parceluuid, ";
+            query += "name, ";
+            query += "description, ";
+            query += "snapshotuuid, ";
+            query += "user, ";
+            query += "originalname, ";
+            query += "simname, ";
+            query += "posglobal, ";
+            query += "sortorder, ";
+            query += "enabled ) ";
+            query += "VALUES (";
+            query += ":PickId,";
+            query += ":CreatorId,";
+            query += ":TopPick,";
+            query += ":ParcelId,";
+            query += ":Name,";
+            query += ":Desc,";
+            query += ":SnapshotId,";
+            query += ":User,";
+            query += ":Original,";
+            query += ":SimName,";
+            query += ":GlobalPos,";
+            query += ":SortOrder,";
+            query += ":Enabled) ";
+            
+            try
+            {
+                using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
+                {
+                    int top_pick;
+                    int.TryParse(pick.TopPick.ToString(), out top_pick);
+                    int enabled;
+                    int.TryParse(pick.Enabled.ToString(), out enabled);
+
+                    cmd.CommandText = query;
+                    cmd.Parameters.AddWithValue(":PickId", pick.PickId.ToString());
+                    cmd.Parameters.AddWithValue(":CreatorId", pick.CreatorId.ToString());
+                    cmd.Parameters.AddWithValue(":TopPick", top_pick);
+                    cmd.Parameters.AddWithValue(":ParcelId", pick.ParcelId.ToString());
+                    cmd.Parameters.AddWithValue(":Name", pick.Name.ToString());
+                    cmd.Parameters.AddWithValue(":Desc", pick.Desc.ToString());
+                    cmd.Parameters.AddWithValue(":SnapshotId", pick.SnapshotId.ToString());
+                    cmd.Parameters.AddWithValue(":User", pick.User.ToString());
+                    cmd.Parameters.AddWithValue(":Original", pick.OriginalName.ToString());
+                    cmd.Parameters.AddWithValue(":SimName",pick.SimName.ToString());
+                    cmd.Parameters.AddWithValue(":GlobalPos", pick.GlobalPos);
+                    cmd.Parameters.AddWithValue(":SortOrder", pick.SortOrder.ToString ());
+                    cmd.Parameters.AddWithValue(":Enabled", enabled);
+
+                    cmd.ExecuteNonQuery();
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                  ": UpdateAvatarNotes exception {0}", e.Message);
+                return false;
+            }
+            return true;
+        }
+
+        public bool DeletePicksRecord(UUID pickId)
+        {
+            string query = string.Empty;
+            
+            query += "DELETE FROM userpicks WHERE ";
+            query += "pickuuid = :PickId";
+            
+            try
+            {
+                using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
+                {
+                    cmd.CommandText = query;
+                    cmd.Parameters.AddWithValue(":PickId", pickId.ToString());
+                    cmd.ExecuteNonQuery();
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                  ": DeleteUserPickRecord exception {0}", e.Message);
+                return false;
+            }
+            return true;
+        }
+
+        public bool GetAvatarNotes(ref UserProfileNotes notes)
+        {  
+            IDataReader reader = null;
+            string query = string.Empty;
+            
+            query += "SELECT `notes` FROM usernotes WHERE ";
+            query += "useruuid = :Id AND ";
+            query += "targetuuid = :TargetId";
+            OSDArray data = new OSDArray();
+            
+            try
+            {
+                using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
+                {
+                    cmd.CommandText = query;
+                    cmd.Parameters.AddWithValue(":Id", notes.UserId.ToString());
+                    cmd.Parameters.AddWithValue(":TargetId", notes.TargetId.ToString());
+                    
+                    using (reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
+                    {
+                        while (reader.Read())
+                        {
+                            notes.Notes = OSD.FromString((string)reader["notes"]);
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                  ": GetAvatarNotes exception {0}", e.Message);
+            }
+            return true;
+        }
+
+        public bool UpdateAvatarNotes(ref UserProfileNotes note, ref string result)
+        {          
+            string query = string.Empty;
+            bool remove;
+            
+            if(string.IsNullOrEmpty(note.Notes))
+            {
+                remove = true;
+                query += "DELETE FROM usernotes WHERE ";
+                query += "useruuid=:UserId AND ";
+                query += "targetuuid=:TargetId";
+            }
+            else
+            {
+                remove = false;
+                query += "INSERT OR REPLACE INTO usernotes VALUES ( ";
+                query += ":UserId,";
+                query += ":TargetId,";
+                query += ":Notes )";
+            }
+            
+            try
+            {
+                using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
+                {
+                    cmd.CommandText = query;
+
+                    if(!remove)
+                        cmd.Parameters.AddWithValue(":Notes", note.Notes);
+                    cmd.Parameters.AddWithValue(":TargetId", note.TargetId.ToString ());
+                    cmd.Parameters.AddWithValue(":UserId", note.UserId.ToString());
+                    
+                    cmd.ExecuteNonQuery();
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                  ": UpdateAvatarNotes exception {0}", e.Message);
+                return false;
+            }
+            return true;
+        }
+
+        public bool GetAvatarProperties(ref UserProfileProperties props, ref string result)
+        {
+            IDataReader reader = null;
+            string query = string.Empty;
+            
+            query += "SELECT * FROM userprofile WHERE ";
+            query += "useruuid = :Id";
+
+                using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
+                {
+                    cmd.CommandText = query;
+                    cmd.Parameters.AddWithValue(":Id", props.UserId.ToString());
+                    
+
+                    try
+                    {
+                        reader = cmd.ExecuteReader();
+                    }
+                    catch(Exception e)
+                    {
+                        m_log.DebugFormat("[PROFILES_DATA]" +
+                                          ": GetAvatarProperties exception {0}", e.Message);
+                        result = e.Message;
+                        return false;
+                    }
+                        if(reader != null && reader.Read())
+                        {
+                            m_log.DebugFormat("[PROFILES_DATA]" +
+                                              ": Getting data for {0}.", props.UserId);
+
+                            props.WebUrl = (string)reader["profileURL"];
+                            UUID.TryParse((string)reader["profileImage"], out props.ImageId);
+                            props.AboutText = (string)reader["profileAboutText"];
+                            UUID.TryParse((string)reader["profileFirstImage"], out props.FirstLifeImageId);
+                            props.FirstLifeText = (string)reader["profileFirstText"];
+                            UUID.TryParse((string)reader["profilePartner"], out props.PartnerId);
+                            props.WantToMask = (int)reader["profileWantToMask"];
+                            props.WantToText = (string)reader["profileWantToText"];
+                            props.SkillsMask = (int)reader["profileSkillsMask"];
+                            props.SkillsText = (string)reader["profileSkillsText"];
+                            props.Language = (string)reader["profileLanguages"];
+                        }
+                        else
+                        {
+                            m_log.DebugFormat("[PROFILES_DATA]" +
+                                              ": No data for {0}", props.UserId);
+                            
+                            props.WebUrl = string.Empty;
+                            props.ImageId = UUID.Zero;
+                            props.AboutText = string.Empty;
+                            props.FirstLifeImageId = UUID.Zero;
+                            props.FirstLifeText = string.Empty;
+                            props.PartnerId = UUID.Zero;
+                            props.WantToMask = 0;
+                            props.WantToText = string.Empty;
+                            props.SkillsMask = 0;
+                            props.SkillsText = string.Empty;
+                            props.Language = string.Empty;
+                            props.PublishProfile = false;
+                            props.PublishMature = false;
+                            
+                            query = "INSERT INTO userprofile (";
+                            query += "useruuid, ";
+                            query += "profilePartner, ";
+                            query += "profileAllowPublish, ";
+                            query += "profileMaturePublish, ";
+                            query += "profileURL, ";
+                            query += "profileWantToMask, ";
+                            query += "profileWantToText, ";
+                            query += "profileSkillsMask, ";
+                            query += "profileSkillsText, ";
+                            query += "profileLanguages, ";
+                            query += "profileImage, ";
+                            query += "profileAboutText, ";
+                            query += "profileFirstImage, ";
+                            query += "profileFirstText) VALUES (";
+                            query += ":userId, ";
+                            query += ":profilePartner, ";
+                            query += ":profileAllowPublish, ";
+                            query += ":profileMaturePublish, ";
+                            query += ":profileURL, ";
+                            query += ":profileWantToMask, ";
+                            query += ":profileWantToText, ";
+                            query += ":profileSkillsMask, ";
+                            query += ":profileSkillsText, ";
+                            query += ":profileLanguages, ";
+                            query += ":profileImage, ";
+                            query += ":profileAboutText, ";
+                            query += ":profileFirstImage, ";
+                            query += ":profileFirstText)";
+
+                            using (SqliteCommand put = (SqliteCommand)m_connection.CreateCommand())
+                            {
+                                put.CommandText = query;
+                                put.Parameters.AddWithValue(":userId", props.UserId.ToString());
+                                put.Parameters.AddWithValue(":profilePartner", props.PartnerId.ToString());
+                                put.Parameters.AddWithValue(":profileAllowPublish", props.PublishProfile);
+                                put.Parameters.AddWithValue(":profileMaturePublish", props.PublishMature);
+                                put.Parameters.AddWithValue(":profileURL", props.WebUrl);
+                                put.Parameters.AddWithValue(":profileWantToMask", props.WantToMask);
+                                put.Parameters.AddWithValue(":profileWantToText", props.WantToText);
+                                put.Parameters.AddWithValue(":profileSkillsMask", props.SkillsMask);
+                                put.Parameters.AddWithValue(":profileSkillsText", props.SkillsText);
+                                put.Parameters.AddWithValue(":profileLanguages", props.Language);
+                                put.Parameters.AddWithValue(":profileImage", props.ImageId.ToString());
+                                put.Parameters.AddWithValue(":profileAboutText", props.AboutText);
+                                put.Parameters.AddWithValue(":profileFirstImage", props.FirstLifeImageId.ToString());
+                                put.Parameters.AddWithValue(":profileFirstText", props.FirstLifeText);
+                                
+                                put.ExecuteNonQuery();
+                            }
+                        }
+                }
+            return true;
+        }
+
+        public bool UpdateAvatarProperties(ref UserProfileProperties props, ref string result)
+        {           
+            string query = string.Empty;
+            
+            query += "UPDATE userprofile SET ";
+            query += "profilePartner=:profilePartner, ";
+            query += "profileURL=:profileURL, ";
+            query += "profileImage=:image, ";
+            query += "profileAboutText=:abouttext,";
+            query += "profileFirstImage=:firstlifeimage,";
+            query += "profileFirstText=:firstlifetext ";
+            query += "WHERE useruuid=:uuid";
+            
+            try
+            {
+                using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
+                {
+                    cmd.CommandText = query;
+                    cmd.Parameters.AddWithValue(":profileURL", props.WebUrl);
+                    cmd.Parameters.AddWithValue(":profilePartner", props.PartnerId.ToString());
+                    cmd.Parameters.AddWithValue(":image", props.ImageId.ToString());
+                    cmd.Parameters.AddWithValue(":abouttext", props.AboutText);
+                    cmd.Parameters.AddWithValue(":firstlifeimage", props.FirstLifeImageId.ToString());
+                    cmd.Parameters.AddWithValue(":firstlifetext", props.FirstLifeText);
+                    cmd.Parameters.AddWithValue(":uuid", props.UserId.ToString());
+                    
+                    cmd.ExecuteNonQuery();
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                  ": AgentPropertiesUpdate exception {0}", e.Message);
+                
+                return false;
+            }
+            return true;
+        }
+
+        public bool UpdateAvatarInterests(UserProfileProperties up, ref string result)
+        {         
+            string query = string.Empty;
+            
+            query += "UPDATE userprofile SET ";
+            query += "profileWantToMask=:WantMask, ";
+            query += "profileWantToText=:WantText,";
+            query += "profileSkillsMask=:SkillsMask,";
+            query += "profileSkillsText=:SkillsText, ";
+            query += "profileLanguages=:Languages ";
+            query += "WHERE useruuid=:uuid";
+            
+            try
+            {
+                using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
+                {
+                    cmd.CommandText = query;
+                    cmd.Parameters.AddWithValue(":WantMask", up.WantToMask);
+                    cmd.Parameters.AddWithValue(":WantText", up.WantToText);
+                    cmd.Parameters.AddWithValue(":SkillsMask", up.SkillsMask);
+                    cmd.Parameters.AddWithValue(":SkillsText", up.SkillsText);
+                    cmd.Parameters.AddWithValue(":Languages", up.Language);
+                    cmd.Parameters.AddWithValue(":uuid", up.UserId.ToString());
+                    
+                    cmd.ExecuteNonQuery();
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                  ": AgentInterestsUpdate exception {0}", e.Message);
+                result = e.Message;
+                return false;
+            }
+            return true;
+        }
+        public bool GetUserAppData(ref UserAppData props, ref string result)
+        {
+            IDataReader reader = null;
+            string query = string.Empty;
+            
+            query += "SELECT * FROM `userdata` WHERE ";
+            query += "UserId = :Id AND ";
+            query += "TagId = :TagId";
+            
+            try
+            {
+                using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
+                {
+                    cmd.CommandText = query;
+                    cmd.Parameters.AddWithValue(":Id", props.UserId.ToString());
+                    cmd.Parameters.AddWithValue (":TagId", props.TagId.ToString());
+                    
+                    using (reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
+                    {
+                        if(reader.Read())
+                        {
+                            props.DataKey = (string)reader["DataKey"];
+                            props.DataVal = (string)reader["DataVal"];
+                        }
+                        else
+                        {
+                            query += "INSERT INTO userdata VALUES ( ";
+                            query += ":UserId,";
+                            query += ":TagId,";
+                            query += ":DataKey,";
+                            query +=  ":DataVal) ";
+                            
+                            using (SqliteCommand put = (SqliteCommand)m_connection.CreateCommand())
+                            {
+                                put.Parameters.AddWithValue(":Id", props.UserId.ToString());
+                                put.Parameters.AddWithValue(":TagId", props.TagId.ToString());
+                                put.Parameters.AddWithValue(":DataKey", props.DataKey.ToString());
+                                put.Parameters.AddWithValue(":DataVal", props.DataVal.ToString());
+
+                                put.ExecuteNonQuery();
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                  ": Requst application data exception {0}", e.Message);
+                result = e.Message;
+                return false;
+            }
+            return true;
+        }
+        public bool SetUserAppData(UserAppData props, ref string result)
+        {         
+            string query = string.Empty;
+            
+            query += "UPDATE userdata SET ";
+            query += "TagId = :TagId, ";
+            query += "DataKey = :DataKey, ";
+            query += "DataVal = :DataVal WHERE ";
+            query += "UserId = :UserId AND ";
+            query += "TagId = :TagId";
+            
+            try
+            {
+                using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
+                {
+                    cmd.CommandText = query;
+                    cmd.Parameters.AddWithValue(":UserId", props.UserId.ToString());
+                    cmd.Parameters.AddWithValue(":TagId", props.TagId.ToString ());
+                    cmd.Parameters.AddWithValue(":DataKey", props.DataKey.ToString ());
+                    cmd.Parameters.AddWithValue(":DataVal", props.DataKey.ToString ());
+
+                    cmd.ExecuteNonQuery();
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                  ": SetUserData exception {0}", e.Message);
+                return false;
+            }
+            return true;
+        }
+        public OSDArray GetUserImageAssets(UUID avatarId)
+        {
+            IDataReader reader = null;
+            OSDArray data = new OSDArray();
+            string query = "SELECT `snapshotuuid` FROM {0} WHERE `creatoruuid` = :Id";
+            
+            // Get classified image assets
+            
+            
+            try
+            {
+                using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
+                {
+                    cmd.CommandText = query;
+                    cmd.Parameters.AddWithValue(":Id", avatarId.ToString());
+                    
+                    using (reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
+                    {
+                        while(reader.Read())
+                        {
+                            data.Add(new OSDString((string)reader["snapshotuuid"].ToString()));
+                        }
+                    }
+                }
+
+                using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
+                {
+                    cmd.CommandText = query;
+                    cmd.Parameters.AddWithValue(":Id", avatarId.ToString());
+                    
+                    using (reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
+                    {
+                        if(reader.Read())
+                        {
+                            data.Add(new OSDString((string)reader["snapshotuuid"].ToString ()));
+                        }
+                    }
+                }
+                    
+                query = "SELECT `profileImage`, `profileFirstImage` FROM `userprofile` WHERE `useruuid` = :Id";
+                
+                using (SqliteCommand cmd = (SqliteCommand)m_connection.CreateCommand())
+                {
+                    cmd.CommandText = query;
+                    cmd.Parameters.AddWithValue(":Id", avatarId.ToString());
+                    
+                    using (reader = cmd.ExecuteReader(CommandBehavior.SingleRow))
+                    {
+                        if(reader.Read())
+                        {
+                            data.Add(new OSDString((string)reader["profileImage"].ToString ()));
+                            data.Add(new OSDString((string)reader["profileFirstImage"].ToString ()));
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES_DATA]" +
+                                  ": GetAvatarNotes exception {0}", e.Message);
+            }
+            return data;
+        }
+        #endregion
+    }
+}
+
diff --git a/OpenSim/Framework/Animation.cs b/OpenSim/Framework/Animation.cs
index 232f5a1..3425505 100644
--- a/OpenSim/Framework/Animation.cs
+++ b/OpenSim/Framework/Animation.cs
@@ -120,5 +120,24 @@ namespace OpenSim.Framework
                 sequenceNum = args["seq_num"].AsInteger();
         }
 
+        public override bool Equals(object obj)
+        {
+            Animation other = obj as Animation;
+            if (other != null)
+            {
+                return (other.AnimID.Equals(this.AnimID)
+                        && other.SequenceNum == this.SequenceNum
+                        && other.ObjectID.Equals(this.ObjectID) );
+            }
+            return base.Equals(obj);
+        }
+
+        public override string ToString()
+        {
+            return "AnimID=" + AnimID.ToString()
+                + "/seq=" + SequenceNum.ToString()
+                + "/objID=" + ObjectID.ToString();
+        }
+
     }
 }
diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index 3658161..3e90fac 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Framework
         {
             lock (m_queueSync)
             {
-                if (m_queue.Count < 1 && m_pqueue.Count < 1)
+                while (m_queue.Count < 1 && m_pqueue.Count < 1)
                 {
                     Monitor.Wait(m_queueSync);
                 }
@@ -76,9 +76,10 @@ namespace OpenSim.Framework
         {
             lock (m_queueSync)
             {
-                if (m_queue.Count < 1 && m_pqueue.Count < 1)
+                bool success = true;
+                while (m_queue.Count < 1 && m_pqueue.Count < 1 && success)
                 {
-                    Monitor.Wait(m_queueSync, msTimeout);
+                    success = Monitor.Wait(m_queueSync, msTimeout);
                 }
 
                 if (m_pqueue.Count > 0)
@@ -89,8 +90,17 @@ namespace OpenSim.Framework
             }
         }
 
+        /// <summary>
+        /// Indicate whether this queue contains the given item.
+        /// </summary>
+        /// <remarks>
+        /// This method is not thread-safe.  Do not rely on the result without consistent external locking.
+        /// </remarks>
         public bool Contains(T item)
         {
+            if (m_queue.Count < 1 && m_pqueue.Count < 1)
+                return false;
+
             lock (m_queueSync)
             {
                 if (m_pqueue.Contains(item))
@@ -99,16 +109,28 @@ namespace OpenSim.Framework
             }
         }
 
+        /// <summary>
+        /// Return a count of the number of requests on this queue.
+        /// </summary>
+        /// <remarks>
+        /// This method is not thread-safe.  Do not rely on the result without consistent external locking.
+        /// </remarks>
         public int Count()
         {
-            lock (m_queueSync)
-            {
-                return m_queue.Count+m_pqueue.Count;
-            }
+            return m_queue.Count + m_pqueue.Count;
         }
 
+        /// <summary>
+        /// Return the array of items on this queue.
+        /// </summary>
+        /// <remarks>
+        /// This method is not thread-safe.  Do not rely on the result without consistent external locking.
+        /// </remarks>
         public T[] GetQueueArray()
         {
+            if (m_queue.Count < 1 && m_pqueue.Count < 1)
+                return new T[0];
+
             lock (m_queueSync)
             {
                 return m_queue.ToArray();
diff --git a/OpenSim/Framework/CachedTextureEventArg.cs b/OpenSim/Framework/CachedTextureEventArg.cs
new file mode 100644
index 0000000..239fc56
--- /dev/null
+++ b/OpenSim/Framework/CachedTextureEventArg.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;
+using System.Text;
+using OpenMetaverse;
+
+namespace OpenSim.Framework
+{
+    public class CachedTextureRequestArg
+    {
+        public int BakedTextureIndex;
+        public UUID WearableHashID;
+    }
+
+    public class CachedTextureResponseArg
+    {
+        public int BakedTextureIndex;
+        public UUID BakedTextureID;
+        public String HostName;
+    }
+}
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index 8c32734..2a8e67d 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -171,9 +171,10 @@ namespace OpenSim.Framework
         /// Soon to be decommissioned
         /// </summary>
         /// <param name="cAgent"></param>
-        public void CopyFrom(ChildAgentDataUpdate cAgent)
+        public void CopyFrom(ChildAgentDataUpdate cAgent, UUID sid)
         {
             AgentID = new UUID(cAgent.AgentID);
+            SessionID = sid;
 
             // next: ???
             Size = new Vector3();
@@ -291,7 +292,13 @@ namespace OpenSim.Framework
         public Vector3 AtAxis;
         public Vector3 LeftAxis;
         public Vector3 UpAxis;
-        public bool ChangedGrid;
+
+        /// <summary>
+        /// Signal on a V2 teleport that Scene.IncomingChildAgentDataUpdate(AgentData ad) should wait for the 
+        /// scene presence to become root (triggered when the viewer sends a CompleteAgentMovement UDP packet after
+        /// establishing the connection triggered by it's receipt of a TeleportFinish EQ message).
+        /// </summary>
+        public bool SenderWantsToWaitForRoot;
 
         public float Far;
         public float Aspect;
@@ -362,8 +369,9 @@ namespace OpenSim.Framework
             args["left_axis"] = OSD.FromString(LeftAxis.ToString());
             args["up_axis"] = OSD.FromString(UpAxis.ToString());
 
-            
-            args["changed_grid"] = OSD.FromBoolean(ChangedGrid);
+            //backwards compatibility
+            args["changed_grid"] = OSD.FromBoolean(SenderWantsToWaitForRoot);
+            args["wait_for_root"] = OSD.FromBoolean(SenderWantsToWaitForRoot);
             args["far"] = OSD.FromReal(Far);
             args["aspect"] = OSD.FromReal(Aspect);
 
@@ -536,8 +544,8 @@ namespace OpenSim.Framework
             if (args["up_axis"] != null)
                 Vector3.TryParse(args["up_axis"].AsString(), out AtAxis);
 
-            if (args["changed_grid"] != null)
-                ChangedGrid = args["changed_grid"].AsBoolean();
+            if (args.ContainsKey("wait_for_root") && args["wait_for_root"] != null)
+                SenderWantsToWaitForRoot = args["wait_for_root"].AsBoolean();
 
             if (args["far"] != null)
                 Far = (float)(args["far"].AsReal());
diff --git a/OpenSim/Framework/ClientInfo.cs b/OpenSim/Framework/ClientInfo.cs
index 62acb70..9021315 100644
--- a/OpenSim/Framework/ClientInfo.cs
+++ b/OpenSim/Framework/ClientInfo.cs
@@ -33,12 +33,13 @@ namespace OpenSim.Framework
 {
     public class ClientInfo
     {
-        public AgentCircuitData agentcircuit;
+        public readonly DateTime StartedTime = DateTime.Now;
+        public AgentCircuitData agentcircuit = null;
 
         public Dictionary<uint, byte[]> needAck;
 
-        public List<byte[]> out_packets;
-        public Dictionary<uint, uint> pendingAcks;
+        public List<byte[]> out_packets = new List<byte[]>();
+        public Dictionary<uint, uint> pendingAcks = new Dictionary<uint,uint>();
         public EndPoint proxyEP;
 
         public uint sequence;
@@ -53,5 +54,9 @@ namespace OpenSim.Framework
         public int assetThrottle;
         public int textureThrottle;
         public int totalThrottle;
+
+        public Dictionary<string, int> SyncRequests = new Dictionary<string,int>();
+        public Dictionary<string, int> AsyncRequests = new Dictionary<string,int>();
+        public Dictionary<string, int> GenericRequests = new Dictionary<string,int>();
     }
 }
diff --git a/OpenSim/Framework/Console/ConsoleUtil.cs b/OpenSim/Framework/Console/ConsoleUtil.cs
index 97a86a8..794bfaf 100644
--- a/OpenSim/Framework/Console/ConsoleUtil.cs
+++ b/OpenSim/Framework/Console/ConsoleUtil.cs
@@ -156,12 +156,32 @@ namespace OpenSim.Framework.Console
         }
 
         /// <summary>
-        /// Convert a minimum vector input from the console to an OpenMetaverse.Vector3
+        /// Convert a console integer to an int, automatically complaining if a console is given.
         /// </summary>
         /// <param name='console'>Can be null if no console is available.</param>
         /// <param name='rawConsoleVector'>/param>
         /// <param name='vector'></param>
         /// <returns></returns>
+        public static bool TryParseConsoleBool(ICommandConsole console, string rawConsoleString, out bool b)
+        {
+            if (!bool.TryParse(rawConsoleString, out b))
+            {
+                if (console != null)
+                    console.OutputFormat("ERROR: {0} is not a true or false value", rawConsoleString);
+
+                return false;
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Convert a console integer to an int, automatically complaining if a console is given.
+        /// </summary>
+        /// <param name='console'>Can be null if no console is available.</param>
+        /// <param name='rawConsoleInt'>/param>
+        /// <param name='i'></param>
+        /// <returns></returns>
         public static bool TryParseConsoleInt(ICommandConsole console, string rawConsoleInt, out int i)
         {
             if (!int.TryParse(rawConsoleInt, out i))
@@ -174,6 +194,31 @@ namespace OpenSim.Framework.Console
 
             return true;
         }
+
+        /// <summary>
+        /// Convert a console integer to a natural int, automatically complaining if a console is given.
+        /// </summary>
+        /// <param name='console'>Can be null if no console is available.</param>
+        /// <param name='rawConsoleInt'>/param>
+        /// <param name='i'></param>
+        /// <returns></returns>
+        public static bool TryParseConsoleNaturalInt(ICommandConsole console, string rawConsoleInt, out int i)
+        {
+            if (TryParseConsoleInt(console, rawConsoleInt, out i))
+            {
+                if (i < 0)
+                {
+                    if (console != null)
+                        console.OutputFormat("ERROR: {0} is not a positive integer", rawConsoleInt);
+
+                    return false;
+                }
+
+                return true;
+            }
+
+            return false;
+        }
     
         /// <summary>
         /// Convert a minimum vector input from the console to an OpenMetaverse.Vector3
diff --git a/OpenSim/Framework/Console/LocalConsole.cs b/OpenSim/Framework/Console/LocalConsole.cs
index d41481f..a967db6 100644
--- a/OpenSim/Framework/Console/LocalConsole.cs
+++ b/OpenSim/Framework/Console/LocalConsole.cs
@@ -426,6 +426,21 @@ namespace OpenSim.Framework.Console
                             System.Console.Write("{0}", prompt);
 
                         break;
+                    case ConsoleKey.Delete:
+                        if (m_cursorXPosition == m_commandLine.Length)
+                            break;
+
+                        m_commandLine.Remove(m_cursorXPosition, 1);
+
+                        SetCursorLeft(0);
+                        m_cursorYPosition = SetCursorTop(m_cursorYPosition);
+
+                        if (m_echo)
+                            System.Console.Write("{0}{1} ", prompt, m_commandLine);
+                        else
+                            System.Console.Write("{0}", prompt);
+
+                        break;
                     case ConsoleKey.End:
                         m_cursorXPosition = m_commandLine.Length;
                         break;
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs
index 3e3c2b3..8ad7b0d 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,25000)); // 25 secs timeout
+                uri, new PollServiceEventArgs(null, uri, HasEvents, GetEvents, NoEvents, sessionID,25000)); // 25 secs timeout
 
             XmlDocument xmldoc = new XmlDocument();
             XmlNode xmlnode = xmldoc.CreateNode(XmlNodeType.XmlDeclaration,
diff --git a/OpenSim/Framework/DAMap.cs b/OpenSim/Framework/DAMap.cs
index df4a6bc..4995a92 100644
--- a/OpenSim/Framework/DAMap.cs
+++ b/OpenSim/Framework/DAMap.cs
@@ -29,10 +29,12 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
+using System.Reflection;
 using System.Text;
 using System.Xml;
 using System.Xml.Schema;
 using System.Xml.Serialization;
+using log4net;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 
@@ -48,13 +50,20 @@ namespace OpenSim.Framework
     /// within their data store. However, avoid storing large amounts of data because that
     /// would slow down database access.
     /// </remarks>
-    public class DAMap : IDictionary<string, OSDMap>, IXmlSerializable
+    public class DAMap : IXmlSerializable
     {
-        private static readonly int MIN_STORE_NAME_LENGTH = 4;
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        protected OSDMap m_map;
-        
-        public DAMap() { m_map = new OSDMap(); }
+        private static readonly int MIN_NAMESPACE_LENGTH = 4;
+
+        private OSDMap m_map = new OSDMap();
+
+        // WARNING: this is temporary for experimentation only, it will be removed!!!!
+        public OSDMap TopLevelMap
+        {
+            get { return m_map; }
+            set { m_map = value; }
+        }        
         
         public XmlSchema GetSchema() { return null; } 
 
@@ -64,39 +73,34 @@ namespace OpenSim.Framework
             map.ReadXml(rawXml);
             return map;
         }
-        
+       
+        public void ReadXml(XmlReader reader)
+        { 
+            ReadXml(reader.ReadInnerXml());            
+        }
+
         public void ReadXml(string rawXml)
         {            
             // System.Console.WriteLine("Trying to deserialize [{0}]", rawXml);
             
             lock (this)
+            {
                 m_map = (OSDMap)OSDParser.DeserializeLLSDXml(rawXml);         
+                SanitiseMap(this);
+            }
         }
-        
-        // WARNING: this is temporary for experimentation only, it will be removed!!!!
-        public OSDMap TopLevelMap
+
+        public void WriteXml(XmlWriter writer)
         {
-            get { return m_map; }
-            set { m_map = value; }
+            writer.WriteRaw(ToXml());
         }
-        
 
-        public void ReadXml(XmlReader reader)
-        { 
-            ReadXml(reader.ReadInnerXml());            
-        }
-        
         public string ToXml()
         {
             lock (this)
                 return OSDParser.SerializeLLSDXmlString(m_map);
         }
 
-        public void WriteXml(XmlWriter writer)
-        {
-            writer.WriteRaw(ToXml());
-        }
-        
         public void CopyFrom(DAMap other)
         {
             // Deep copy
@@ -104,7 +108,7 @@ namespace OpenSim.Framework
             string data = null;
             lock (other)
             {
-                if (other.Count > 0)
+                if (other.CountNamespaces > 0)
                 {
                     data = OSDParser.SerializeLLSDXmlString(other.m_map);
                 }
@@ -120,59 +124,132 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// Returns the number of data stores.
+        /// Sanitise the map to remove any namespaces or stores that are not OSDMap.
         /// </summary>
-        public int Count { get { lock (this) { return m_map.Count; } } }
-        
-        public bool IsReadOnly { get { return false; } }
-        
+        /// <param name='map'>
+        /// </param>
+        public static void SanitiseMap(DAMap daMap)
+        {
+            List<string> keysToRemove = null;
+
+            OSDMap namespacesMap = daMap.m_map;
+
+            foreach (string key in namespacesMap.Keys)
+            {
+//                Console.WriteLine("Processing ns {0}", key);
+                if (!(namespacesMap[key] is OSDMap))
+                {
+                    if (keysToRemove == null)
+                        keysToRemove = new List<string>();
+
+                    keysToRemove.Add(key);
+                }
+            }
+
+            if (keysToRemove != null)
+            {
+                foreach (string key in keysToRemove)
+                {
+//                    Console.WriteLine ("Removing bad ns {0}", key);
+                    namespacesMap.Remove(key);
+                }
+            }
+
+            foreach (OSD nsOsd in namespacesMap.Values)
+            {
+                OSDMap nsOsdMap = (OSDMap)nsOsd;
+                keysToRemove = null;
+
+                foreach (string key in nsOsdMap.Keys)
+                {
+                    if (!(nsOsdMap[key] is OSDMap))
+                    {
+                        if (keysToRemove == null)
+                            keysToRemove = new List<string>();
+
+                        keysToRemove.Add(key);
+                    }
+                }
+
+                if (keysToRemove != null)
+                    foreach (string key in keysToRemove)
+                        nsOsdMap.Remove(key);
+            }
+        }
+
         /// <summary>
-        /// Returns the names of the data stores.
+        /// Get the number of namespaces
         /// </summary>
-        public ICollection<string> Keys { get { lock (this) { return m_map.Keys; } } }
+        public int CountNamespaces { get { lock (this) { return m_map.Count; } } }
 
         /// <summary>
-        /// Returns all the data stores.
+        /// Get the number of stores.
         /// </summary>
-        public ICollection<OSDMap> Values
+        public int CountStores 
         {
-            get
+            get 
             {
+                int count = 0;
+
                 lock (this)
                 {
-                    List<OSDMap> stores = new List<OSDMap>(m_map.Count);
-                    foreach (OSD llsd in m_map.Values)
-                        stores.Add((OSDMap)llsd);
-                    return stores;
+                    foreach (OSD osdNamespace in m_map)
+                    {
+                        count += ((OSDMap)osdNamespace).Count;
+                    }
                 }
+
+                return count;
             }
         }
-        
+
         /// <summary>
-        /// Gets or sets one data store.
+        /// Retrieve a Dynamic Attribute store
         /// </summary>
-        /// <param name="key">Store name</param>
-        /// <returns></returns>
-        public OSDMap this[string key] 
-        {    
-            get  
-            {                    
-                OSD llsd;
-                
-                lock (this)
+        /// <param name="ns">namespace for the store - use "OpenSim" for in-core modules</param>
+        /// <param name="storeName">name of the store within the namespace</param>
+        /// <returns>an OSDMap representing the stored data, or null if not found</returns>
+        public OSDMap GetStore(string ns, string storeName)
+        {
+            OSD namespaceOsd;
+
+            lock (this)
+            {
+                if (m_map.TryGetValue(ns, out namespaceOsd))
                 {
-                    if (m_map.TryGetValue(key, out llsd))
-                        return (OSDMap)llsd;
-                    else 
-                        return null;
+                    OSD store;
+
+                    if (((OSDMap)namespaceOsd).TryGetValue(storeName, out store))
+                        return (OSDMap)store;
                 }
-            }    
-            
-            set
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Saves a Dynamic attribute store
+        /// </summary>
+        /// <param name="ns">namespace for the store - use "OpenSim" for in-core modules</param>
+        /// <param name="storeName">name of the store within the namespace</param>
+        /// <param name="store">an OSDMap representing the data to store</param>
+        public void SetStore(string ns, string storeName, OSDMap store)
+        {
+            ValidateNamespace(ns);
+            OSDMap nsMap;
+
+            lock (this)
             {
-                ValidateKey(key);
-                lock (this)
-                    m_map[key] = value;
+                if (!m_map.ContainsKey(ns))
+                {
+                    nsMap = new OSDMap();
+                    m_map[ns] = nsMap;
+                }
+
+                nsMap = (OSDMap)m_map[ns];
+
+//                m_log.DebugFormat("[DA MAP]: Setting store to {0}:{1}", ns, storeName);
+                nsMap[storeName] = store;
             }
         }
 
@@ -180,54 +257,46 @@ namespace OpenSim.Framework
         /// Validate the key used for storing separate data stores.
         /// </summary>
         /// <param name='key'></param>
-        public static void ValidateKey(string key)
+        public static void ValidateNamespace(string ns)
         {
-            if (key.Length < MIN_STORE_NAME_LENGTH)
-                throw new Exception("Minimum store name length is " + MIN_STORE_NAME_LENGTH);
+            if (ns.Length < MIN_NAMESPACE_LENGTH)
+                throw new Exception("Minimum namespace length is " + MIN_NAMESPACE_LENGTH);
         }
 
-        public bool ContainsKey(string key) 
+        public bool ContainsStore(string ns, string storeName) 
         {    
-            lock (this)
-                return m_map.ContainsKey(key);
-        }    
+            OSD namespaceOsd;
 
-        public void Add(string key, OSDMap store)
-        {
-            ValidateKey(key);
-            lock (this)
-                m_map.Add(key, store);
-        }    
-
-        public void Add(KeyValuePair<string, OSDMap> kvp) 
-        {   
-            ValidateKey(kvp.Key);
             lock (this)
-                m_map.Add(kvp.Key, kvp.Value);
-        }    
+            {
+                if (m_map.TryGetValue(ns, out namespaceOsd))
+                {
+                    return ((OSDMap)namespaceOsd).ContainsKey(storeName);
+                }
+            }
 
-        public bool Remove(string key) 
-        {    
-            lock (this)
-                return m_map.Remove(key);
-        }    
+            return false;
+        }     
 
-        public bool TryGetValue(string key, out OSDMap store)
+        public bool TryGetStore(string ns, string storeName, out OSDMap store)
         {
+            OSD namespaceOsd;
+
             lock (this)
             {
-                OSD llsd;
-                if (m_map.TryGetValue(key, out llsd))
-                {
-                    store = (OSDMap)llsd;
-                    return true;
-                }
-                else
+                if (m_map.TryGetValue(ns, out namespaceOsd))
                 {
-                    store = null;
-                    return false;
+                    OSD storeOsd;
+
+                    bool result = ((OSDMap)namespaceOsd).TryGetValue(storeName, out storeOsd);
+                    store = (OSDMap)storeOsd;
+
+                    return result;
                 }
             }
+
+            store = null;
+            return false;
         }    
 
         public void Clear()
@@ -235,39 +304,25 @@ namespace OpenSim.Framework
             lock (this)
                 m_map.Clear();
         }  
-        
-        public bool Contains(KeyValuePair<string, OSDMap> kvp)
-        {
-            lock (this)
-                return m_map.ContainsKey(kvp.Key);
-        }
-
-        public void CopyTo(KeyValuePair<string, OSDMap>[] array, int index)
-        {
-            throw new NotImplementedException();
-        }
 
-        public bool Remove(KeyValuePair<string, OSDMap> kvp)
+        public bool RemoveStore(string ns, string storeName)
         {
-            lock (this)
-                return m_map.Remove(kvp.Key);
-        }
+            OSD namespaceOsd; 
 
-        public System.Collections.IDictionaryEnumerator GetEnumerator()
-        {
             lock (this)
-                return m_map.GetEnumerator();
-        }
+            {
+                if (m_map.TryGetValue(ns, out namespaceOsd))
+                {
+                    OSDMap namespaceOsdMap = (OSDMap)namespaceOsd;
+                    namespaceOsdMap.Remove(storeName);
 
-        IEnumerator<KeyValuePair<string, OSDMap>> IEnumerable<KeyValuePair<string, OSDMap>>.GetEnumerator()
-        {
-            return null;
-        }
+                    // Don't keep empty namespaces around
+                    if (namespaceOsdMap.Count <= 0)
+                        m_map.Remove(ns);
+                }
+            }
 
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            lock (this)
-                return m_map.GetEnumerator();
-        }        
+            return false;
+        }     
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/DOMap.cs b/OpenSim/Framework/DOMap.cs
index 755e129..f5b650b 100644
--- a/OpenSim/Framework/DOMap.cs
+++ b/OpenSim/Framework/DOMap.cs
@@ -42,22 +42,22 @@ namespace OpenSim.Framework
     /// This class stores and retrieves dynamic objects.
     /// </summary>
     /// <remarks>
-    /// Experimental - DO NOT USE.
+    /// Experimental - DO NOT USE.  Does not yet have namespace support.
     /// </remarks>
     public class DOMap
     {
         private IDictionary<string, object> m_map;
         
-        public void Add(string key, object dynObj)
+        public void Add(string ns, string objName, object dynObj)
         {
-            DAMap.ValidateKey(key);
+            DAMap.ValidateNamespace(ns);
 
             lock (this)
             {
                 if (m_map == null)
                     m_map = new Dictionary<string, object>();
 
-                m_map.Add(key, dynObj);
+                m_map.Add(objName, dynObj);
             }
         }
 
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index e03750b..5ddbd61 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -430,6 +430,5 @@ namespace OpenSim.Framework
         {
             return l_EstateGroups.Contains(groupID);
         }
-
     }
 }
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index ad3471a..22cc79d 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -65,6 +65,7 @@ namespace OpenSim.Framework
     public delegate void NetworkStats(int inPackets, int outPackets, int unAckedBytes);
 
     public delegate void SetAppearance(IClientAPI remoteClient, Primitive.TextureEntry textureEntry, byte[] visualParams, Vector3 AvSize, WearableCacheItem[] CacheItems);
+    public delegate void CachedTextureRequest(IClientAPI remoteClient, int serial, List<CachedTextureRequestArg> cachedTextureRequest);
 
     public delegate void StartAnim(IClientAPI remoteClient, UUID animID);
 
@@ -789,6 +790,7 @@ namespace OpenSim.Framework
         event EstateChangeInfo OnEstateChangeInfo;
         event EstateManageTelehub OnEstateManageTelehub;
         // [Obsolete("LLClientView Specific.")]
+        event CachedTextureRequest OnCachedTextureRequest;
         event SetAppearance OnSetAppearance;
         // [Obsolete("LLClientView Specific - Replace and rename OnAvatarUpdate. Difference from SetAppearance?")]
         event AvatarNowWearing OnAvatarNowWearing;
@@ -832,6 +834,8 @@ namespace OpenSim.Framework
         /// </remarks>
         event UpdateAgent OnAgentUpdate;
 
+        event UpdateAgent OnAgentCameraUpdate;
+
         event AgentRequestSit OnAgentRequestSit;
         event AgentSit OnAgentSit;
         event AvatarPickerRequest OnAvatarPickerRequest;
@@ -1100,14 +1104,15 @@ namespace OpenSim.Framework
         /// <param name="textureEntry"></param>
         void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry);
 
+        void SendCachedTextureResponse(ISceneEntity avatar, int serial, List<CachedTextureResponseArg> cachedTextures);
+
         void SendStartPingCheck(byte seq);
 
         /// <summary>
         /// Tell the client that an object has been deleted
         /// </summary>
-        /// <param name="regionHandle"></param>
         /// <param name="localID"></param>
-        void SendKillObject(ulong regionHandle, List<uint> localID);
+        void SendKillObject(List<uint> localID);
 
         void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs);
         void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args);
@@ -1486,7 +1491,7 @@ namespace OpenSim.Framework
         void SendChangeUserRights(UUID agentID, UUID friendID, int rights);
         void SendTextBoxRequest(string message, int chatChannel, string objectname, UUID ownerID, string ownerFirstName, string ownerLastName, UUID objectId);
 
-        void StopFlying(ISceneEntity presence);
+        void SendAgentTerseUpdate(ISceneEntity presence);
 
         void SendPlacesReply(UUID queryID, UUID transactionID, PlacesReplyData[] data);
     }
diff --git a/OpenSim/Framework/IPeople.cs b/OpenSim/Framework/IPeople.cs
new file mode 100644
index 0000000..b88e103
--- /dev/null
+++ b/OpenSim/Framework/IPeople.cs
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using OpenMetaverse;
+
+namespace OpenSim.Framework
+{
+    public class UserData
+    {
+        public UUID Id { get; set; }
+        public string FirstName { get; set; }
+        public string LastName { get; set; }
+        public string HomeURL { get; set; }
+        public Dictionary<string, object> ServerURLs { get; set; }
+    }
+
+    public interface IPeople
+    {
+        List<UserData> GetUserData(string query, int page_size, int page_number);
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index 87ec99e..8164f41 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.cs
@@ -136,5 +136,10 @@ namespace OpenSim.Framework
         ISceneObject DeserializeObject(string representation);
 
         bool CheckClient(UUID agentID, System.Net.IPEndPoint ep);
+
+        /// <summary>
+        /// Start the scene and associated scripts within it.
+        /// </summary>
+        void Start();
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Location.cs b/OpenSim/Framework/Location.cs
index 9504e03..0b88834 100644
--- a/OpenSim/Framework/Location.cs
+++ b/OpenSim/Framework/Location.cs
@@ -33,10 +33,10 @@ namespace OpenSim.Framework
     [Serializable]
     public class Location : ICloneable
     {
-        private readonly int m_x;
-        private readonly int m_y;
+        private readonly uint m_x;
+        private readonly uint m_y;
 
-        public Location(int x, int y)
+        public Location(uint x, uint y)
         {
             m_x = x;
             m_y = y;
@@ -44,21 +44,21 @@ namespace OpenSim.Framework
 
         public Location(ulong regionHandle)
         {
-            m_x = (int) regionHandle;
-            m_y = (int) (regionHandle >> 32);
+            m_x =  (uint)(regionHandle >> 32);
+            m_y = (uint)(regionHandle & (ulong)uint.MaxValue);
         }
 
         public ulong RegionHandle
         {
-            get { return Utils.UIntsToLong((uint)m_x, (uint)m_y); }
+            get { return Utils.UIntsToLong(m_x, m_y); }
         }
 
-        public int X
+        public uint X
         {
             get { return m_x; }
         }
 
-        public int Y
+        public uint Y
         {
             get { return m_y; }
         }
diff --git a/OpenSim/Framework/Monitoring/BaseStatsCollector.cs b/OpenSim/Framework/Monitoring/BaseStatsCollector.cs
index 23dba09..96536e8 100644
--- a/OpenSim/Framework/Monitoring/BaseStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/BaseStatsCollector.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -44,16 +44,16 @@ namespace OpenSim.Framework.Monitoring
             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));
+                "Heap allocated to OpenSim   : {0} MB\n",
+                Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0));
 
             sb.AppendFormat(
-                "OpenSim last object memory churn    : {0} MB/s\n",
-                Math.Round((MemoryWatchdog.LastMemoryChurn * 1000) / 1024.0 / 1024, 3));
+                "Last heap allocation rate   : {0} MB/s\n",
+                Math.Round((MemoryWatchdog.LastHeapAllocationRate * 1000) / 1024.0 / 1024, 3));
 
             sb.AppendFormat(
-                "OpenSim average object memory churn : {0} MB/s\n",
-                Math.Round((MemoryWatchdog.AverageMemoryChurn * 1000) / 1024.0 / 1024, 3));
+                "Average heap allocation rate: {0} MB/s\n",
+                Math.Round((MemoryWatchdog.AverageHeapAllocationRate * 1000) / 1024.0 / 1024, 3));
 
             Process myprocess = Process.GetCurrentProcess();
             if (!myprocess.HasExited)
diff --git a/OpenSim/Framework/Monitoring/Checks/Check.cs b/OpenSim/Framework/Monitoring/Checks/Check.cs
new file mode 100644
index 0000000..594386a
--- /dev/null
+++ b/OpenSim/Framework/Monitoring/Checks/Check.cs
@@ -0,0 +1,118 @@
+/*
+ * 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.Text;
+
+namespace OpenSim.Framework.Monitoring
+{
+    public class Check
+    {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        public static readonly char[] DisallowedShortNameCharacters = { '.' };
+
+        /// <summary>
+        /// Category of this stat (e.g. cache, scene, etc).
+        /// </summary>
+        public string Category { get; private set; }
+
+        /// <summary>
+        /// Containing name for this stat.
+        /// FIXME: In the case of a scene, this is currently the scene name (though this leaves
+        /// us with a to-be-resolved problem of non-unique region names).
+        /// </summary>
+        /// <value>
+        /// The container.
+        /// </value>
+        public string Container { get; private set; }
+
+        /// <summary>
+        /// Action used to check whether alert should go off.
+        /// </summary>
+        /// <remarks>
+        /// Should return true if check passes.  False otherwise.
+        /// </remarks>
+        public Func<Check, bool> CheckFunc { get; private set; }
+
+        /// <summary>
+        /// Message from the last failure, if any.  If there is no message or no failure then will be null.
+        /// </summary>
+        /// <remarks>
+        /// Should be set by the CheckFunc when applicable.
+        /// </remarks>
+        public string LastFailureMessage { get; set; }
+
+        public StatVerbosity Verbosity { get; private set; }
+        public string ShortName { get; private set; }
+        public string Name { get; private set; }
+        public string Description { get; private set; }
+
+        public Check(
+            string shortName,
+            string name,
+            string description,
+            string category,
+            string container,
+            Func<Check, bool> checkFunc,
+            StatVerbosity verbosity) 
+        {
+            if (ChecksManager.SubCommands.Contains(category))
+                throw new Exception(
+                    string.Format("Alert cannot be in category '{0}' since this is reserved for a subcommand", category));
+
+            foreach (char c in DisallowedShortNameCharacters)
+            {
+                if (shortName.IndexOf(c) != -1)
+                    throw new Exception(string.Format("Alert name {0} cannot contain character {1}", shortName, c));
+            }
+
+            ShortName = shortName;
+            Name = name;
+            Description = description;
+            Category = category;
+            Container = container;
+            CheckFunc = checkFunc;
+            Verbosity = verbosity;
+        }
+
+        public bool CheckIt()
+        {
+            return CheckFunc(this);
+        }
+
+        public virtual string ToConsoleString()
+        {
+            return string.Format(
+                "{0}.{1}.{2} - {3}", 
+                Category, 
+                Container, 
+                ShortName,
+                Description);
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Monitoring/ChecksManager.cs b/OpenSim/Framework/Monitoring/ChecksManager.cs
new file mode 100644
index 0000000..e4a7f8c
--- /dev/null
+++ b/OpenSim/Framework/Monitoring/ChecksManager.cs
@@ -0,0 +1,262 @@
+/*
+ * 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.Linq;
+using System.Reflection;
+using System.Text;
+using log4net;
+
+namespace OpenSim.Framework.Monitoring
+{
+    /// <summary>
+    /// Static class used to register/deregister checks on runtime conditions.
+    /// </summary>
+    public static class ChecksManager
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        // Subcommand used to list other stats.
+        public const string ListSubCommand = "list";
+
+        // All subcommands
+        public static HashSet<string> SubCommands = new HashSet<string> { ListSubCommand };
+
+        /// <summary>
+        /// Checks categorized by category/container/shortname
+        /// </summary>
+        /// <remarks>
+        /// Do not add or remove directly from this dictionary.
+        /// </remarks>
+        public static SortedDictionary<string, SortedDictionary<string, SortedDictionary<string, Check>>> RegisteredChecks
+            = new SortedDictionary<string, SortedDictionary<string, SortedDictionary<string, Check>>>();
+
+        public static void RegisterConsoleCommands(ICommandConsole console)
+        {
+            console.Commands.AddCommand(
+                "General",
+                false,
+                "show checks",
+                "show checks",
+                "Show checks configured for this server",
+                "If no argument is specified then info on all checks will be shown.\n"
+                    + "'list' argument will show check categories.\n"
+                    + "THIS FACILITY IS EXPERIMENTAL",
+                HandleShowchecksCommand);
+        }
+
+        public static void HandleShowchecksCommand(string module, string[] cmd)
+        {
+            ICommandConsole con = MainConsole.Instance;
+
+            if (cmd.Length > 2)
+            {
+                foreach (string name in cmd.Skip(2))
+                {
+                    string[] components = name.Split('.');
+
+                    string categoryName = components[0];
+//                    string containerName = components.Length > 1 ? components[1] : null;
+
+                    if (categoryName == ListSubCommand)
+                    {
+                        con.Output("check categories available are:");
+
+                        foreach (string category in RegisteredChecks.Keys)
+                            con.OutputFormat("  {0}", category);
+                    }
+//                    else
+//                    {
+//                        SortedDictionary<string, SortedDictionary<string, Check>> category;
+//                        if (!Registeredchecks.TryGetValue(categoryName, out category))
+//                        {
+//                            con.OutputFormat("No such category as {0}", categoryName);
+//                        }
+//                        else
+//                        {
+//                            if (String.IsNullOrEmpty(containerName))
+//                            {
+//                                OutputConfiguredToConsole(con, category);
+//                            }
+//                            else
+//                            {
+//                                SortedDictionary<string, Check> container;
+//                                if (category.TryGetValue(containerName, out container))
+//                                {
+//                                    OutputContainerChecksToConsole(con, container);
+//                                }
+//                                else
+//                                {
+//                                    con.OutputFormat("No such container {0} in category {1}", containerName, categoryName);
+//                                }
+//                            }
+//                        }
+//                    }
+                }
+            }
+            else
+            {
+                OutputAllChecksToConsole(con);
+            }
+        }
+
+        /// <summary>
+        /// Registers a statistic.
+        /// </summary>
+        /// <param name='stat'></param>
+        /// <returns></returns>
+        public static bool RegisterCheck(Check check)
+        {
+            SortedDictionary<string, SortedDictionary<string, Check>> category = null, newCategory;
+            SortedDictionary<string, Check> container = null, newContainer;
+
+            lock (RegisteredChecks)
+            {
+                // Check name is not unique across category/container/shortname key.
+                // XXX: For now just return false.  This is to avoid problems in regression tests where all tests
+                // in a class are run in the same instance of the VM.
+                if (TryGetCheckParents(check, out category, out container))
+                    return false;
+
+                // We take a copy-on-write approach here of replacing dictionaries when keys are added or removed.
+                // This means that we don't need to lock or copy them on iteration, which will be a much more
+                // common operation after startup.
+                if (container != null)
+                    newContainer = new SortedDictionary<string, Check>(container);
+                else
+                    newContainer = new SortedDictionary<string, Check>();
+
+                if (category != null)
+                    newCategory = new SortedDictionary<string, SortedDictionary<string, Check>>(category);
+                else
+                    newCategory = new SortedDictionary<string, SortedDictionary<string, Check>>();
+
+                newContainer[check.ShortName] = check;
+                newCategory[check.Container] = newContainer;
+                RegisteredChecks[check.Category] = newCategory;
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Deregister an check
+        /// </summary>>
+        /// <param name='stat'></param>
+        /// <returns></returns>
+        public static bool DeregisterCheck(Check check)
+        {
+            SortedDictionary<string, SortedDictionary<string, Check>> category = null, newCategory;
+            SortedDictionary<string, Check> container = null, newContainer;
+
+            lock (RegisteredChecks)
+            {
+                if (!TryGetCheckParents(check, out category, out container))
+                    return false;
+
+                newContainer = new SortedDictionary<string, Check>(container);
+                newContainer.Remove(check.ShortName);
+
+                newCategory = new SortedDictionary<string, SortedDictionary<string, Check>>(category);
+                newCategory.Remove(check.Container);
+
+                newCategory[check.Container] = newContainer;
+                RegisteredChecks[check.Category] = newCategory;
+
+                return true;
+            }
+        }
+
+        public static bool TryGetCheckParents(
+            Check check,
+            out SortedDictionary<string, SortedDictionary<string, Check>> category,
+            out SortedDictionary<string, Check> container)
+        {
+            category = null;
+            container = null;
+
+            lock (RegisteredChecks)
+            {
+                if (RegisteredChecks.TryGetValue(check.Category, out category))
+                {
+                    if (category.TryGetValue(check.Container, out container))
+                    {
+                        if (container.ContainsKey(check.ShortName))
+                            return true;
+                    }
+                }
+            }
+
+            return false;
+        }
+
+        public static void CheckChecks()
+        {
+            lock (RegisteredChecks)
+            {
+                foreach (SortedDictionary<string, SortedDictionary<string, Check>> category in RegisteredChecks.Values)
+                {
+                    foreach (SortedDictionary<string, Check> container in category.Values)
+                    {
+                        foreach (Check check in container.Values)
+                        {
+                            if (!check.CheckIt())
+                                m_log.WarnFormat(
+                                    "[CHECKS MANAGER]: Check {0}.{1}.{2} failed with message {3}", check.Category, check.Container, check.ShortName, check.LastFailureMessage);
+                        }
+                    }
+                }
+            }
+        }
+
+        private static void OutputAllChecksToConsole(ICommandConsole con)
+        {
+            foreach (var category in RegisteredChecks.Values)
+            {
+                OutputCategoryChecksToConsole(con, category);
+            }
+        }
+
+        private static void OutputCategoryChecksToConsole(
+            ICommandConsole con, SortedDictionary<string, SortedDictionary<string, Check>> category)
+        {
+            foreach (var container in category.Values)
+            {
+                OutputContainerChecksToConsole(con, container);
+            }
+        }
+
+        private static void OutputContainerChecksToConsole(ICommandConsole con, SortedDictionary<string, Check> container)
+        {
+            foreach (Check check in container.Values)
+            {
+                con.Output(check.ToConsoleString());
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Monitoring/MemoryWatchdog.cs b/OpenSim/Framework/Monitoring/MemoryWatchdog.cs
index c6010cd..c474622 100644
--- a/OpenSim/Framework/Monitoring/MemoryWatchdog.cs
+++ b/OpenSim/Framework/Monitoring/MemoryWatchdog.cs
@@ -60,17 +60,17 @@ namespace OpenSim.Framework.Monitoring
         private static bool m_enabled;
 
         /// <summary>
-        /// Last memory churn in bytes per millisecond.
+        /// Average heap allocation rate in bytes per millisecond.
         /// </summary>
-        public static double AverageMemoryChurn
+        public static double AverageHeapAllocationRate
         {
             get { if (m_samples.Count > 0) return m_samples.Average(); else return 0; }
         }
 
         /// <summary>
-        /// Average memory churn in bytes per millisecond.
+        /// Last heap allocation in bytes
         /// </summary>
-        public static double LastMemoryChurn
+        public static double LastHeapAllocationRate
         {
             get { if (m_samples.Count > 0) return m_samples.Last(); else return 0; }
         }
diff --git a/OpenSim/Framework/Monitoring/ServerStatsCollector.cs b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
new file mode 100644
index 0000000..ac0f0bc
--- /dev/null
+++ b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
@@ -0,0 +1,349 @@
+/*
+ * 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.Linq;
+using System.Net.NetworkInformation;
+using System.Text;
+using System.Threading;
+using log4net;
+using Nini.Config;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework;
+
+namespace OpenSim.Framework.Monitoring
+{
+    public class ServerStatsCollector
+    {
+        private readonly ILog m_log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        private readonly string LogHeader = "[SERVER STATS]";
+
+        public bool Enabled = false;
+        private static Dictionary<string, Stat> RegisteredStats = new Dictionary<string, Stat>();
+
+        public readonly string CategoryServer = "server";
+
+        public readonly string ContainerThreadpool = "threadpool";
+        public readonly string ContainerProcessor = "processor";
+        public readonly string ContainerMemory = "memory";
+        public readonly string ContainerNetwork = "network";
+        public readonly string ContainerProcess = "process";
+
+        public string NetworkInterfaceTypes = "Ethernet";
+
+        readonly int performanceCounterSampleInterval = 500;
+//        int lastperformanceCounterSampleTime = 0;
+
+        private class PerfCounterControl
+        {
+            public PerformanceCounter perfCounter;
+            public int lastFetch;
+            public string name;
+            public PerfCounterControl(PerformanceCounter pPc)
+                : this(pPc, String.Empty)
+            {
+            }
+            public PerfCounterControl(PerformanceCounter pPc, string pName)
+            {
+                perfCounter = pPc;
+                lastFetch = 0;
+                name = pName;
+            }
+        }
+
+        PerfCounterControl processorPercentPerfCounter = null;
+
+        // IRegionModuleBase.Initialize
+        public void Initialise(IConfigSource source)
+        {
+            IConfig cfg = source.Configs["Monitoring"];
+
+            if (cfg != null)
+                Enabled = cfg.GetBoolean("ServerStatsEnabled", true);
+
+            if (Enabled)
+            {
+                NetworkInterfaceTypes = cfg.GetString("NetworkInterfaceTypes", "Ethernet");
+            }
+        }
+
+        public void Start()
+        {
+            if (RegisteredStats.Count == 0)
+                RegisterServerStats();
+        }
+
+        public void Close()
+        {
+            if (RegisteredStats.Count > 0)
+            {
+                foreach (Stat stat in RegisteredStats.Values)
+                {
+                    StatsManager.DeregisterStat(stat);
+                    stat.Dispose();
+                }
+                RegisteredStats.Clear();
+            }
+        }
+
+        private void MakeStat(string pName, string pDesc, string pUnit, string pContainer, Action<Stat> act)
+        {
+            MakeStat(pName, pDesc, pUnit, pContainer, act, MeasuresOfInterest.None);
+        }
+
+        private void MakeStat(string pName, string pDesc, string pUnit, string pContainer, Action<Stat> act, MeasuresOfInterest moi)
+        {
+            string desc = pDesc;
+            if (desc == null)
+                desc = pName;
+            Stat stat = new Stat(pName, pName, desc, pUnit, CategoryServer, pContainer, StatType.Pull, moi, act, StatVerbosity.Debug);
+            StatsManager.RegisterStat(stat);
+            RegisteredStats.Add(pName, stat);
+        }
+
+        public void RegisterServerStats()
+        {
+//            lastperformanceCounterSampleTime = Util.EnvironmentTickCount();
+            PerformanceCounter tempPC;
+            Stat tempStat;
+            string tempName;
+
+            try
+            {
+                tempName = "CPUPercent";
+                tempPC = new PerformanceCounter("Processor", "% Processor Time", "_Total");
+                processorPercentPerfCounter = new PerfCounterControl(tempPC);
+                // A long time bug in mono is that CPU percent is reported as CPU percent idle. Windows reports CPU percent busy.
+                tempStat = new Stat(tempName, tempName, "", "percent", CategoryServer, ContainerProcessor,
+                                StatType.Pull, (s) => { GetNextValue(s, processorPercentPerfCounter, Util.IsWindows() ? 1 : -1); },
+                                StatVerbosity.Info);
+                StatsManager.RegisterStat(tempStat);
+                RegisteredStats.Add(tempName, tempStat);
+
+                MakeStat("TotalProcessorTime", null, "sec", ContainerProcessor,
+                                    (s) => { s.Value = Process.GetCurrentProcess().TotalProcessorTime.TotalSeconds; });
+
+                MakeStat("UserProcessorTime", null, "sec", ContainerProcessor,
+                                    (s) => { s.Value = Process.GetCurrentProcess().UserProcessorTime.TotalSeconds; });
+
+                MakeStat("PrivilegedProcessorTime", null, "sec", ContainerProcessor,
+                                    (s) => { s.Value = Process.GetCurrentProcess().PrivilegedProcessorTime.TotalSeconds; });
+
+                MakeStat("Threads", null, "threads", ContainerProcessor,
+                                    (s) => { s.Value = Process.GetCurrentProcess().Threads.Count; });
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("{0} Exception creating 'Process': {1}", LogHeader, e);
+            }
+
+            MakeStat("BuiltinThreadpoolWorkerThreadsAvailable", null, "threads", ContainerThreadpool,
+                s => 
+                { 
+                    int workerThreads, iocpThreads; 
+                    ThreadPool.GetAvailableThreads(out workerThreads, out iocpThreads); 
+                    s.Value = workerThreads;
+                });
+
+            MakeStat("BuiltinThreadpoolIOCPThreadsAvailable", null, "threads", ContainerThreadpool,
+                s => 
+                { 
+                    int workerThreads, iocpThreads; 
+                    ThreadPool.GetAvailableThreads(out workerThreads, out iocpThreads); 
+                    s.Value = iocpThreads;
+                });
+
+            if (Util.FireAndForgetMethod == FireAndForgetMethod.SmartThreadPool && Util.GetSmartThreadPoolInfo() != null)
+            {
+                MakeStat("STPMaxThreads", null, "threads", ContainerThreadpool, s => s.Value = Util.GetSmartThreadPoolInfo().MaxThreads);
+                MakeStat("STPMinThreads", null, "threads", ContainerThreadpool, s => s.Value = Util.GetSmartThreadPoolInfo().MinThreads);
+                MakeStat("STPConcurrency", null, "threads", ContainerThreadpool, s => s.Value = Util.GetSmartThreadPoolInfo().MaxConcurrentWorkItems);
+                MakeStat("STPActiveThreads", null, "threads", ContainerThreadpool, s => s.Value = Util.GetSmartThreadPoolInfo().ActiveThreads);
+                MakeStat("STPInUseThreads", null, "threads", ContainerThreadpool, s => s.Value = Util.GetSmartThreadPoolInfo().InUseThreads);
+                MakeStat("STPWorkItemsWaiting", null, "threads", ContainerThreadpool, s => s.Value = Util.GetSmartThreadPoolInfo().WaitingCallbacks);
+            }
+
+            MakeStat(
+                "HTTPRequestsMade", 
+                "Number of outbound HTTP requests made", 
+                "requests", 
+                ContainerNetwork, 
+                s => s.Value = WebUtil.RequestNumber,
+                MeasuresOfInterest.AverageChangeOverTime);
+
+            try
+            {
+                List<string> okInterfaceTypes = new List<string>(NetworkInterfaceTypes.Split(','));
+
+                IEnumerable<NetworkInterface> nics = NetworkInterface.GetAllNetworkInterfaces();
+                foreach (NetworkInterface nic in nics)
+                {
+                    if (nic.OperationalStatus != OperationalStatus.Up)
+                        continue;
+
+                    string nicInterfaceType = nic.NetworkInterfaceType.ToString();
+                    if (!okInterfaceTypes.Contains(nicInterfaceType))
+                    {
+                        m_log.DebugFormat("{0} Not including stats for network interface '{1}' of type '{2}'.",
+                                                LogHeader, nic.Name, nicInterfaceType);
+                        m_log.DebugFormat("{0}     To include, add to comma separated list in [Monitoring]NetworkInterfaceTypes={1}",
+                                                LogHeader, NetworkInterfaceTypes);
+                        continue;
+                    }
+
+                    if (nic.Supports(NetworkInterfaceComponent.IPv4))
+                    {
+                        IPv4InterfaceStatistics nicStats = nic.GetIPv4Statistics();
+                        if (nicStats != null)
+                        {
+                            MakeStat("BytesRcvd/" + nic.Name, nic.Name, "KB", ContainerNetwork,
+                                            (s) => { LookupNic(s, (ns) => { return ns.BytesReceived; }, 1024.0); });
+                            MakeStat("BytesSent/" + nic.Name, nic.Name, "KB", ContainerNetwork,
+                                            (s) => { LookupNic(s, (ns) => { return ns.BytesSent; }, 1024.0); });
+                            MakeStat("TotalBytes/" + nic.Name, nic.Name, "KB", ContainerNetwork,
+                                            (s) => { LookupNic(s, (ns) => { return ns.BytesSent + ns.BytesReceived; }, 1024.0); });
+                        }
+                    }
+                    // TODO: add IPv6 (it may actually happen someday)
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("{0} Exception creating 'Network Interface': {1}", LogHeader, e);
+            }
+
+            MakeStat("ProcessMemory", null, "MB", ContainerMemory,
+                                (s) => { s.Value = Math.Round(Process.GetCurrentProcess().WorkingSet64 / 1024d / 1024d, 3); });
+            MakeStat("HeapMemory", null, "MB", ContainerMemory,
+                                (s) => { s.Value = Math.Round(GC.GetTotalMemory(false) / 1024d / 1024d, 3); });
+            MakeStat("LastHeapAllocationRate", null, "MB/sec", ContainerMemory,
+                                (s) => { s.Value = Math.Round(MemoryWatchdog.LastHeapAllocationRate * 1000d / 1024d / 1024d, 3); });
+            MakeStat("AverageHeapAllocationRate", null, "MB/sec", ContainerMemory,
+                                (s) => { s.Value = Math.Round(MemoryWatchdog.AverageHeapAllocationRate * 1000d / 1024d / 1024d, 3); });
+        }
+
+        // Notes on performance counters: 
+        //  "How To Read Performance Counters": http://blogs.msdn.com/b/bclteam/archive/2006/06/02/618156.aspx
+        //  "How to get the CPU Usage in C#": http://stackoverflow.com/questions/278071/how-to-get-the-cpu-usage-in-c
+        //  "Mono Performance Counters": http://www.mono-project.com/Mono_Performance_Counters
+        private delegate double PerfCounterNextValue();
+        private void GetNextValue(Stat stat, PerfCounterControl perfControl)
+        {
+            GetNextValue(stat, perfControl, 1.0);
+        }
+        private void GetNextValue(Stat stat, PerfCounterControl perfControl, double factor)
+        {
+            if (Util.EnvironmentTickCountSubtract(perfControl.lastFetch) > performanceCounterSampleInterval)
+            {
+                if (perfControl != null && perfControl.perfCounter != null)
+                {
+                    try
+                    {
+                        // Kludge for factor to run double duty. If -1, subtract the value from one
+                        if (factor == -1)
+                            stat.Value = 1 - perfControl.perfCounter.NextValue();
+                        else
+                            stat.Value = perfControl.perfCounter.NextValue() / factor;
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat("{0} Exception on NextValue fetching {1}: {2}", LogHeader, stat.Name, e);
+                    }
+                    perfControl.lastFetch = Util.EnvironmentTickCount();
+                }
+            }
+        }
+
+        // Lookup the nic that goes with this stat and set the value by using a fetch action.
+        // Not sure about closure with delegates inside delegates.
+        private delegate double GetIPv4StatValue(IPv4InterfaceStatistics interfaceStat);
+        private void LookupNic(Stat stat, GetIPv4StatValue getter, double factor)
+        {
+            // Get the one nic that has the name of this stat
+            IEnumerable<NetworkInterface> nics = NetworkInterface.GetAllNetworkInterfaces().Where(
+                                  (network) => network.Name == stat.Description);
+            try
+            {
+                foreach (NetworkInterface nic in nics)
+                {
+                    IPv4InterfaceStatistics intrStats = nic.GetIPv4Statistics();
+                    if (intrStats != null)
+                    {
+                        double newVal = Math.Round(getter(intrStats) / factor, 3);
+                        stat.Value = newVal;
+                    }
+                    break;
+                }
+            }
+            catch
+            {
+                // There are times interfaces go away so we just won't update the stat for this
+                m_log.ErrorFormat("{0} Exception fetching stat on interface '{1}'", LogHeader, stat.Description);
+            }
+        }
+    }
+
+    public class ServerStatsAggregator : Stat
+    {
+        public ServerStatsAggregator(
+            string shortName,
+            string name,
+            string description,
+            string unitName,
+            string category,
+            string container
+            )
+            : base(
+                shortName,
+                name,
+                description,
+                unitName,
+                category,
+                container,
+                StatType.Push,
+                MeasuresOfInterest.None,
+                null,
+                StatVerbosity.Info)
+        {
+        }
+        public override string ToConsoleString()
+        {
+            StringBuilder sb = new StringBuilder();
+
+            return sb.ToString();
+        }
+
+        public override OSDMap ToOSDMap()
+        {
+            OSDMap ret = new OSDMap();
+
+            return ret;
+        }
+    }
+}
diff --git a/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs b/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs
index 6a68322..f6f458d 100644
--- a/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
@@ -39,8 +40,6 @@ namespace OpenSim.Framework.Monitoring
     /// </summary>
     public class SimExtraStatsCollector : BaseStatsCollector
     {
-        private long abnormalClientThreadTerminations;
-
 //        private long assetsInCache;
 //        private long texturesInCache;
 //        private long assetCacheMemoryUsage;
@@ -73,11 +72,6 @@ namespace OpenSim.Framework.Monitoring
         private volatile float activeScripts;
         private volatile float scriptLinesPerSecond;
 
-        /// <summary>
-        /// Number of times that a client thread terminated because of an exception
-        /// </summary>
-        public long AbnormalClientThreadTerminations { get { return abnormalClientThreadTerminations; } }
-
 //        /// <summary>
 //        /// These statistics are being collected by push rather than pull.  Pull would be simpler, but I had the
 //        /// notion of providing some flow statistics (which pull wouldn't give us).  Though admittedly these
@@ -166,11 +160,6 @@ namespace OpenSim.Framework.Monitoring
         private IDictionary<UUID, PacketQueueStatsCollector> packetQueueStatsCollectors
             = new Dictionary<UUID, PacketQueueStatsCollector>();
 
-        public void AddAbnormalClientThreadTermination()
-        {
-            abnormalClientThreadTerminations++;
-        }
-
 //        public void AddAsset(AssetBase asset)
 //        {
 //            assetsInCache++;
@@ -324,10 +313,12 @@ Asset service request failures: {3}" + Environment.NewLine,
             sb.Append(Environment.NewLine);
             sb.Append("CONNECTION STATISTICS");
             sb.Append(Environment.NewLine);
-            sb.Append(
-                string.Format(
-                    "Abnormal client thread terminations: {0}" + Environment.NewLine,
-                    abnormalClientThreadTerminations));
+
+            List<Stat> stats = StatsManager.GetStatsFromEachContainer("clientstack", "ClientLogoutsDueToNoReceives");
+
+            sb.AppendFormat(
+                "Client logouts due to no data receive timeout: {0}\n\n", 
+                stats != null ? stats.Sum(s => s.Value).ToString() : "unknown");
 
 //            sb.Append(Environment.NewLine);
 //            sb.Append("INVENTORY STATISTICS");
@@ -338,7 +329,7 @@ Asset service request failures: {3}" + Environment.NewLine,
 //                    InventoryServiceRetrievalFailures));
 
             sb.Append(Environment.NewLine);
-            sb.Append("FRAME STATISTICS");
+            sb.Append("SAMPLE FRAME STATISTICS");
             sb.Append(Environment.NewLine);
             sb.Append("Dilatn  SimFPS  PhyFPS  AgntUp  RootAg  ChldAg  Prims   AtvPrm  AtvScr  ScrLPS");
             sb.Append(Environment.NewLine);
diff --git a/OpenSim/Framework/Monitoring/Stats/CounterStat.cs b/OpenSim/Framework/Monitoring/Stats/CounterStat.cs
index caea30d..318cf1c 100755
--- a/OpenSim/Framework/Monitoring/Stats/CounterStat.cs
+++ b/OpenSim/Framework/Monitoring/Stats/CounterStat.cs
@@ -34,142 +34,6 @@ using OpenMetaverse.StructuredData;
 
 namespace OpenSim.Framework.Monitoring
 {
-// Create a time histogram of events. The histogram is built in a wrap-around
-//   array of equally distributed buckets.
-// For instance, a minute long histogram of second sized buckets would be:
-//          new EventHistogram(60, 1000)
-public class EventHistogram
-{
-    private int m_timeBase;
-    private int m_numBuckets;
-    private int m_bucketMilliseconds;
-    private int m_lastBucket;
-    private int m_totalHistogramMilliseconds;
-    private long[] m_histogram;
-    private object histoLock = new object();
-
-    public EventHistogram(int numberOfBuckets, int millisecondsPerBucket)
-    {
-        m_numBuckets = numberOfBuckets;
-        m_bucketMilliseconds = millisecondsPerBucket;
-        m_totalHistogramMilliseconds = m_numBuckets * m_bucketMilliseconds;
-
-        m_histogram = new long[m_numBuckets];
-        Zero();
-        m_lastBucket = 0;
-        m_timeBase = Util.EnvironmentTickCount();
-    }
-
-    public void Event()
-    {
-        this.Event(1);
-    }
-
-    // Record an event at time 'now' in the histogram.
-    public void Event(int cnt)
-    {
-        lock (histoLock)
-        {
-            // The time as displaced from the base of the histogram
-            int bucketTime = Util.EnvironmentTickCountSubtract(m_timeBase);
-
-            // If more than the total time of the histogram, we just start over
-            if (bucketTime > m_totalHistogramMilliseconds)
-            {
-                Zero();
-                m_lastBucket = 0;
-                m_timeBase = Util.EnvironmentTickCount();
-            }
-            else
-            {
-                // To which bucket should we add this event?
-                int bucket = bucketTime / m_bucketMilliseconds;
-
-                // Advance m_lastBucket to the new bucket. Zero any buckets skipped over.
-                while (bucket != m_lastBucket)
-                {
-                    // Zero from just after the last bucket to the new bucket or the end
-                    for (int jj = m_lastBucket + 1; jj <= Math.Min(bucket, m_numBuckets - 1); jj++)
-                    {
-                        m_histogram[jj] = 0;
-                    }
-                    m_lastBucket = bucket;
-                    // If the new bucket is off the end, wrap around to the beginning
-                    if (bucket > m_numBuckets)
-                    {
-                        bucket -= m_numBuckets;
-                        m_lastBucket = 0;
-                        m_histogram[m_lastBucket] = 0;
-                        m_timeBase += m_totalHistogramMilliseconds;
-                    }
-                }
-            }
-            m_histogram[m_lastBucket] += cnt;
-        }
-    }
-
-    // Get a copy of the current histogram
-    public long[] GetHistogram()
-    {
-        long[] ret = new long[m_numBuckets];
-        lock (histoLock)
-        {
-            int indx = m_lastBucket + 1;
-            for (int ii = 0; ii < m_numBuckets; ii++, indx++)
-            {
-                if (indx >= m_numBuckets)
-                    indx = 0;
-                ret[ii] = m_histogram[indx];
-            }
-        }
-        return ret;
-    }
-
-    public OSDMap GetHistogramAsOSDMap()
-    {
-        OSDMap ret = new OSDMap();
-
-        ret.Add("Buckets", OSD.FromInteger(m_numBuckets));
-        ret.Add("BucketMilliseconds", OSD.FromInteger(m_bucketMilliseconds));
-        ret.Add("TotalMilliseconds", OSD.FromInteger(m_totalHistogramMilliseconds));
-
-        // Compute a number for the first bucket in the histogram.
-        // This will allow readers to know how this histogram relates to any previously read histogram.
-        int baseBucketNum = (m_timeBase / m_bucketMilliseconds) + m_lastBucket + 1;
-        ret.Add("BaseNumber", OSD.FromInteger(baseBucketNum));
-
-        ret.Add("Values", GetHistogramAsOSDArray());
-
-        return ret;
-    }
-    // Get a copy of the current histogram
-    public OSDArray GetHistogramAsOSDArray()
-    {
-        OSDArray ret = new OSDArray(m_numBuckets);
-        lock (histoLock)
-        {
-            int indx = m_lastBucket + 1;
-            for (int ii = 0; ii < m_numBuckets; ii++, indx++)
-            {
-                if (indx >= m_numBuckets)
-                    indx = 0;
-                ret[ii] = OSD.FromLong(m_histogram[indx]);
-            }
-        }
-        return ret;
-    }
-
-    // Zero out the histogram
-    public void Zero()
-    {
-        lock (histoLock)
-        {
-            for (int ii = 0; ii < m_numBuckets; ii++)
-                m_histogram[ii] = 0;
-        }
-    }
-}
-
 // A statistic that wraps a counter.
 // Built this way mostly so histograms and history can be created.
 public class CounterStat : Stat
@@ -224,5 +88,32 @@ public class CounterStat : Stat
             }
         }
     }
+
+    // CounterStat is a basic stat plus histograms
+    public override OSDMap ToOSDMap()
+    {
+        // Get the foundational instance
+        OSDMap map = base.ToOSDMap();
+
+        map["StatType"] = "CounterStat";
+
+        // If there are any histograms, add a new field that is an array of histograms as OSDMaps
+        if (m_histograms.Count > 0)
+        {
+            lock (counterLock)
+            {
+                if (m_histograms.Count > 0)
+                {
+                    OSDArray histos = new OSDArray();
+                    foreach (EventHistogram histo in m_histograms.Values)
+                    {
+                        histos.Add(histo.GetHistogramAsOSDMap());
+                    }
+                    map.Add("Histograms", histos);
+                }
+            }
+        }
+        return map;
+    }
 }
 }
diff --git a/OpenSim/Framework/Monitoring/Stats/EventHistogram.cs b/OpenSim/Framework/Monitoring/Stats/EventHistogram.cs
new file mode 100755
index 0000000..f51f322
--- /dev/null
+++ b/OpenSim/Framework/Monitoring/Stats/EventHistogram.cs
@@ -0,0 +1,173 @@
+/*

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

+using System.Text;

+

+using OpenMetaverse.StructuredData;

+

+namespace OpenSim.Framework.Monitoring

+{

+// Create a time histogram of events. The histogram is built in a wrap-around

+//   array of equally distributed buckets.

+// For instance, a minute long histogram of second sized buckets would be:

+//          new EventHistogram(60, 1000)

+public class EventHistogram

+{

+    private int m_timeBase;

+    private int m_numBuckets;

+    private int m_bucketMilliseconds;

+    private int m_lastBucket;

+    private int m_totalHistogramMilliseconds;

+    private long[] m_histogram;

+    private object histoLock = new object();

+

+    public EventHistogram(int numberOfBuckets, int millisecondsPerBucket)

+    {

+        m_numBuckets = numberOfBuckets;

+        m_bucketMilliseconds = millisecondsPerBucket;

+        m_totalHistogramMilliseconds = m_numBuckets * m_bucketMilliseconds;

+

+        m_histogram = new long[m_numBuckets];

+        Zero();

+        m_lastBucket = 0;

+        m_timeBase = Util.EnvironmentTickCount();

+    }

+

+    public void Event()

+    {

+        this.Event(1);

+    }

+

+    // Record an event at time 'now' in the histogram.

+    public void Event(int cnt)

+    {

+        lock (histoLock)

+        {

+            // The time as displaced from the base of the histogram

+            int bucketTime = Util.EnvironmentTickCountSubtract(m_timeBase);

+

+            // If more than the total time of the histogram, we just start over

+            if (bucketTime > m_totalHistogramMilliseconds)

+            {

+                Zero();

+                m_lastBucket = 0;

+                m_timeBase = Util.EnvironmentTickCount();

+            }

+            else

+            {

+                // To which bucket should we add this event?

+                int bucket = bucketTime / m_bucketMilliseconds;

+

+                // Advance m_lastBucket to the new bucket. Zero any buckets skipped over.

+                while (bucket != m_lastBucket)

+                {

+                    // Zero from just after the last bucket to the new bucket or the end

+                    for (int jj = m_lastBucket + 1; jj <= Math.Min(bucket, m_numBuckets - 1); jj++)

+                    {

+                        m_histogram[jj] = 0;

+                    }

+                    m_lastBucket = bucket;

+                    // If the new bucket is off the end, wrap around to the beginning

+                    if (bucket > m_numBuckets)

+                    {

+                        bucket -= m_numBuckets;

+                        m_lastBucket = 0;

+                        m_histogram[m_lastBucket] = 0;

+                        m_timeBase += m_totalHistogramMilliseconds;

+                    }

+                }

+            }

+            m_histogram[m_lastBucket] += cnt;

+        }

+    }

+

+    // Get a copy of the current histogram

+    public long[] GetHistogram()

+    {

+        long[] ret = new long[m_numBuckets];

+        lock (histoLock)

+        {

+            int indx = m_lastBucket + 1;

+            for (int ii = 0; ii < m_numBuckets; ii++, indx++)

+            {

+                if (indx >= m_numBuckets)

+                    indx = 0;

+                ret[ii] = m_histogram[indx];

+            }

+        }

+        return ret;

+    }

+

+    public OSDMap GetHistogramAsOSDMap()

+    {

+        OSDMap ret = new OSDMap();

+

+        ret.Add("Buckets", OSD.FromInteger(m_numBuckets));

+        ret.Add("BucketMilliseconds", OSD.FromInteger(m_bucketMilliseconds));

+        ret.Add("TotalMilliseconds", OSD.FromInteger(m_totalHistogramMilliseconds));

+

+        // Compute a number for the first bucket in the histogram.

+        // This will allow readers to know how this histogram relates to any previously read histogram.

+        int baseBucketNum = (m_timeBase / m_bucketMilliseconds) + m_lastBucket + 1;

+        ret.Add("BaseNumber", OSD.FromInteger(baseBucketNum));

+

+        ret.Add("Values", GetHistogramAsOSDArray());

+

+        return ret;

+    }

+    // Get a copy of the current histogram

+    public OSDArray GetHistogramAsOSDArray()

+    {

+        OSDArray ret = new OSDArray(m_numBuckets);

+        lock (histoLock)

+        {

+            int indx = m_lastBucket + 1;

+            for (int ii = 0; ii < m_numBuckets; ii++, indx++)

+            {

+                if (indx >= m_numBuckets)

+                    indx = 0;

+                ret[ii] = OSD.FromLong(m_histogram[indx]);

+            }

+        }

+        return ret;

+    }

+

+    // Zero out the histogram

+    public void Zero()

+    {

+        lock (histoLock)

+        {

+            for (int ii = 0; ii < m_numBuckets; ii++)

+                m_histogram[ii] = 0;

+        }

+    }

+}

+

+}

diff --git a/OpenSim/Framework/Monitoring/Stats/PercentageStat.cs b/OpenSim/Framework/Monitoring/Stats/PercentageStat.cs
index 60bed55..55ddf06 100644
--- a/OpenSim/Framework/Monitoring/Stats/PercentageStat.cs
+++ b/OpenSim/Framework/Monitoring/Stats/PercentageStat.cs
@@ -29,6 +29,8 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
+using OpenMetaverse.StructuredData;
+
 namespace OpenSim.Framework.Monitoring
 {
     public class PercentageStat : Stat
@@ -84,5 +86,19 @@ namespace OpenSim.Framework.Monitoring
 
             return sb.ToString();
         }
+
+        // PercentageStat is a basic stat plus percent calc
+        public override OSDMap ToOSDMap()
+        {
+            // Get the foundational instance
+            OSDMap map = base.ToOSDMap();
+
+            map["StatType"] = "PercentageStat";
+
+            map.Add("Antecedent", OSD.FromLong(Antecedent));
+            map.Add("Consequent", OSD.FromLong(Consequent));
+
+            return map;
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/Monitoring/Stats/Stat.cs b/OpenSim/Framework/Monitoring/Stats/Stat.cs
index 2e7665f..2b34493 100644
--- a/OpenSim/Framework/Monitoring/Stats/Stat.cs
+++ b/OpenSim/Framework/Monitoring/Stats/Stat.cs
@@ -27,8 +27,10 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
 using System.Text;
-
+using log4net;
 using OpenMetaverse.StructuredData;
 
 namespace OpenSim.Framework.Monitoring
@@ -38,6 +40,10 @@ namespace OpenSim.Framework.Monitoring
     /// </summary>
     public class Stat : IDisposable
     {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        public static readonly char[] DisallowedShortNameCharacters = { '.' };
+
         /// <summary>
         /// Category of this stat (e.g. cache, scene, etc).
         /// </summary>
@@ -95,7 +101,7 @@ namespace OpenSim.Framework.Monitoring
         /// <remarks>
         /// Will be null if no measures of interest require samples.
         /// </remarks>
-        private static Queue<double> m_samples;
+        private Queue<double> m_samples;
 
         /// <summary>
         /// Maximum number of statistical samples.
@@ -162,6 +168,12 @@ namespace OpenSim.Framework.Monitoring
                 throw new Exception(
                     string.Format("Stat cannot be in category '{0}' since this is reserved for a subcommand", category));
 
+            foreach (char c in DisallowedShortNameCharacters)
+            {
+                if (shortName.IndexOf(c) != -1)
+                    throw new Exception(string.Format("Stat name {0} cannot contain character {1}", shortName, c));
+            }
+
             ShortName = shortName;
             Name = name;
             Description = description;
@@ -204,6 +216,8 @@ namespace OpenSim.Framework.Monitoring
                 if (m_samples.Count >= m_maxSamples)
                     m_samples.Dequeue();
 
+//                m_log.DebugFormat("[STAT]: Recording value {0} for {1}", newValue, Name);
+
                 m_samples.Enqueue(newValue);
             }
         }
@@ -211,7 +225,13 @@ namespace OpenSim.Framework.Monitoring
         public virtual string ToConsoleString()
         {
             StringBuilder sb = new StringBuilder();
-            sb.AppendFormat("{0}.{1}.{2} : {3} {4}", Category, Container, ShortName, Value, UnitName);
+            sb.AppendFormat(
+                "{0}.{1}.{2} : {3}{4}", 
+                Category, 
+                Container, 
+                ShortName, 
+                Value, 
+                UnitName == null || UnitName == "" ? "" : string.Format(" {0}", UnitName));
 
             AppendMeasuresOfInterest(sb);
 
@@ -221,6 +241,8 @@ namespace OpenSim.Framework.Monitoring
         public virtual OSDMap ToOSDMap()
         {
             OSDMap ret = new OSDMap();
+            ret.Add("StatType", "Stat");    // used by overloading classes to denote type of stat
+
             ret.Add("Category", OSD.FromString(Category));
             ret.Add("Container", OSD.FromString(Container));
             ret.Add("ShortName", OSD.FromString(ShortName));
@@ -229,31 +251,74 @@ namespace OpenSim.Framework.Monitoring
             ret.Add("UnitName", OSD.FromString(UnitName));
             ret.Add("Value", OSD.FromReal(Value));
 
+            double lastChangeOverTime, averageChangeOverTime;
+            if (ComputeMeasuresOfInterest(out lastChangeOverTime, out averageChangeOverTime))
+            {
+                ret.Add("LastChangeOverTime", OSD.FromReal(lastChangeOverTime));
+                ret.Add("AverageChangeOverTime", OSD.FromReal(averageChangeOverTime));
+            }
+
             return ret;
         }
 
-        protected void AppendMeasuresOfInterest(StringBuilder sb)
+        // Compute the averages over time and return same.
+        // Return 'true' if averages were actually computed. 'false' if no average info.
+        public bool ComputeMeasuresOfInterest(out double lastChangeOverTime, out double averageChangeOverTime)
         {
-            if ((MeasuresOfInterest & MeasuresOfInterest.AverageChangeOverTime) 
-                == MeasuresOfInterest.AverageChangeOverTime)
+            bool ret = false;
+            lastChangeOverTime = 0;
+            averageChangeOverTime = 0;
+
+            if ((MeasuresOfInterest & MeasuresOfInterest.AverageChangeOverTime) == MeasuresOfInterest.AverageChangeOverTime)
             {
                 double totalChange = 0;
+                double? penultimateSample = null;
                 double? lastSample = null;
 
                 lock (m_samples)
                 {
+                    //                    m_log.DebugFormat(
+                    //                        "[STAT]: Samples for {0} are {1}", 
+                    //                        Name, string.Join(",", m_samples.Select(s => s.ToString()).ToArray()));
+
                     foreach (double s in m_samples)
                     {
                         if (lastSample != null)
                             totalChange += s - (double)lastSample;
 
+                        penultimateSample = lastSample;
                         lastSample = s;
                     }
                 }
 
+                if (lastSample != null && penultimateSample != null)
+                {
+                    lastChangeOverTime
+                        = ((double)lastSample - (double)penultimateSample) / (Watchdog.WATCHDOG_INTERVAL_MS / 1000);
+                }
+
                 int divisor = m_samples.Count <= 1 ? 1 : m_samples.Count - 1;
 
-                sb.AppendFormat(", {0:0.##}{1}/s", totalChange / divisor / (Watchdog.WATCHDOG_INTERVAL_MS / 1000), UnitName);
+                averageChangeOverTime = totalChange / divisor / (Watchdog.WATCHDOG_INTERVAL_MS / 1000);
+                ret = true;
+            }
+
+            return ret;
+        }
+
+        protected void AppendMeasuresOfInterest(StringBuilder sb)
+        {
+            double lastChangeOverTime = 0;
+            double averageChangeOverTime = 0;
+
+            if (ComputeMeasuresOfInterest(out lastChangeOverTime, out averageChangeOverTime))
+            {
+                sb.AppendFormat(
+                    ", {0:0.##}{1}/s, {2:0.##}{3}/s", 
+                    lastChangeOverTime, 
+                    UnitName == null || UnitName == "" ? "" : string.Format(" {0}", UnitName), 
+                    averageChangeOverTime,
+                    UnitName == null || UnitName == "" ? "" : string.Format(" {0}", UnitName));
             }
         }
     }
diff --git a/OpenSim/Framework/Monitoring/StatsLogger.cs b/OpenSim/Framework/Monitoring/StatsLogger.cs
new file mode 100644
index 0000000..1e4fa11
--- /dev/null
+++ b/OpenSim/Framework/Monitoring/StatsLogger.cs
@@ -0,0 +1,108 @@
+/*
+ * 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 System.Timers;
+using log4net;
+
+namespace OpenSim.Framework.Monitoring
+{
+    /// <summary>
+    /// Provides a means to continuously log stats for debugging purposes.
+    /// </summary>
+    public static class StatsLogger
+    {
+        private static readonly ILog m_statsLog = LogManager.GetLogger("special.StatsLogger");
+
+        private static Timer m_loggingTimer;
+        private static int m_statsLogIntervalMs = 5000;
+
+        public static void RegisterConsoleCommands(ICommandConsole console)
+        {
+            console.Commands.AddCommand(
+                "Debug",
+                false,
+                "debug stats record",
+                "debug stats record start|stop",
+                "Control whether stats are being regularly recorded to a separate file.",
+                "For debug purposes.  Experimental.",
+                HandleStatsRecordCommand);
+        }
+
+        public static void HandleStatsRecordCommand(string module, string[] cmd)
+        {
+            ICommandConsole con = MainConsole.Instance;
+
+            if (cmd.Length != 4)
+            {
+                con.Output("Usage: debug stats record start|stop");
+                return;
+            }
+
+            if (cmd[3] == "start")
+            {
+                Start();
+                con.OutputFormat("Now recording all stats to file every {0}ms", m_statsLogIntervalMs);
+            }
+            else if (cmd[3] == "stop")
+            {
+                Stop();
+                con.Output("Stopped recording stats to file.");
+            }
+        }
+
+        public static void Start()
+        {
+            if (m_loggingTimer != null)
+                Stop();
+
+            m_loggingTimer = new Timer(m_statsLogIntervalMs);
+            m_loggingTimer.AutoReset = false;
+            m_loggingTimer.Elapsed += Log;
+            m_loggingTimer.Start();
+        }
+
+        public static void Stop()
+        {
+            if (m_loggingTimer != null)
+            {
+                m_loggingTimer.Stop();
+            }
+        }
+
+        private static void Log(object sender, ElapsedEventArgs e)
+        {
+            m_statsLog.InfoFormat("*** STATS REPORT AT {0} ***", DateTime.Now);
+
+            foreach (string report in StatsManager.GetAllStatsReports())
+                m_statsLog.Info(report);
+
+            m_loggingTimer.Start();
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Monitoring/StatsManager.cs b/OpenSim/Framework/Monitoring/StatsManager.cs
index 24db6d4..05ee4c5 100644
--- a/OpenSim/Framework/Monitoring/StatsManager.cs
+++ b/OpenSim/Framework/Monitoring/StatsManager.cs
@@ -26,15 +26,20 @@
  */
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 
+using OpenSim.Framework;
+using OpenMetaverse.StructuredData;
+
 namespace OpenSim.Framework.Monitoring
 {
     /// <summary>
-    /// Singleton used to provide access to statistics reporters
+    /// Static class used to register/deregister/fetch statistics
     /// </summary>
-    public class StatsManager
+    public static class StatsManager
     {
         // Subcommand used to list other stats.
         public const string AllSubCommand = "all";
@@ -54,13 +59,13 @@ namespace OpenSim.Framework.Monitoring
         public static SortedDictionary<string, SortedDictionary<string, SortedDictionary<string, Stat>>> RegisteredStats
             = new SortedDictionary<string, SortedDictionary<string, SortedDictionary<string, Stat>>>();
 
-        private static AssetStatsCollector assetStats;
-        private static UserStatsCollector userStats;
-        private static SimExtraStatsCollector simExtraStats = new SimExtraStatsCollector();
+//        private static AssetStatsCollector assetStats;
+//        private static UserStatsCollector userStats;
+//        private static SimExtraStatsCollector simExtraStats = new SimExtraStatsCollector();
 
-        public static AssetStatsCollector AssetStats { get { return assetStats; } }
-        public static UserStatsCollector UserStats { get { return userStats; } }
-        public static SimExtraStatsCollector SimExtraStats { get { return simExtraStats; } }
+//        public static AssetStatsCollector AssetStats { get { return assetStats; } }
+//        public static UserStatsCollector UserStats { get { return userStats; } }
+        public static SimExtraStatsCollector SimExtraStats { get; set; }
 
         public static void RegisterConsoleCommands(ICommandConsole console)
         {
@@ -68,14 +73,18 @@ namespace OpenSim.Framework.Monitoring
                 "General",
                 false,
                 "show stats",
-                "show stats [list|all|<category>]",
+                "show stats [list|all|(<category>[.<container>])+",
                 "Show statistical information for this server",
                 "If no final argument is specified then legacy statistics information is currently shown.\n"
-                    + "If list is specified then statistic categories are shown.\n"
-                    + "If all is specified then all registered statistics are shown.\n"
-                    + "If a category name is specified then only statistics from that category are shown.\n"
+                    + "'list' argument will show statistic categories.\n"
+                    + "'all' will show all statistics.\n"
+                    + "A <category> name will show statistics from that category.\n"
+                    + "A <category>.<container> name will show statistics from that category in that container.\n"
+                    + "More than one name can be given separated by spaces.\n"
                     + "THIS STATS FACILITY IS EXPERIMENTAL AND DOES NOT YET CONTAIN ALL STATS",
                 HandleShowStatsCommand);
+
+            StatsLogger.RegisterConsoleCommands(console);
         }
 
         public static void HandleShowStatsCommand(string module, string[] cmd)
@@ -84,43 +93,47 @@ namespace OpenSim.Framework.Monitoring
 
             if (cmd.Length > 2)
             {
-                var categoryName = cmd[2];
-                var containerName = cmd.Length > 3 ? cmd[3] : String.Empty;
-
-                if (categoryName == AllSubCommand)
+                foreach (string name in cmd.Skip(2))
                 {
-                    foreach (var category in RegisteredStats.Values)
+                    string[] components = name.Split('.');
+
+                    string categoryName = components[0];
+                    string containerName = components.Length > 1 ? components[1] : null;
+
+                    if (categoryName == AllSubCommand)
                     {
-                        OutputCategoryStatsToConsole(con, category);
+                        OutputAllStatsToConsole(con);
                     }
-                }
-                else if (categoryName == ListSubCommand)
-                {
-                    con.Output("Statistic categories available are:");
-                    foreach (string category in RegisteredStats.Keys)
-                        con.OutputFormat("  {0}", category);
-                }
-                else
-                {
-                    SortedDictionary<string, SortedDictionary<string, Stat>> category;
-                    if (!RegisteredStats.TryGetValue(categoryName, out category))
+                    else if (categoryName == ListSubCommand)
                     {
-                        con.OutputFormat("No such category as {0}", categoryName);
+                        con.Output("Statistic categories available are:");
+                        foreach (string category in RegisteredStats.Keys)
+                            con.OutputFormat("  {0}", category);
                     }
                     else
                     {
-                        if (String.IsNullOrEmpty(containerName))
-                            OutputCategoryStatsToConsole(con, category);
+                        SortedDictionary<string, SortedDictionary<string, Stat>> category;
+                        if (!RegisteredStats.TryGetValue(categoryName, out category))
+                        {
+                            con.OutputFormat("No such category as {0}", categoryName);
+                        }
                         else
                         {
-                            SortedDictionary<string, Stat> container;
-                            if (category.TryGetValue(containerName, out container))
+                            if (String.IsNullOrEmpty(containerName))
                             {
-                                OutputContainerStatsToConsole(con, container);
+                                OutputCategoryStatsToConsole(con, category);
                             }
                             else
                             {
-                                con.OutputFormat("No such container {0} in category {1}", containerName, categoryName);
+                                SortedDictionary<string, Stat> container;
+                                if (category.TryGetValue(containerName, out container))
+                                {
+                                    OutputContainerStatsToConsole(con, container);
+                                }
+                                else
+                                {
+                                    con.OutputFormat("No such container {0} in category {1}", containerName, categoryName);
+                                }
                             }
                         }
                     }
@@ -129,51 +142,187 @@ namespace OpenSim.Framework.Monitoring
             else
             {
                 // Legacy
-                con.Output(SimExtraStats.Report());
+                if (SimExtraStats != null)
+                    con.Output(SimExtraStats.Report());
+                else
+                    OutputAllStatsToConsole(con);
             }
         }
 
+        public static List<string> GetAllStatsReports()
+        {
+            List<string> reports = new List<string>();
+
+            foreach (var category in RegisteredStats.Values)
+                reports.AddRange(GetCategoryStatsReports(category));
+
+            return reports;
+        }
+
+        private static void OutputAllStatsToConsole(ICommandConsole con)
+        {
+            foreach (string report in GetAllStatsReports())
+                con.Output(report);
+        }
+
+        private static List<string> GetCategoryStatsReports(
+            SortedDictionary<string, SortedDictionary<string, Stat>> category)
+        {
+            List<string> reports = new List<string>();
+
+            foreach (var container in category.Values)
+                reports.AddRange(GetContainerStatsReports(container));
+
+            return reports;
+        }
+
         private static void OutputCategoryStatsToConsole(
             ICommandConsole con, SortedDictionary<string, SortedDictionary<string, Stat>> category)
         {
-            foreach (var container in category.Values)
-            {
-                OutputContainerStatsToConsole(con, container);
-            }
+            foreach (string report in GetCategoryStatsReports(category))
+                con.Output(report);
         }
 
-        private static void OutputContainerStatsToConsole( ICommandConsole con, SortedDictionary<string, Stat> container)
+        private static List<string> GetContainerStatsReports(SortedDictionary<string, Stat> container)
         {
+            List<string> reports = new List<string>();
+
             foreach (Stat stat in container.Values)
-            {
-                con.Output(stat.ToConsoleString());
-            }
+                reports.Add(stat.ToConsoleString());
+
+            return reports;
         }
 
-        /// <summary>
-        /// Start collecting statistics related to assets.
-        /// Should only be called once.
-        /// </summary>
-        public static AssetStatsCollector StartCollectingAssetStats()
+        private static void OutputContainerStatsToConsole(
+            ICommandConsole con, SortedDictionary<string, Stat> container)
+        {
+            foreach (string report in GetContainerStatsReports(container))
+                con.Output(report);
+        }
+
+        // Creates an OSDMap of the format:
+        // { categoryName: {
+        //         containerName: {
+        //               statName: {
+        //                     "Name": name,
+        //                     "ShortName": shortName,
+        //                     ...
+        //               },
+        //               statName: {
+        //                     "Name": name,
+        //                     "ShortName": shortName,
+        //                     ...
+        //               },
+        //               ...
+        //         },
+        //         containerName: {
+        //         ...
+        //         },
+        //         ...
+        //   },
+        //   categoryName: {
+        //   ...
+        //   },
+        //   ...
+        // }
+        // The passed in parameters will filter the categories, containers and stats returned. If any of the
+        //    parameters are either EmptyOrNull or the AllSubCommand value, all of that type will be returned.
+        // Case matters.
+        public static OSDMap GetStatsAsOSDMap(string pCategoryName, string pContainerName, string pStatName)
         {
-            assetStats = new AssetStatsCollector();
+            OSDMap map = new OSDMap();
+
+            foreach (string catName in RegisteredStats.Keys)
+            {
+                // Do this category if null spec, "all" subcommand or category name matches passed parameter.
+                // Skip category if none of the above.
+                if (!(String.IsNullOrEmpty(pCategoryName) || pCategoryName == AllSubCommand || pCategoryName == catName))
+                    continue;
 
-            return assetStats;
+                OSDMap contMap = new OSDMap();
+                foreach (string contName in RegisteredStats[catName].Keys)
+                {
+                    if (!(string.IsNullOrEmpty(pContainerName) || pContainerName == AllSubCommand || pContainerName == contName))
+                        continue;
+                    
+                    OSDMap statMap = new OSDMap();
+
+                    SortedDictionary<string, Stat> theStats = RegisteredStats[catName][contName];
+                    foreach (string statName in theStats.Keys)
+                    {
+                        if (!(String.IsNullOrEmpty(pStatName) || pStatName == AllSubCommand || pStatName == statName))
+                            continue;
+
+                        statMap.Add(statName, theStats[statName].ToOSDMap());
+                    }
+
+                    contMap.Add(contName, statMap);
+                }
+                map.Add(catName, contMap);
+            }
+
+            return map;
         }
 
-        /// <summary>
-        /// Start collecting statistics related to users.
-        /// Should only be called once.
-        /// </summary>
-        public static UserStatsCollector StartCollectingUserStats()
+        public static Hashtable HandleStatsRequest(Hashtable request)
         {
-            userStats = new UserStatsCollector();
+            Hashtable responsedata = new Hashtable();
+//            string regpath = request["uri"].ToString();
+            int response_code = 200;
+            string contenttype = "text/json";
+
+            string pCategoryName = StatsManager.AllSubCommand;
+            string pContainerName = StatsManager.AllSubCommand;
+            string pStatName = StatsManager.AllSubCommand;
+
+            if (request.ContainsKey("cat")) pCategoryName = request["cat"].ToString();
+            if (request.ContainsKey("cont")) pContainerName = request["cat"].ToString();
+            if (request.ContainsKey("stat")) pStatName = request["cat"].ToString();
+
+            string strOut = StatsManager.GetStatsAsOSDMap(pCategoryName, pContainerName, pStatName).ToString();
+
+            // If requestor wants it as a callback function, build response as a function rather than just the JSON string.
+            if (request.ContainsKey("callback"))
+            {
+                strOut = request["callback"].ToString() + "(" + strOut + ");";
+            }
 
-            return userStats;
+            // m_log.DebugFormat("{0} StatFetch: uri={1}, cat={2}, cont={3}, stat={4}, resp={5}",
+            //                         LogHeader, regpath, pCategoryName, pContainerName, pStatName, strOut);
+
+            responsedata["int_response_code"] = response_code;
+            responsedata["content_type"] = contenttype;
+            responsedata["keepalive"] = false;
+            responsedata["str_response_string"] = strOut;
+            responsedata["access_control_allow_origin"] = "*";
+
+            return responsedata;
         }
 
+//        /// <summary>
+//        /// Start collecting statistics related to assets.
+//        /// Should only be called once.
+//        /// </summary>
+//        public static AssetStatsCollector StartCollectingAssetStats()
+//        {
+//            assetStats = new AssetStatsCollector();
+//
+//            return assetStats;
+//        }
+//
+//        /// <summary>
+//        /// Start collecting statistics related to users.
+//        /// Should only be called once.
+//        /// </summary>
+//        public static UserStatsCollector StartCollectingUserStats()
+//        {
+//            userStats = new UserStatsCollector();
+//
+//            return userStats;
+//        }
+
         /// <summary>
-        /// Registers a statistic.
+        /// Register a statistic.
         /// </summary>
         /// <param name='stat'></param>
         /// <returns></returns>
@@ -187,7 +336,7 @@ namespace OpenSim.Framework.Monitoring
                 // Stat name is not unique across category/container/shortname key.
                 // XXX: For now just return false.  This is to avoid problems in regression tests where all tests
                 // in a class are run in the same instance of the VM.
-                if (TryGetStat(stat, out category, out container))
+                if (TryGetStatParents(stat, out category, out container))
                     return false;
 
                 // We take a copy-on-write approach here of replacing dictionaries when keys are added or removed.
@@ -223,7 +372,7 @@ namespace OpenSim.Framework.Monitoring
 
             lock (RegisteredStats)
             {
-                if (!TryGetStat(stat, out category, out container))
+                if (!TryGetStatParents(stat, out category, out container))
                     return false;
 
                 newContainer = new SortedDictionary<string, Stat>(container);
@@ -239,12 +388,67 @@ namespace OpenSim.Framework.Monitoring
             }
         }
 
-        public static bool TryGetStats(string category, out SortedDictionary<string, SortedDictionary<string, Stat>> stats)
+        public static bool TryGetStat(string category, string container, string statShortName, out Stat stat)
         {
-            return RegisteredStats.TryGetValue(category, out stats);
+            stat = null;
+            SortedDictionary<string, SortedDictionary<string, Stat>> categoryStats;
+
+            lock (RegisteredStats)
+            {
+                if (!TryGetStatsForCategory(category, out categoryStats))
+                    return false;
+
+                SortedDictionary<string, Stat> containerStats;
+
+                if (!categoryStats.TryGetValue(container, out containerStats))
+                    return false;
+
+                return containerStats.TryGetValue(statShortName, out stat);
+            }
+        }
+
+        public static bool TryGetStatsForCategory(
+            string category, out SortedDictionary<string, SortedDictionary<string, Stat>> stats)
+        {
+            lock (RegisteredStats)
+                return RegisteredStats.TryGetValue(category, out stats);
+        }
+
+        /// <summary>
+        /// Get the same stat for each container in a given category.
+        /// </summary>
+        /// <returns>
+        /// The stats if there were any to fetch.  Otherwise null.
+        /// </returns>
+        /// <param name='category'></param>
+        /// <param name='statShortName'></param>
+        public static List<Stat> GetStatsFromEachContainer(string category, string statShortName)
+        {
+            SortedDictionary<string, SortedDictionary<string, Stat>> categoryStats;
+
+            lock (RegisteredStats)
+            {
+                if (!RegisteredStats.TryGetValue(category, out categoryStats))
+                    return null;
+
+                List<Stat> stats = null;
+
+                foreach (SortedDictionary<string, Stat> containerStats in categoryStats.Values)
+                {
+                    if (containerStats.ContainsKey(statShortName))
+                    {
+                        if (stats == null)
+                            stats = new List<Stat>();
+
+                        stats.Add(containerStats[statShortName]);
+                    }
+                }
+
+                return stats;
+            }
         }
 
-        public static bool TryGetStat(
+        public static bool TryGetStatParents(
             Stat stat,
             out SortedDictionary<string, SortedDictionary<string, Stat>> category,
             out SortedDictionary<string, Stat> container)
diff --git a/OpenSim/Framework/Monitoring/Watchdog.cs b/OpenSim/Framework/Monitoring/Watchdog.cs
index 69d2db5..32724ec 100644
--- a/OpenSim/Framework/Monitoring/Watchdog.cs
+++ b/OpenSim/Framework/Monitoring/Watchdog.cs
@@ -380,6 +380,7 @@ namespace OpenSim.Framework.Monitoring
             if (MemoryWatchdog.Enabled)
                 MemoryWatchdog.Update();
 
+            ChecksManager.CheckChecks();
             StatsManager.RecordStats();
 
             m_watchdogTimer.Start();
diff --git a/OpenSim/Framework/RegionFlags.cs b/OpenSim/Framework/RegionFlags.cs
index a3089b0..7c6569e 100644
--- a/OpenSim/Framework/RegionFlags.cs
+++ b/OpenSim/Framework/RegionFlags.cs
@@ -48,6 +48,7 @@ namespace OpenSim.Framework
         NoMove = 64, // Don't allow moving this region
         Reservation = 128, // This is an inactive reservation
         Authenticate = 256, // Require authentication
-        Hyperlink = 512 // Record represents a HG link
+        Hyperlink = 512, // Record represents a HG link
+        DefaultHGRegion = 1024 // Record represents a default region for hypergrid teleports only.
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 6c04c69..bfd67c7 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -86,26 +86,23 @@ namespace OpenSim.Framework.Servers
         /// </summary>
         protected virtual void StartupSpecific()
         {
-            if (m_console == null)
-                return;
-
+            StatsManager.SimExtraStats = new SimExtraStatsCollector();
             RegisterCommonCommands();
-            
-            m_console.Commands.AddCommand("General", false, "quit",
-                    "quit",
-                    "Quit the application", HandleQuit);
+            RegisterCommonComponents(Config);
+        }       
+
+        protected override void ShutdownSpecific()
+        {            
+            m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete.  Exiting...");
+
+            RemovePIDFile();
 
-            m_console.Commands.AddCommand("General", false, "shutdown",
-                    "shutdown",
-                    "Quit the application", HandleQuit);
+            base.ShutdownSpecific();
+
+            Environment.Exit(0);
         }
         
         /// <summary>
-        /// Should be overriden and referenced by descendents if they need to perform extra shutdown processing
-        /// </summary>
-        public virtual void ShutdownSpecific() {}
-        
-        /// <summary>
         /// Provides a list of help topics that are available.  Overriding classes should append their topics to the
         /// information returned when the base method is called.
         /// </summary>
@@ -153,25 +150,8 @@ namespace OpenSim.Framework.Servers
                 timeTaken.Minutes, timeTaken.Seconds);
         }
 
-        /// <summary>
-        /// Should be overriden and referenced by descendents if they need to perform extra shutdown processing
-        /// </summary>
-        public virtual void Shutdown()
+        public string osSecret 
         {
-            ShutdownSpecific();
-            
-            m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete.  Exiting...");
-            RemovePIDFile();
-            
-            Environment.Exit(0);
-        }
-
-        private void HandleQuit(string module, string[] args)
-        {
-            Shutdown();
-        }      
-        
-        public string osSecret {
             // Secret uuid for the simulator
             get { return m_osSecret; }            
         }
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 97035e3..f4b4156 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -54,7 +54,6 @@ namespace OpenSim.Framework.Servers.HttpServer
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private HttpServerLogWriter httpserverlog = new HttpServerLogWriter();
 
-
         /// <summary>
         /// This is a pending websocket request before it got an sucessful upgrade response.
         /// The consumer must call handler.HandshakeAndUpgrade() to signal to the handler to 
@@ -81,6 +80,11 @@ namespace OpenSim.Framework.Servers.HttpServer
         /// </remarks>
         public int RequestNumber { get; private set; }
 
+        /// <summary>
+        /// Statistic for holding number of requests processed.
+        /// </summary>
+        private Stat m_requestsProcessedStat;
+
         private volatile int NotSocketErrors = 0;
         public volatile bool HTTPDRunning = false;
 
@@ -383,6 +387,8 @@ namespace OpenSim.Framework.Servers.HttpServer
 
                 if (TryGetPollServiceHTTPHandler(request.UriPath.ToString(), out psEvArgs))
                 {
+                    psEvArgs.RequestsReceived++;
+
                     PollServiceHttpRequest psreq = new PollServiceHttpRequest(psEvArgs, context, request);
 
                     if (psEvArgs.Request != null)
@@ -437,9 +443,8 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
         }
 
-        public void OnHandleRequestIOThread(IHttpClientContext context, IHttpRequest request)
+        private void OnHandleRequestIOThread(IHttpClientContext context, IHttpRequest request)
         {
-
             OSHttpRequest req = new OSHttpRequest(context, request);
             WebSocketRequestDelegate dWebSocketRequestDelegate = null;
             lock (m_WebSocketHandlers)
@@ -454,9 +459,8 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
             
             OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context);
-            
-            HandleRequest(req, resp);
-           
+            resp.ReuseContext = true;
+            HandleRequest(req, resp);           
 
             // !!!HACK ALERT!!!
             // There seems to be a bug in the underlying http code that makes subsequent requests
@@ -687,7 +691,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
                 if (buffer != null)
                 {
-                    if (!response.SendChunked)
+                    if (!response.SendChunked && response.ContentLength64 <= 0)
                         response.ContentLength64 = buffer.LongLength;
 
                     response.OutputStream.Write(buffer, 0, buffer.Length);
@@ -1850,8 +1854,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 = new PollServiceRequestManager(this, 4, 25000);
+                m_PollServiceManager.Start();
                 HTTPDRunning = true;
 
                 //HttpListenerContext context;
@@ -1870,6 +1874,21 @@ namespace OpenSim.Framework.Servers.HttpServer
                 // useful without inbound HTTP.
                 throw e;
             }
+
+            m_requestsProcessedStat 
+                = new Stat(
+                    "HTTPRequestsServed",
+                    "Number of inbound HTTP requests processed",
+                    "",
+                    "requests",
+                    "httpserver",
+                    Port.ToString(),
+                    StatType.Pull,
+                    MeasuresOfInterest.AverageChangeOverTime,
+                    stat => stat.Value = RequestNumber,
+                    StatVerbosity.Debug);
+          
+            StatsManager.RegisterStat(m_requestsProcessedStat);
         }
 
         public void httpServerDisconnectMonitor(IHttpClientContext source, SocketError err)
@@ -1902,9 +1921,12 @@ namespace OpenSim.Framework.Servers.HttpServer
         public void Stop()
         {
             HTTPDRunning = false;
+
+            StatsManager.DeregisterStat(m_requestsProcessedStat);
+
             try
             {
-//                m_PollServiceManager.Stop();
+                m_PollServiceManager.Stop();
 
                 m_httpListener2.ExceptionThrown -= httpServerException;
                 //m_httpListener2.DisconnectHandler = null;
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseOutputStreamHandler.cs b/OpenSim/Framework/Servers/HttpServer/BaseOutputStreamHandler.cs
new file mode 100644
index 0000000..72b3065
--- /dev/null
+++ b/OpenSim/Framework/Servers/HttpServer/BaseOutputStreamHandler.cs
@@ -0,0 +1,60 @@
+/*
+ * 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.IO;
+
+namespace OpenSim.Framework.Servers.HttpServer
+{
+    /// <summary>
+    /// Base handler for writing to an output stream
+    /// </summary>
+    /// <remarks>
+    /// Inheriting classes should override ProcessRequest() rather than Handle()
+    /// </remarks>
+    public abstract class BaseOutputStreamHandler : BaseRequestHandler, IRequestHandler
+    {
+        protected BaseOutputStreamHandler(string httpMethod, string path) : this(httpMethod, path, null, null) {}
+
+        protected BaseOutputStreamHandler(string httpMethod, string path, string name, string description)
+            : base(httpMethod, path, name, description) {}
+
+        public virtual void Handle(
+            string path, Stream request, Stream response, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        {
+            RequestsReceived++;
+
+            ProcessRequest(path, request, response, httpRequest, httpResponse);
+
+            RequestsHandled++;
+        }
+
+        protected virtual void ProcessRequest(
+            string path, Stream request, Stream response, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs b/OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs
index ae7aaf2..bbac699 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs
@@ -31,6 +31,10 @@ namespace OpenSim.Framework.Servers.HttpServer
 {
     public abstract class BaseRequestHandler
     {
+        public int RequestsReceived { get; protected set; }
+
+        public int RequestsHandled { get; protected set; }
+
         public virtual string ContentType
         {
             get { return "application/xml"; }
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs b/OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs
index 6342983..252cc2a 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs
@@ -29,14 +29,35 @@ using System.IO;
 
 namespace OpenSim.Framework.Servers.HttpServer
 {
+    /// <summary>
+    /// Base streamed request handler.
+    /// </summary>
+    /// <remarks>
+    /// Inheriting classes should override ProcessRequest() rather than Handle()
+    /// </remarks>
     public abstract class BaseStreamHandler : BaseRequestHandler, IStreamedRequestHandler
     {
-        public abstract byte[] Handle(string path, Stream request,
-                                      IOSHttpRequest httpRequest, IOSHttpResponse httpResponse);
-
         protected BaseStreamHandler(string httpMethod, string path) : this(httpMethod, path, null, null) {}
 
         protected BaseStreamHandler(string httpMethod, string path, string name, string description)
             : base(httpMethod, path, name, description) {}
+
+        public virtual byte[] Handle(
+            string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        {
+            RequestsReceived++;
+
+            byte[] result = ProcessRequest(path, request, httpRequest, httpResponse);
+
+            RequestsHandled++;
+
+            return result;
+        }
+
+        protected virtual byte[] ProcessRequest(
+            string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        {
+            return null;
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/Servers/HttpServer/BinaryStreamHandler.cs b/OpenSim/Framework/Servers/HttpServer/BinaryStreamHandler.cs
index b94bfb4..1b03f54 100644
--- a/OpenSim/Framework/Servers/HttpServer/BinaryStreamHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BinaryStreamHandler.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             m_method = binaryMethod;
         }
 
-        public override byte[] Handle(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        protected override byte[] ProcessRequest(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             byte[] data = ReadFully(request);
             string param = GetParam(path);
diff --git a/OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs b/OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs
index cb5cce5..b8541cb 100644
--- a/OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs
@@ -32,7 +32,6 @@ namespace OpenSim.Framework.Servers.HttpServer
 {
     public interface IRequestHandler
     {
-
         /// <summary>
         /// Name for this handler.
         /// </summary>
@@ -59,6 +58,19 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         // Return path
         string Path { get; }
+
+        /// <summary>
+        /// Number of requests received by this handler
+        /// </summary>
+        int RequestsReceived { get; }
+
+        /// <summary>
+        /// Number of requests handled.
+        /// </summary>
+        /// <remarks>
+        /// Should be equal to RequestsReceived unless requested are being handled slowly or there is deadlock.
+        /// </remarks>
+        int RequestsHandled { get; }
     }
 
     public interface IStreamedRequestHandler : IRequestHandler
@@ -69,7 +81,6 @@ namespace OpenSim.Framework.Servers.HttpServer
 
     public interface IStreamHandler : IRequestHandler
     {
-        // Handle request stream, return byte array
         void Handle(string path, Stream request, Stream response, IOSHttpRequest httpReqbuest, IOSHttpResponse httpResponse);
     }
     
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
index c19ac32..3fd3bf7 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
@@ -50,25 +50,39 @@ namespace OpenSim.Framework.Servers.HttpServer
 
         public enum EventType : int
         {
-            Normal = 0,
+            LongPoll = 0,
             LslHttp = 1,
             Inventory = 2,
             Texture = 3, 
             Mesh = 4
         }
 
+        public string Url { get; set; }
+
+        /// <summary>
+        /// Number of requests received for this poll service.
+        /// </summary>
+        public int RequestsReceived { get; set; }
+
+        /// <summary>
+        /// Number of requests handled by this poll service.
+        /// </summary>
+        public int RequestsHandled { get; set; }
+
         public PollServiceEventArgs(
             RequestMethod pRequest,
+            string pUrl,
             HasEventsMethod pHasEvents, GetEventsMethod pGetEvents, NoEventsMethod pNoEvents,
             UUID pId, int pTimeOutms)
         {
             Request = pRequest;
+            Url = pUrl;
             HasEvents = pHasEvents;
             GetEvents = pGetEvents;
             NoEvents = pNoEvents;
             Id = pId;
             TimeOutms = pTimeOutms;
-            Type = EventType.Normal;
+            Type = EventType.LongPoll;
         }
     }
 }
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
index 723530a..6aa9479 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
@@ -26,13 +26,19 @@
  */
 
 using System;
+using System.Collections;
+using System.Reflection;
+using System.Text;
 using HttpServer;
+using log4net;
 using OpenMetaverse;
 
 namespace OpenSim.Framework.Servers.HttpServer
 {
     public class PollServiceHttpRequest
     {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         public readonly PollServiceEventArgs PollServiceArgs;
         public readonly IHttpClientContext HttpContext;
         public readonly IHttpRequest Request;
@@ -48,5 +54,44 @@ namespace OpenSim.Framework.Servers.HttpServer
             RequestTime = System.Environment.TickCount;
             RequestID = UUID.Random();
         }
+
+        internal void DoHTTPGruntWork(BaseHttpServer server, Hashtable responsedata)
+        {
+            OSHttpResponse response
+                = new OSHttpResponse(new HttpResponse(HttpContext, Request), 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));
+                }
+
+                PollServiceArgs.RequestsHandled++;
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index 5406f00..44f7045 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -64,14 +64,17 @@ namespace OpenSim.Framework.Servers.HttpServer
             m_server = pSrv;
             m_WorkerThreadCount = pWorkerThreadCount;
             m_workerThreads = new Thread[m_WorkerThreadCount];
+        }
 
+        public void Start()
+        {
             //startup worker threads
             for (uint i = 0; i < m_WorkerThreadCount; i++)
             {
                 m_workerThreads[i]
                     = Watchdog.StartThread(
                         PoolWorkerJob,
-                        String.Format("PollServiceWorkerThread{0}", i),
+                        string.Format("PollServiceWorkerThread{0}:{1}", i, m_server.Port),
                         ThreadPriority.Normal,
                         false,
                         false,
@@ -81,7 +84,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
             m_retrysThread = Watchdog.StartThread(
                 this.CheckRetries,
-                "PollServiceWatcherThread",
+                string.Format("PollServiceWatcherThread:{0}", m_server.Port),
                 ThreadPriority.Normal,
                 false,
                 true,
@@ -89,7 +92,6 @@ namespace OpenSim.Framework.Servers.HttpServer
                 1000 * 60 * 10);
         }
 
-
         private void ReQueueEvent(PollServiceHttpRequest req)
         {
             if (m_running)
@@ -103,7 +105,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         {
             if (m_running)
             {
-                if (req.PollServiceArgs.Type != PollServiceEventArgs.EventType.Normal)
+                if (req.PollServiceArgs.Type != PollServiceEventArgs.EventType.LongPoll)
                 {
                     m_requests.Enqueue(req);
                 }
@@ -140,13 +142,13 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
         }
 
-        ~PollServiceRequestManager()
+        public void Stop()
         {
             m_running = false;
             Thread.Sleep(1000); // let the world move
 
             foreach (Thread t in m_workerThreads)
-                    Watchdog.AbortThread(t.ManagedThreadId);
+                Watchdog.AbortThread(t.ManagedThreadId);
 
             try
             {
@@ -205,7 +207,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                             if (responsedata == null)
                                 continue;
 
-                            if (req.PollServiceArgs.Type == PollServiceEventArgs.EventType.Normal) // This is the event queue
+                            if (req.PollServiceArgs.Type == PollServiceEventArgs.EventType.LongPoll) // This is the event queue
                             {
                                 try
                                 {
diff --git a/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs b/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs
index 07082a8..bd55657 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs
@@ -33,7 +33,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 {
     public delegate TResponse RestDeserialiseMethod<TRequest, TResponse>(TRequest request);
 
-    public class RestDeserialiseHandler<TRequest, TResponse> : BaseRequestHandler, IStreamHandler
+    public class RestDeserialiseHandler<TRequest, TResponse> : BaseOutputStreamHandler, IStreamHandler
         where TRequest : new()
     {
         private RestDeserialiseMethod<TRequest, TResponse> m_method;
@@ -48,7 +48,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             m_method = method;
         }
 
-        public void Handle(string path, Stream request, Stream responseStream,
+        protected override void ProcessRequest(string path, Stream request, Stream responseStream,
                            IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             TRequest deserial;
diff --git a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
index edcd134..83c9848 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
@@ -183,7 +183,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
     public delegate bool CheckIdentityMethod(string sid, string aid);
 
-    public class RestDeserialiseSecureHandler<TRequest, TResponse> : BaseRequestHandler, IStreamHandler
+    public class RestDeserialiseSecureHandler<TRequest, TResponse> : BaseOutputStreamHandler, IStreamHandler
         where TRequest : new()
     {
         private static readonly ILog m_log
@@ -201,7 +201,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             m_method = method;
         }
 
-        public void Handle(string path, Stream request, Stream responseStream,
+        protected override void ProcessRequest(string path, Stream request, Stream responseStream,
                            IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             RestSessionObject<TRequest> deserial = default(RestSessionObject<TRequest>);
@@ -237,7 +237,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 
     public delegate bool CheckTrustedSourceMethod(IPEndPoint peer);
 
-    public class RestDeserialiseTrustedHandler<TRequest, TResponse> : BaseRequestHandler, IStreamHandler
+    public class RestDeserialiseTrustedHandler<TRequest, TResponse> : BaseOutputStreamHandler, IStreamHandler
         where TRequest : new()
     {
         private static readonly ILog m_log
@@ -260,7 +260,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             m_method = method;
         }
 
-        public void Handle(string path, Stream request, Stream responseStream,
+        protected override void ProcessRequest(string path, Stream request, Stream responseStream,
                            IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             TRequest deserial = default(TRequest);
@@ -292,6 +292,5 @@ namespace OpenSim.Framework.Servers.HttpServer
                 serializer.Serialize(xmlWriter, response);
             }
         }
-    }
-
-}
+    }   
+}
\ No newline at end of file
diff --git a/OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs b/OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs
index 1f17fee..0305dee 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Framework.Servers.HttpServer
             m_restMethod = restMethod;
         }
 
-        public override byte[] Handle(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        protected override byte[] ProcessRequest(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             Encoding encoding = Encoding.UTF8;
             StreamReader streamReader = new StreamReader(request, encoding);
diff --git a/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs b/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs
index ee96b47..de89e2e 100644
--- a/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Framework.Servers.HttpServer
         /// <summary>
         /// This is a regular HTTP Request...    This may be removed in the future.   
         /// </summary>
-        public event RegularHttpRequestDelegate OnRegularHttpRequest;
+//        public event RegularHttpRequestDelegate OnRegularHttpRequest;
 
         /// <summary>
         /// When the upgrade from a HTTP request to a Websocket is completed, this will be fired
@@ -304,15 +304,14 @@ namespace OpenSim.Framework.Servers.HttpServer
                 if (d != null)
                     d(this, new UpgradeCompletedEventArgs());
             }
-            catch (IOException fail)
+            catch (IOException)
             {
                 Close(string.Empty);
             }
-            catch (ObjectDisposedException fail)
+            catch (ObjectDisposedException)
             {
                 Close(string.Empty);
-            }
-            
+            }           
         }
 
         /// <summary>
@@ -414,8 +413,6 @@ namespace OpenSim.Framework.Servers.HttpServer
                                 _socketState.Header = pheader;
                             }
 
-
-
                             if (_socketState.FrameComplete)
                             {
                                 ProcessFrame(_socketState);
@@ -424,7 +421,6 @@ namespace OpenSim.Framework.Servers.HttpServer
                                 _socketState.ExpectedBytes = 0;
 
                             }
-
                         }
                     }
                     else
@@ -457,8 +453,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                             _socketState.ReceivedBytes.Clear();
                             _socketState.ExpectedBytes = 0;
                             // do some processing
-                        }
-
+                        }                       
                     }
                 }
                 if (offset > 0)
@@ -477,13 +472,12 @@ namespace OpenSim.Framework.Servers.HttpServer
                 {
                     // We can't read the stream anymore...  
                 }
-
             }
-            catch (IOException fail)
+            catch (IOException)
             {
                 Close(string.Empty);
             }
-            catch (ObjectDisposedException fail)
+            catch (ObjectDisposedException)
             {
                 Close(string.Empty);
             }
diff --git a/OpenSim/Framework/Servers/MainServer.cs b/OpenSim/Framework/Servers/MainServer.cs
index cfd34bb..57931d4 100644
--- a/OpenSim/Framework/Servers/MainServer.cs
+++ b/OpenSim/Framework/Servers/MainServer.cs
@@ -121,12 +121,14 @@ namespace OpenSim.Framework.Servers
                     + "  level >= 2 then long warnings are logged when receiving bad input data.\n"
                     + "  level >= 3 then short notices about all incoming non-poll HTTP requests are logged.\n"
                     + "  level >= 4 then the time taken to fulfill the request is logged.\n"
-                    + "  level >= 5 then a sample from the beginning of the incoming data is logged.\n"
-                    + "  level >= 6 then the entire incoming data is logged.\n"
+                    + "  level >= 5 then a sample from the beginning of the data is logged.\n"
+                    + "  level >= 6 then the entire data is logged.\n"
                     + "  no level is specified then the current level is returned.\n\n"
                     + "If out or all and\n"
                     + "  level >= 3 then short notices about all outgoing requests going through WebUtil are logged.\n"
-                    + "  level >= 4 then the time taken to fulfill the request is logged.\n",
+                    + "  level >= 4 then the time taken to fulfill the request is logged.\n"
+                    + "  level >= 5 then a sample from the beginning of the data is logged.\n"
+                    + "  level >= 6 then the entire data is logged.\n",
                 HandleDebugHttpCommand);
         }
 
@@ -283,7 +285,12 @@ namespace OpenSim.Framework.Servers
         public static bool RemoveHttpServer(uint port)
         {
             lock (m_Servers)
+            {
+                if (instance != null && instance.Port == port)
+                    instance = null;
+
                 return m_Servers.Remove(port);
+            }
         }
 
         /// <summary>
diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs
index 1ff8aca..7108314 100644
--- a/OpenSim/Framework/Servers/ServerBase.cs
+++ b/OpenSim/Framework/Servers/ServerBase.cs
@@ -62,6 +62,8 @@ namespace OpenSim.Framework.Servers
 
         protected string m_pidFile = String.Empty;
 
+        protected ServerStatsCollector m_serverStatsCollector;
+
         /// <summary>
         /// Server version information.  Usually VersionInfo + information about git commit, operating system, etc.
         /// </summary>
@@ -76,6 +78,11 @@ namespace OpenSim.Framework.Servers
 
         protected void CreatePIDFile(string path)
         {
+            if (File.Exists(path))
+                m_log.ErrorFormat(
+                    "[SERVER BASE]: Previous pid file {0} still exists on startup.  Possibly previously unclean shutdown.", 
+                    path);
+
             try
             {
                 string pidstring = System.Diagnostics.Process.GetCurrentProcess().Id.ToString();
@@ -239,7 +246,7 @@ namespace OpenSim.Framework.Servers
                 "Show thread status", HandleShow);
 
             m_console.Commands.AddCommand(
-                "General", false, "threads abort",
+                "Debug", false, "threads abort",
                 "threads abort <thread-id>",
                 "Abort a managed thread.  Use \"show threads\" to find possible threads.", HandleThreadsAbort);
 
@@ -249,11 +256,180 @@ namespace OpenSim.Framework.Servers
                 "Show thread status.  Synonym for \"show threads\"",
                 (string module, string[] args) => Notice(GetThreadsReport()));
 
+            m_console.Commands.AddCommand (
+                "Debug", false, "debug comms set",
+                "debug comms set serialosdreq true|false",
+                "Set comms parameters.  For debug purposes.",
+                HandleDebugCommsSet);
+
+            m_console.Commands.AddCommand (
+                "Debug", false, "debug comms status",
+                "debug comms status",
+                "Show current debug comms parameters.",
+                HandleDebugCommsStatus);
+
+            m_console.Commands.AddCommand (
+                "Debug", false, "debug threadpool set",
+                "debug threadpool set worker|iocp min|max <n>",
+                "Set threadpool parameters.  For debug purposes.",
+                HandleDebugThreadpoolSet);
+
+            m_console.Commands.AddCommand (
+                "Debug", false, "debug threadpool status",
+                "debug threadpool status",
+                "Show current debug threadpool parameters.",
+                HandleDebugThreadpoolStatus);
+
             m_console.Commands.AddCommand(
-                "General", false, "force gc",
+                "Debug", false, "force gc",
                 "force gc",
                 "Manually invoke runtime garbage collection.  For debugging purposes",
                 HandleForceGc);
+
+            m_console.Commands.AddCommand(
+                "General", false, "quit",
+                "quit",
+                "Quit the application", (mod, args) => Shutdown());
+
+            m_console.Commands.AddCommand(
+                "General", false, "shutdown",
+                "shutdown",
+                "Quit the application", (mod, args) => Shutdown());
+
+            ChecksManager.RegisterConsoleCommands(m_console);
+            StatsManager.RegisterConsoleCommands(m_console);
+        }
+
+        public void RegisterCommonComponents(IConfigSource configSource)
+        {
+            IConfig networkConfig = configSource.Configs["Network"];
+
+            if (networkConfig != null)
+            {
+                WebUtil.SerializeOSDRequestsPerEndpoint = networkConfig.GetBoolean("SerializeOSDRequests", false);
+            }
+    
+            m_serverStatsCollector = new ServerStatsCollector();
+            m_serverStatsCollector.Initialise(configSource);
+            m_serverStatsCollector.Start();
+        }
+
+        private void HandleDebugCommsStatus(string module, string[] args)
+        {
+            Notice("serialosdreq is {0}", WebUtil.SerializeOSDRequestsPerEndpoint);
+        }
+
+        private void HandleDebugCommsSet(string module, string[] args)
+        {
+            if (args.Length != 5)
+            {
+                Notice("Usage: debug comms set serialosdreq true|false");
+                return;
+            }
+
+            if (args[3] != "serialosdreq")
+            {
+                Notice("Usage: debug comms set serialosdreq true|false");
+                return;
+            }
+
+            bool setSerializeOsdRequests;
+
+            if (!ConsoleUtil.TryParseConsoleBool(m_console, args[4], out setSerializeOsdRequests))
+                return;
+
+            WebUtil.SerializeOSDRequestsPerEndpoint = setSerializeOsdRequests;
+
+            Notice("serialosdreq is now {0}", setSerializeOsdRequests);
+        }
+
+        private void HandleDebugThreadpoolStatus(string module, string[] args)
+        {
+            int workerThreads, iocpThreads;
+
+            ThreadPool.GetMinThreads(out workerThreads, out iocpThreads);
+            Notice("Min worker threads:       {0}", workerThreads);
+            Notice("Min IOCP threads:         {0}", iocpThreads);
+
+            ThreadPool.GetMaxThreads(out workerThreads, out iocpThreads);
+            Notice("Max worker threads:       {0}", workerThreads);
+            Notice("Max IOCP threads:         {0}", iocpThreads);
+
+            ThreadPool.GetAvailableThreads(out workerThreads, out iocpThreads);
+            Notice("Available worker threads: {0}", workerThreads);
+            Notice("Available IOCP threads:   {0}", iocpThreads);           
+        }
+
+        private void HandleDebugThreadpoolSet(string module, string[] args)
+        {
+            if (args.Length != 6)
+            {
+                Notice("Usage: debug threadpool set worker|iocp min|max <n>");
+                return;
+            }
+
+            int newThreads;
+
+            if (!ConsoleUtil.TryParseConsoleInt(m_console, args[5], out newThreads))
+                return;
+
+            string poolType = args[3];
+            string bound = args[4];
+
+            bool fail = false;
+            int workerThreads, iocpThreads;
+
+            if (poolType == "worker")
+            {
+                if (bound == "min")
+                {
+                    ThreadPool.GetMinThreads(out workerThreads, out iocpThreads);
+
+                    if (!ThreadPool.SetMinThreads(newThreads, iocpThreads))
+                        fail = true;
+                }
+                else
+                {
+                    ThreadPool.GetMaxThreads(out workerThreads, out iocpThreads);
+
+                    if (!ThreadPool.SetMaxThreads(newThreads, iocpThreads))
+                        fail = true;
+                }
+            }
+            else
+            {
+                if (bound == "min")
+                {
+                    ThreadPool.GetMinThreads(out workerThreads, out iocpThreads);
+
+                    if (!ThreadPool.SetMinThreads(workerThreads, newThreads))
+                        fail = true;
+                }
+                else
+                {
+                    ThreadPool.GetMaxThreads(out workerThreads, out iocpThreads);
+
+                    if (!ThreadPool.SetMaxThreads(workerThreads, newThreads))
+                        fail = true;
+                }
+            }
+             
+            if (fail)
+            {
+                Notice("ERROR: Could not set {0} {1} threads to {2}", poolType, bound, newThreads);
+            }
+            else
+            {
+                int minWorkerThreads, maxWorkerThreads, minIocpThreads, maxIocpThreads;
+
+                ThreadPool.GetMinThreads(out minWorkerThreads, out minIocpThreads);
+                ThreadPool.GetMaxThreads(out maxWorkerThreads, out maxIocpThreads);
+
+                Notice("Min worker threads now {0}", minWorkerThreads);
+                Notice("Min IOCP threads now {0}", minIocpThreads);
+                Notice("Max worker threads now {0}", maxWorkerThreads);
+                Notice("Max IOCP threads now {0}", maxIocpThreads);
+            }
         }
 
         private void HandleForceGc(string module, string[] args)
@@ -641,7 +817,68 @@ namespace OpenSim.Framework.Servers
                 sb.AppendFormat("Total threads active: {0}\n\n", totalThreads);
 
             sb.Append("Main threadpool (excluding script engine pools)\n");
-            sb.Append(Util.GetThreadPoolReport());
+            sb.Append(GetThreadPoolReport());
+
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Get a thread pool report.
+        /// </summary>
+        /// <returns></returns>
+        public static string GetThreadPoolReport()
+        {
+            string threadPoolUsed = null;
+            int maxThreads = 0;
+            int minThreads = 0;
+            int allocatedThreads = 0;
+            int inUseThreads = 0;
+            int waitingCallbacks = 0;
+            int completionPortThreads = 0;
+
+            StringBuilder sb = new StringBuilder();
+            if (Util.FireAndForgetMethod == FireAndForgetMethod.SmartThreadPool)
+            {
+                STPInfo stpi = Util.GetSmartThreadPoolInfo();
+
+                // ROBUST currently leaves this the FireAndForgetMethod but never actually initializes the threadpool.
+                if (stpi != null)
+                {
+                    threadPoolUsed = "SmartThreadPool";
+                    maxThreads = stpi.MaxThreads;
+                    minThreads = stpi.MinThreads;
+                    inUseThreads = stpi.InUseThreads;
+                    allocatedThreads = stpi.ActiveThreads;
+                    waitingCallbacks = stpi.WaitingCallbacks;
+                }
+            }
+            else if (
+                Util.FireAndForgetMethod == FireAndForgetMethod.QueueUserWorkItem
+                    || Util.FireAndForgetMethod == FireAndForgetMethod.UnsafeQueueUserWorkItem)
+            {
+                threadPoolUsed = "BuiltInThreadPool";
+                ThreadPool.GetMaxThreads(out maxThreads, out completionPortThreads);
+                ThreadPool.GetMinThreads(out minThreads, out completionPortThreads);
+                int availableThreads;
+                ThreadPool.GetAvailableThreads(out availableThreads, out completionPortThreads);
+                inUseThreads = maxThreads - availableThreads;
+                allocatedThreads = -1;
+                waitingCallbacks = -1;
+            }
+
+            if (threadPoolUsed != null)
+            {
+                sb.AppendFormat("Thread pool used           : {0}\n", threadPoolUsed);
+                sb.AppendFormat("Max threads                : {0}\n", maxThreads);
+                sb.AppendFormat("Min threads                : {0}\n", minThreads);
+                sb.AppendFormat("Allocated threads          : {0}\n", allocatedThreads < 0 ? "not applicable" : allocatedThreads.ToString());
+                sb.AppendFormat("In use threads             : {0}\n", inUseThreads);
+                sb.AppendFormat("Work items waiting         : {0}\n", waitingCallbacks < 0 ? "not available" : waitingCallbacks.ToString());
+            }
+            else
+            {
+                sb.AppendFormat("Thread pool not used\n");
+            }
 
             return sb.ToString();
         }
@@ -693,5 +930,16 @@ namespace OpenSim.Framework.Servers
             if (m_console != null)
                 m_console.OutputFormat(format, components);
         }
+
+        public virtual void Shutdown()
+        {
+            m_serverStatsCollector.Close();
+            ShutdownSpecific();
+        }
+
+        /// <summary>
+        /// Should be overriden and referenced by descendents if they need to perform extra shutdown processing
+        /// </summary>
+        protected virtual void ShutdownSpecific() {}
     }
 }
diff --git a/OpenSim/Framework/Tests/LocationTest.cs b/OpenSim/Framework/Tests/LocationTest.cs
index a56ecb4..3d5d1d2 100644
--- a/OpenSim/Framework/Tests/LocationTest.cs
+++ b/OpenSim/Framework/Tests/LocationTest.cs
@@ -51,21 +51,28 @@ namespace OpenSim.Framework.Tests
         [Test]
         public void locationXYRegionHandle()
         {
-            Location TestLocation1 = new Location(256000,256000);
-            Location TestLocation2 = new Location(1099511628032000);
+            Location TestLocation1 = new Location(255000,256000);
+            Location TestLocation2 = new Location(1095216660736000);
             Assert.That(TestLocation1 == TestLocation2);
 
-            Assert.That(TestLocation2.X == 256000 && TestLocation2.Y == 256000, "Test xy location doesn't match regionhandle provided");
+            Assert.That(TestLocation1.X == 255000 && TestLocation1.Y == 256000, "Test xy location doesn't match position in the constructor");
+            Assert.That(TestLocation2.X == 255000 && TestLocation2.Y == 256000, "Test xy location doesn't match regionhandle provided");
 
-            Assert.That(TestLocation2.RegionHandle == 1099511628032000,
+            Assert.That(TestLocation2.RegionHandle == 1095216660736000,
                         "Location RegionHandle Property didn't match regionhandle provided in constructor");
 
+            ulong RegionHandle = TestLocation1.RegionHandle;
+            Assert.That(RegionHandle.Equals(1095216660736000), "Equals(regionhandle) failed to match the position in the constructor");
 
-            TestLocation1 = new Location(256001, 256001);
-            TestLocation2 = new Location(1099511628032000);
+            TestLocation2 = new Location(RegionHandle);
+            Assert.That(TestLocation2.Equals(255000, 256000), "Decoded regionhandle failed to match the original position in the constructor");
+
+
+            TestLocation1 = new Location(255001, 256001);
+            TestLocation2 = new Location(1095216660736000);
             Assert.That(TestLocation1 != TestLocation2);
 
-            Assert.That(TestLocation1.Equals(256001, 256001), "Equals(x,y) failed to match the position in the constructor");
+            Assert.That(TestLocation1.Equals(255001, 256001), "Equals(x,y) failed to match the position in the constructor");
 
             Assert.That(TestLocation2.GetHashCode() == (TestLocation2.X.GetHashCode() ^ TestLocation2.Y.GetHashCode()), "GetHashCode failed to produce the expected hashcode");
 
diff --git a/OpenSim/Framework/Tests/MundaneFrameworkTests.cs b/OpenSim/Framework/Tests/MundaneFrameworkTests.cs
index 0fbdaf3..08f2af5 100644
--- a/OpenSim/Framework/Tests/MundaneFrameworkTests.cs
+++ b/OpenSim/Framework/Tests/MundaneFrameworkTests.cs
@@ -100,7 +100,7 @@ namespace OpenSim.Framework.Tests
             cadu.AVHeight = Size1.Z;
 
             AgentPosition position2 = new AgentPosition();
-            position2.CopyFrom(cadu);
+            position2.CopyFrom(cadu, position1.SessionID);
 
             Assert.IsTrue(
                 position2.AgentID == position1.AgentID
diff --git a/OpenSim/Framework/Tests/UtilTest.cs b/OpenSim/Framework/Tests/UtilTest.cs
index 11ca068..3b7f252 100644
--- a/OpenSim/Framework/Tests/UtilTest.cs
+++ b/OpenSim/Framework/Tests/UtilTest.cs
@@ -282,5 +282,87 @@ namespace OpenSim.Framework.Tests
                     String.Format("Incorrect InventoryType mapped from Content-Type {0}", invcontenttypes[i]));
             }
         }
+
+        [Test]
+        public void FakeParcelIDTests()
+        {
+            byte[] hexBytes8 = { 0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10 };
+            byte[] hexBytes16 = {
+                        0xf0, 0xe1, 0xd2, 0xc3, 0xb4, 0xa5, 0x96, 0x87,
+                        0x77, 0x69, 0x5a, 0x4b, 0x3c, 0x2d, 0x1e, 0x0f };
+            UInt64 var64Bit = (UInt64)0xfedcba9876543210;
+
+            //Region handle is for location 255000,256000.
+            ulong regionHandle1 = 1095216660736000;
+            uint  x1 = 100;
+            uint  y1 = 200;
+            uint  z1 = 22;
+            ulong regionHandle2;
+            uint  x2, y2, z2;
+            UUID fakeParcelID1, fakeParcelID2, uuid;
+
+            ulong bigInt64 = Util.BytesToUInt64Big(hexBytes8);
+            Assert.AreEqual(var64Bit, bigInt64,
+                    "BytesToUint64Bit conversion of 8 bytes to UInt64 failed.");
+
+            //Test building and decoding using some typical input values
+            fakeParcelID1 = Util.BuildFakeParcelID(regionHandle1, x1, y1);
+            Util.ParseFakeParcelID(fakeParcelID1, out regionHandle2, out x2, out y2);
+            Assert.AreEqual(regionHandle1, regionHandle2,
+                    "region handle decoded from FakeParcelID wth X/Y failed.");
+            Assert.AreEqual(x1, x2,
+                    "X coordinate decoded from FakeParcelID wth X/Y failed.");
+            Assert.AreEqual(y1, y2,
+                    "Y coordinate decoded from FakeParcelID wth X/Y failed.");
+
+            fakeParcelID1 = Util.BuildFakeParcelID(regionHandle1, x1, y1, z1);
+            Util.ParseFakeParcelID(fakeParcelID1, out regionHandle2, out x2, out y2, out z2);
+            Assert.AreEqual(regionHandle1, regionHandle2,
+                    "region handle decoded from FakeParcelID with X/Y/Z failed.");
+            Assert.AreEqual(x1, x2,
+                    "X coordinate decoded from FakeParcelID with X/Y/Z failed.");
+            Assert.AreEqual(y1, y2,
+                    "Y coordinate decoded from FakeParcelID with X/Y/Z failed.");
+            Assert.AreEqual(z1, z2,
+                    "Z coordinate decoded from FakeParcelID with X/Y/Z failed.");
+
+            //Do some more extreme tests to check the encoding and decoding
+            x1 = 0x55aa;
+            y1 = 0x9966;
+            z1 = 0x5a96;
+
+            fakeParcelID1 = Util.BuildFakeParcelID(var64Bit, x1, y1);
+            Util.ParseFakeParcelID(fakeParcelID1, out regionHandle2, out x2, out y2);
+            Assert.AreEqual(var64Bit, regionHandle2,
+                    "region handle decoded from FakeParcelID with X/Y/Z failed.");
+            Assert.AreEqual(x1, x2,
+                    "X coordinate decoded from FakeParcelID with X/Y/Z failed.");
+            Assert.AreEqual(y1, y2,
+                    "Y coordinate decoded from FakeParcelID with X/Y/Z failed.");
+
+            fakeParcelID1 = Util.BuildFakeParcelID(var64Bit, x1, y1, z1);
+            Util.ParseFakeParcelID(fakeParcelID1, out regionHandle2, out x2, out y2, out z2);
+            Assert.AreEqual(var64Bit, regionHandle2,
+                    "region handle decoded from FakeParcelID with X/Y/Z failed.");
+            Assert.AreEqual(x1, x2,
+                    "X coordinate decoded from FakeParcelID with X/Y/Z failed.");
+            Assert.AreEqual(y1, y2,
+                    "Y coordinate decoded from FakeParcelID with X/Y/Z failed.");
+            Assert.AreEqual(z1, z2,
+                    "Z coordinate decoded from FakeParcelID with X/Y/Z failed.");
+
+
+            x1 = 64;
+            y1 = 192;
+            fakeParcelID1 = Util.BuildFakeParcelID(regionHandle1, x1, y1);
+            Util.FakeParcelIDToGlobalPosition(fakeParcelID1, out x2, out y2);
+            Assert.AreEqual(255000+x1, x2,
+                    "Global X coordinate decoded from regionHandle failed.");
+            Assert.AreEqual(256000+y1, y2,
+                    "Global Y coordinate decoded from regionHandle failed.");
+
+            uuid = new UUID("00dd0700-00d1-0700-3800-000032000000");
+            Util.FakeParcelIDToGlobalPosition(uuid, out x2, out y2);
+        }
     }
 }
diff --git a/OpenSim/Framework/UserProfiles.cs b/OpenSim/Framework/UserProfiles.cs
new file mode 100644
index 0000000..6133591
--- /dev/null
+++ b/OpenSim/Framework/UserProfiles.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 OpenMetaverse;
+
+namespace OpenSim.Framework
+{
+    public class UserClassifiedAdd
+    {
+        public UUID ClassifiedId = UUID.Zero;
+        public UUID CreatorId = UUID.Zero;
+        public int CreationDate = 0;
+        public int ExpirationDate = 0;
+        public int Category = 0;
+        public string Name = string.Empty;
+        public string Description = string.Empty;
+        public UUID ParcelId = UUID.Zero;
+        public int ParentEstate = 0;
+        public UUID SnapshotId = UUID.Zero;
+        public string SimName = string.Empty;
+        public string GlobalPos = "<0,0,0>";
+        public string ParcelName = string.Empty;
+        public byte Flags = 0;
+        public int Price = 0;
+    }
+    
+    public class UserProfileProperties
+    {
+        public UUID UserId = UUID.Zero;
+        public UUID PartnerId = UUID.Zero;
+        public bool PublishProfile = false;
+        public bool PublishMature = false;
+        public string WebUrl = string.Empty;
+        public int WantToMask = 0;
+        public string WantToText = string.Empty;
+        public int SkillsMask = 0;
+        public string SkillsText = string.Empty;
+        public string Language = string.Empty;
+        public UUID ImageId = UUID.Zero;
+        public string AboutText = string.Empty;
+        public UUID FirstLifeImageId = UUID.Zero;
+        public string FirstLifeText = string.Empty;
+    }
+    
+    public class UserProfilePick
+    {
+        public UUID PickId = UUID.Zero;
+        public UUID CreatorId = UUID.Zero;
+        public bool TopPick = false;
+        public string Name = string.Empty;
+        public string OriginalName = string.Empty;
+        public string Desc = string.Empty;
+        public UUID ParcelId = UUID.Zero;
+        public UUID SnapshotId = UUID.Zero;
+        public string User = string.Empty;
+        public string SimName = string.Empty;
+        public string GlobalPos = "<0,0,0>";
+        public int SortOrder = 0;
+        public bool Enabled = false;
+    }
+    
+    public class UserProfileNotes
+    {
+        public UUID UserId;
+        public UUID TargetId;
+        public string Notes;
+    }
+    
+    public class UserAccountProperties
+    {
+        public string EmailAddress = string.Empty;
+        public string Firstname = string.Empty;
+        public string LastName = string.Empty;
+        public string Password = string.Empty;
+        public string UserId = string.Empty;
+    }
+    
+    public class UserAccountAuth
+    {
+        public string UserId = UUID.Zero.ToString();
+        public string Password = string.Empty;
+    }
+    
+    public class UserAppData
+    {
+        public string TagId = string.Empty;
+        public string DataKey = string.Empty;
+        public string UserId = UUID.Zero.ToString();
+        public string DataVal = string.Empty;
+    }
+}
+
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 557f38e..7db575b 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -89,9 +89,30 @@ namespace OpenSim.Framework
     }
 
     /// <summary>
+    /// Class for delivering SmartThreadPool statistical information
+    /// </summary>
+    /// <remarks>
+    /// We do it this way so that we do not directly expose STP.
+    /// </remarks>
+    public class STPInfo
+    {
+        public string Name { get; set; }
+        public STPStartInfo STPStartInfo { get; set; }
+        public WIGStartInfo WIGStartInfo { get; set; }
+        public bool IsIdle { get; set; }
+        public bool IsShuttingDown { get; set; }       
+        public int MaxThreads { get; set; }
+        public int MinThreads { get; set; }
+        public int InUseThreads { get; set; }
+        public int ActiveThreads { get; set; }
+        public int WaitingCallbacks { get; set; }
+        public int MaxConcurrentWorkItems { get; set; }
+    }
+
+    /// <summary>
     /// Miscellaneous utility functions
     /// </summary>
-    public class Util
+    public static class Util
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -109,7 +130,7 @@ namespace OpenSim.Framework
         private static SmartThreadPool m_ThreadPool;
 
         // Unix-epoch starts at January 1st 1970, 00:00:00 UTC. And all our times in the server are (or at least should be) in UTC.
-        private static readonly DateTime unixEpoch =
+        public static readonly DateTime UnixEpoch =
             DateTime.ParseExact("1970-01-01 00:00:00 +0", "yyyy-MM-dd hh:mm:ss z", DateTimeFormatInfo.InvariantInfo).ToUniversalTime();
 
         private static readonly string rawUUIDPattern
@@ -120,6 +141,11 @@ namespace OpenSim.Framework
         public static FireAndForgetMethod DefaultFireAndForgetMethod = FireAndForgetMethod.SmartThreadPool;
         public static FireAndForgetMethod FireAndForgetMethod = DefaultFireAndForgetMethod;
 
+        public static bool IsPlatformMono
+        {
+            get { return Type.GetType("Mono.Runtime") != null; }
+        }
+
         /// <summary>
         /// Gets the name of the directory where the current running executable
         /// is located
@@ -495,20 +521,18 @@ namespace OpenSim.Framework
 
         public static int ToUnixTime(DateTime stamp)
         {
-            TimeSpan t = stamp.ToUniversalTime() - unixEpoch;
-            return (int) t.TotalSeconds;
+            TimeSpan t = stamp.ToUniversalTime() - UnixEpoch;
+            return (int)t.TotalSeconds;
         }
 
         public static DateTime ToDateTime(ulong seconds)
         {
-            DateTime epoch = unixEpoch;
-            return epoch.AddSeconds(seconds);
+            return UnixEpoch.AddSeconds(seconds);
         }
 
         public static DateTime ToDateTime(int seconds)
         {
-            DateTime epoch = unixEpoch;
-            return epoch.AddSeconds(seconds);
+            return UnixEpoch.AddSeconds(seconds);
         }
 
         /// <summary>
@@ -1233,7 +1257,7 @@ namespace OpenSim.Framework
             byte[] bytes =
             {
                 (byte)regionHandle, (byte)(regionHandle >> 8), (byte)(regionHandle >> 16), (byte)(regionHandle >> 24),
-                (byte)(regionHandle >> 32), (byte)(regionHandle >> 40), (byte)(regionHandle >> 48), (byte)(regionHandle << 56),
+                (byte)(regionHandle >> 32), (byte)(regionHandle >> 40), (byte)(regionHandle >> 48), (byte)(regionHandle >> 56),
                 (byte)x, (byte)(x >> 8), 0, 0,
                 (byte)y, (byte)(y >> 8), 0, 0 };
             return new UUID(bytes, 0);
@@ -1244,7 +1268,7 @@ namespace OpenSim.Framework
             byte[] bytes =
             {
                 (byte)regionHandle, (byte)(regionHandle >> 8), (byte)(regionHandle >> 16), (byte)(regionHandle >> 24),
-                (byte)(regionHandle >> 32), (byte)(regionHandle >> 40), (byte)(regionHandle >> 48), (byte)(regionHandle << 56),
+                (byte)(regionHandle >> 32), (byte)(regionHandle >> 40), (byte)(regionHandle >> 48), (byte)(regionHandle >> 56),
                 (byte)x, (byte)(x >> 8), (byte)z, (byte)(z >> 8),
                 (byte)y, (byte)(y >> 8), 0, 0 };
             return new UUID(bytes, 0);
@@ -1317,7 +1341,7 @@ namespace OpenSim.Framework
                     ru = "OSX/Mono";
                 else
                 {
-                    if (Type.GetType("Mono.Runtime") != null)
+                    if (IsPlatformMono)
                         ru = "Win/Mono";
                     else
                         ru = "Win/.NET";
@@ -1765,10 +1789,12 @@ namespace OpenSim.Framework
             FireAndForget(callback, null);
         }
 
-        public static void InitThreadPool(int maxThreads)
+        public static void InitThreadPool(int minThreads, int maxThreads)
         {
             if (maxThreads < 2)
                 throw new ArgumentOutOfRangeException("maxThreads", "maxThreads must be greater than 2");
+            if (minThreads > maxThreads || minThreads < 2)
+                throw new ArgumentOutOfRangeException("minThreads", "minThreads must be greater than 2 and less than or equal to maxThreads");
             if (m_ThreadPool != null)
                 throw new InvalidOperationException("SmartThreadPool is already initialized");
 
@@ -1776,7 +1802,7 @@ namespace OpenSim.Framework
             startInfo.ThreadPoolName = "Util";
             startInfo.IdleTimeout = 2000;
             startInfo.MaxWorkerThreads = maxThreads;
-            startInfo.MinWorkerThreads = 2;
+            startInfo.MinWorkerThreads = minThreads;
 
             m_ThreadPool = new SmartThreadPool(startInfo);
         }
@@ -1851,8 +1877,8 @@ namespace OpenSim.Framework
                     break;
                 case FireAndForgetMethod.SmartThreadPool:
                     if (m_ThreadPool == null)
-                        InitThreadPool(15); 
-                    m_ThreadPool.QueueWorkItem(SmartThreadPoolCallback, new object[] { realCallback, obj });
+                        InitThreadPool(2, 15); 
+                    m_ThreadPool.QueueWorkItem((cb, o) => cb(o), realCallback, obj);
                     break;
                 case FireAndForgetMethod.Thread:
                     Thread thread = new Thread(delegate(object o) { realCallback(o); });
@@ -1864,72 +1890,29 @@ namespace OpenSim.Framework
         }
 
         /// <summary>
-        /// Get a thread pool report.
+        /// Get information about the current state of the smart thread pool.
         /// </summary>
-        /// <returns></returns>
-        public static string GetThreadPoolReport()
+        /// <returns>
+        /// null if this isn't the pool being used for non-scriptengine threads.
+        /// </returns>
+        public static STPInfo GetSmartThreadPoolInfo()
         {
-            string threadPoolUsed = null;
-            int maxThreads = 0;
-            int minThreads = 0;
-            int allocatedThreads = 0;
-            int inUseThreads = 0;
-            int waitingCallbacks = 0;
-            int completionPortThreads = 0;
-
-            StringBuilder sb = new StringBuilder();
-            if (FireAndForgetMethod == FireAndForgetMethod.SmartThreadPool)
-            {
-                // ROBUST currently leaves this the FireAndForgetMethod but never actually initializes the threadpool.
-                if (m_ThreadPool != null)
-                {
-                    threadPoolUsed = "SmartThreadPool";
-                    maxThreads = m_ThreadPool.MaxThreads;
-                    minThreads = m_ThreadPool.MinThreads;
-                    inUseThreads = m_ThreadPool.InUseThreads;
-                    allocatedThreads = m_ThreadPool.ActiveThreads;
-                    waitingCallbacks = m_ThreadPool.WaitingCallbacks;
-                }
-            }
-            else if (
-                FireAndForgetMethod == FireAndForgetMethod.UnsafeQueueUserWorkItem
-                    || FireAndForgetMethod == FireAndForgetMethod.UnsafeQueueUserWorkItem)
-            {
-                threadPoolUsed = "BuiltInThreadPool";
-                ThreadPool.GetMaxThreads(out maxThreads, out completionPortThreads);
-                ThreadPool.GetMinThreads(out minThreads, out completionPortThreads);
-                int availableThreads;
-                ThreadPool.GetAvailableThreads(out availableThreads, out completionPortThreads);
-                inUseThreads = maxThreads - availableThreads;
-                allocatedThreads = -1;
-                waitingCallbacks = -1;
-            }
-
-            if (threadPoolUsed != null)
-            {
-                sb.AppendFormat("Thread pool used           : {0}\n", threadPoolUsed);
-                sb.AppendFormat("Max threads                : {0}\n", maxThreads);
-                sb.AppendFormat("Min threads                : {0}\n", minThreads);
-                sb.AppendFormat("Allocated threads          : {0}\n", allocatedThreads < 0 ? "not applicable" : allocatedThreads.ToString());
-                sb.AppendFormat("In use threads             : {0}\n", inUseThreads);
-                sb.AppendFormat("Work items waiting         : {0}\n", waitingCallbacks < 0 ? "not available" : waitingCallbacks.ToString());
-            }
-            else
-            {
-                sb.AppendFormat("Thread pool not used\n");
-            }
-
-            return sb.ToString();
-        }
+            if (m_ThreadPool == null)
+                return null;
 
-        private static object SmartThreadPoolCallback(object o)
-        {
-            object[] array = (object[])o;
-            WaitCallback callback = (WaitCallback)array[0];
-            object obj = array[1];
+            STPInfo stpi = new STPInfo();
+            stpi.Name = m_ThreadPool.Name;
+            stpi.STPStartInfo = m_ThreadPool.STPStartInfo;
+            stpi.IsIdle = m_ThreadPool.IsIdle;
+            stpi.IsShuttingDown = m_ThreadPool.IsShuttingdown;
+            stpi.MaxThreads = m_ThreadPool.MaxThreads;
+            stpi.MinThreads = m_ThreadPool.MinThreads;
+            stpi.InUseThreads = m_ThreadPool.InUseThreads;
+            stpi.ActiveThreads = m_ThreadPool.ActiveThreads;
+            stpi.WaitingCallbacks = m_ThreadPool.WaitingCallbacks;
+            stpi.MaxConcurrentWorkItems = m_ThreadPool.Concurrency;
 
-            callback(obj);
-            return null;
+            return stpi;
         }
 
         #endregion FireAndForget Threading Pattern
@@ -2148,7 +2131,7 @@ namespace OpenSim.Framework
         /// <param name="secret">the secret part</param>
         public static bool ParseUniversalUserIdentifier(string value, out UUID uuid, out string url, out string firstname, out string lastname, out string secret)
         {
-            uuid = UUID.Zero; url = string.Empty; firstname = "Unknown"; lastname = "User"; secret = string.Empty;
+            uuid = UUID.Zero; url = string.Empty; firstname = "Unknown"; lastname = "UserUPUUI"; secret = string.Empty;
 
             string[] parts = value.Split(';');
             if (parts.Length >= 1)
@@ -2282,7 +2265,7 @@ namespace OpenSim.Framework
         {
             lock (m_syncRoot)
             {
-                m_lowQueue.Enqueue(data);
+                q.Enqueue(data);
                 m_s.WaitOne(0);
                 m_s.Release();
             }
@@ -2322,7 +2305,7 @@ namespace OpenSim.Framework
             {
                 if (m_highQueue.Count > 0)
                     res = m_highQueue.Dequeue();
-                else
+                else if (m_lowQueue.Count > 0)
                     res = m_lowQueue.Dequeue();
 
                 if (m_highQueue.Count == 0 && m_lowQueue.Count == 0)
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index bf57fd4..9fa93ea 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -67,6 +67,11 @@ namespace OpenSim.Framework
         public static int RequestNumber { get; internal set; }
 
         /// <summary>
+        /// Control where OSD requests should be serialized per endpoint.
+        /// </summary>
+        public static bool SerializeOSDRequestsPerEndpoint { get; set; }
+
+        /// <summary>
         /// this is the header field used to communicate the local request id
         /// used for performance and debugging
         /// </summary>
@@ -145,10 +150,50 @@ namespace OpenSim.Framework
         
         public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout, bool compressed)
         {
-            lock (EndPointLock(url))
+            if (SerializeOSDRequestsPerEndpoint)
+            {
+                lock (EndPointLock(url))
+                {
+                    return ServiceOSDRequestWorker(url, data, method, timeout, compressed);
+                }
+            }
+            else
+            {
+                return ServiceOSDRequestWorker(url, data, method, timeout, compressed);
+            }
+        }
+
+        public static void LogOutgoingDetail(Stream outputStream)
+        {
+            using (StreamReader reader = new StreamReader(Util.Copy(outputStream), Encoding.UTF8))
+            {
+                string output;
+
+                if (DebugLevel == 5)
+                {
+                    const int sampleLength = 80;
+                    char[] sampleChars = new char[sampleLength];
+                    reader.Read(sampleChars, 0, sampleLength);
+                    output = new string(sampleChars);
+                }
+                else
+                {
+                    output = reader.ReadToEnd();
+                }
+
+                LogOutgoingDetail(output);
+            }
+        }
+
+        public static void LogOutgoingDetail(string output)
+        {
+            if (DebugLevel == 5)
             {
-                return ServiceOSDRequestWorker(url,data,method,timeout,compressed);
+                output = output.Substring(0, 80);
+                output = output + "...";
             }
+
+            m_log.DebugFormat("[WEB UTIL]: {0}", output.Replace("\n", @"\n"));
         }
 
         private static OSDMap ServiceOSDRequestWorker(string url, OSDMap data, string method, int timeout, bool compressed)
@@ -178,7 +223,11 @@ namespace OpenSim.Framework
                 // If there is some input, write it into the request
                 if (data != null)
                 {
-                    strBuffer =  OSDParser.SerializeJsonString(data);
+                    strBuffer = OSDParser.SerializeJsonString(data);
+
+                    if (DebugLevel >= 5)
+                        LogOutgoingDetail(strBuffer);
+
                     byte[] buffer = System.Text.Encoding.UTF8.GetBytes(strBuffer);
 
                     if (compressed)
@@ -358,6 +407,10 @@ namespace OpenSim.Framework
                 if (data != null)
                 {
                     queryString = BuildQueryString(data);
+
+                    if (DebugLevel >= 5)
+                        LogOutgoingDetail(queryString);
+
                     byte[] buffer = System.Text.Encoding.UTF8.GetBytes(queryString);
                     
                     request.ContentLength = buffer.Length;
@@ -769,6 +822,9 @@ namespace OpenSim.Framework
                 int length = (int)buffer.Length;
                 request.ContentLength = length;
 
+                if (WebUtil.DebugLevel >= 5)
+                    WebUtil.LogOutgoingDetail(buffer);
+
                 request.BeginGetRequestStream(delegate(IAsyncResult res)
                 {
                     Stream requestStream = request.EndGetRequestStream(res);
@@ -928,11 +984,12 @@ namespace OpenSim.Framework
         /// <param name="verb"></param>
         /// <param name="requestUrl"></param>
         /// <param name="obj"> </param>
+        /// <param name="timeoutsecs"> </param>
         /// <returns></returns>
         ///
         /// <exception cref="System.Net.WebException">Thrown if we encounter a network issue while posting
         /// the request.  You'll want to make sure you deal with this as they're not uncommon</exception>
-        public static string MakeRequest(string verb, string requestUrl, string obj)
+        public static string MakeRequest(string verb, string requestUrl, string obj, int timeoutsecs)
         {
             int reqnum = WebUtil.RequestNumber++;
 
@@ -946,6 +1003,8 @@ namespace OpenSim.Framework
 
             WebRequest request = WebRequest.Create(requestUrl);
             request.Method = verb;
+            if (timeoutsecs > 0)
+                request.Timeout = timeoutsecs * 1000;
             string respstring = String.Empty;
 
             int tickset = Util.EnvironmentTickCountSubtract(tickstart);
@@ -966,6 +1025,9 @@ namespace OpenSim.Framework
                     length = (int)obj.Length;
                     request.ContentLength = length;
 
+                    if (WebUtil.DebugLevel >= 5)
+                        WebUtil.LogOutgoingDetail(buffer);
+
                     Stream requestStream = null;
                     try
                     {
@@ -1039,6 +1101,11 @@ namespace OpenSim.Framework
 
             return respstring;
         }
+
+        public static string MakeRequest(string verb, string requestUrl, string obj)
+        {
+            return MakeRequest(verb, requestUrl, obj, -1);
+        }
     }
 
     public class SynchronousRestObjectRequester
@@ -1111,6 +1178,9 @@ namespace OpenSim.Framework
                 int length = (int)buffer.Length;
                 request.ContentLength = length;
 
+                if (WebUtil.DebugLevel >= 5)
+                    WebUtil.LogOutgoingDetail(buffer);
+
                 Stream requestStream = null;
                 try
                 {
@@ -1213,4 +1283,4 @@ namespace OpenSim.Framework
             return deserial;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index c3e7ec2..3a4e5df 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -103,48 +103,63 @@ namespace OpenSim
                 "[OPENSIM MAIN]: Environment variable MONO_THREADS_PER_CPU is {0}", monoThreadsPerCpu ?? "unset");
 
             // Verify the Threadpool allocates or uses enough worker and IO completion threads
-                        // .NET 2.0 workerthreads default to 50 *  numcores
-                        // .NET 3.0 workerthreads defaults to 250 * numcores
-                        // .NET 4.0 workerthreads are dynamic based on bitness and OS resources
-                        // Max IO Completion threads are 1000 on all 3 CLRs.
+                        // .NET 2.0, workerthreads default to 50 *  numcores
+                        // .NET 3.0, workerthreads defaults to 250 * numcores
+                        // .NET 4.0, workerthreads are dynamic based on bitness and OS resources
+            // Max IO Completion threads are 1000 on all 3 CLRs
+            //
+            // Mono 2.10.9 to at least Mono 3.1, workerthreads default to 100 * numcores, iocp threads to 4 * numcores
                         int workerThreadsMin = 500;
                         int workerThreadsMax = 1000; // may need further adjustment to match other CLR
                         int iocpThreadsMin = 1000;
                         int iocpThreadsMax = 2000; // may need further adjustment to match other CLR
+
+            {
+                int currentMinWorkerThreads, currentMinIocpThreads;
+                System.Threading.ThreadPool.GetMinThreads(out currentMinWorkerThreads, out currentMinIocpThreads);
+                m_log.InfoFormat(
+                    "[OPENSIM MAIN]: Runtime gave us {0} min worker threads and {1} min IOCP threads", 
+                    currentMinWorkerThreads, currentMinIocpThreads);
+            }
+
             int workerThreads, iocpThreads;
             System.Threading.ThreadPool.GetMaxThreads(out workerThreads, out iocpThreads);
-            m_log.InfoFormat("[OPENSIM MAIN]: Runtime gave us {0} worker threads and {1} IOCP threads", workerThreads, iocpThreads);
+            m_log.InfoFormat("[OPENSIM MAIN]: Runtime gave us {0} max worker threads and {1} max IOCP threads", workerThreads, iocpThreads);
+
             if (workerThreads < workerThreadsMin)
             {
                 workerThreads = workerThreadsMin;
-                m_log.InfoFormat("[OPENSIM MAIN]: Bumping up to worker threads to {0}",workerThreads);
+                m_log.InfoFormat("[OPENSIM MAIN]: Bumping up to max worker threads to {0}",workerThreads);
             }
             if (workerThreads > workerThreadsMax)
             {
                 workerThreads = workerThreadsMax;
-                m_log.InfoFormat("[OPENSIM MAIN]: Limiting worker threads to {0}",workerThreads);
+                m_log.InfoFormat("[OPENSIM MAIN]: Limiting max worker threads to {0}",workerThreads);
             }
+
                         // Increase the number of IOCP threads available.
                         // Mono defaults to a tragically low number (24 on 6-core / 8GB Fedora 17)
                         if (iocpThreads < iocpThreadsMin)
             {
                 iocpThreads = iocpThreadsMin;
-                m_log.InfoFormat("[OPENSIM MAIN]: Bumping up IO completion threads to {0}",iocpThreads);
+                m_log.InfoFormat("[OPENSIM MAIN]: Bumping up max IOCP threads to {0}",iocpThreads);
             }
                         // Make sure we don't overallocate IOCP threads and thrash system resources
             if ( iocpThreads > iocpThreadsMax )
             {
                 iocpThreads = iocpThreadsMax;
-                m_log.InfoFormat("[OPENSIM MAIN]: Limiting IO completion threads to {0}",iocpThreads);
+                m_log.InfoFormat("[OPENSIM MAIN]: Limiting max IOCP completion threads to {0}",iocpThreads);
             }
                         // set the resulting worker and IO completion thread counts back to ThreadPool
             if ( System.Threading.ThreadPool.SetMaxThreads(workerThreads, iocpThreads) )
                         {
-                    m_log.InfoFormat("[OPENSIM MAIN]: Threadpool set to {0} worker threads and {1} IO completion threads", workerThreads, iocpThreads);
+                    m_log.InfoFormat(
+                    "[OPENSIM MAIN]: Threadpool set to {0} max worker threads and {1} max IOCP threads",
+                    workerThreads, iocpThreads);
                         }
                         else
                         {
-                    m_log.Info("[OPENSIM MAIN]: Threadpool reconfiguration failed, runtime defaults still in effect.");                         
+                    m_log.Warn("[OPENSIM MAIN]: Threadpool reconfiguration failed, runtime defaults still in effect.");                         
                         }
 
             // Check if the system is compatible with OpenSimulator.
@@ -152,17 +167,16 @@ namespace OpenSim
             string supported = String.Empty;
             if (Util.IsEnvironmentSupported(ref supported))
             {
-                m_log.Info("Environment is compatible.\n");
+                m_log.Info("[OPENSIM MAIN]: Environment is supported by OpenSimulator.");
             }
             else
             {
-                m_log.Warn("Environment is unsupported (" + supported + ")\n");
+                m_log.Warn("[OPENSIM MAIN]: Environment is not supported by OpenSimulator (" + supported + ")\n");
             }
 
             // Configure nIni aliases and localles
             Culture.SetCurrentCulture();
 
-
             // Validate that the user has the most basic configuration done
             // If not, offer to do the most basic configuration for them warning them along the way of the importance of 
             // reading these files.
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index fc3999f..bc7ecb7 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -201,11 +201,11 @@ namespace OpenSim
 
                 envConfigSource.LoadEnv();
                 m_config.Source.Merge(envConfigSource);
-                m_config.Source.ExpandKeyValues();
             }
 
-
             ReadConfigSettings();
+            
+            m_config.Source.ExpandKeyValues();
 
             return m_config;
         }
@@ -337,7 +337,6 @@ namespace OpenSim
                 config.Set("physics", "OpenDynamicsEngine");
                 config.Set("meshing", "Meshmerizer");
                 config.Set("physical_prim", true);
-                config.Set("see_into_this_sim_from_neighbor", true);
                 config.Set("serverside_object_permissions", true);
                 config.Set("storage_plugin", "OpenSim.Data.SQLite.dll");
                 config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index a7e7d03..a18a6fe 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -86,6 +86,7 @@ namespace OpenSim
             IConfig startupConfig = Config.Configs["Startup"];
             IConfig networkConfig = Config.Configs["Network"];
 
+            int stpMinThreads = 2;
             int stpMaxThreads = 15;
 
             if (startupConfig != null)
@@ -112,12 +113,13 @@ namespace OpenSim
                 if (!String.IsNullOrEmpty(asyncCallMethodStr) && Utils.EnumTryParse<FireAndForgetMethod>(asyncCallMethodStr, out asyncCallMethod))
                     Util.FireAndForgetMethod = asyncCallMethod;
 
+                stpMinThreads = startupConfig.GetInt("MinPoolThreads", 15);
                 stpMaxThreads = startupConfig.GetInt("MaxPoolThreads", 15);
                 m_consolePrompt = startupConfig.GetString("ConsolePrompt", @"Region (\R) ");
             }
 
             if (Util.FireAndForgetMethod == FireAndForgetMethod.SmartThreadPool)
-                Util.InitThreadPool(stpMaxThreads);
+                Util.InitThreadPool(stpMinThreads, stpMaxThreads);
 
             m_log.Info("[OPENSIM MAIN]: Using async_call_method " + Util.FireAndForgetMethod);
         }
@@ -170,6 +172,13 @@ namespace OpenSim
             if (userStatsURI != String.Empty)
                 MainServer.Instance.AddStreamHandler(new OpenSim.UXSimStatusHandler(this));
 
+            if (managedStatsURI != String.Empty)
+            {
+                string urlBase = String.Format("/{0}/", managedStatsURI);
+                MainServer.Instance.AddHTTPHandler(urlBase, StatsManager.HandleStatsRequest);
+                m_log.InfoFormat("[OPENSIM] Enabling remote managed stats fetch. URL = {0}", urlBase);
+            }
+
             if (m_console is RemoteConsole)
             {
                 if (m_consolePort == 0)
@@ -226,18 +235,6 @@ namespace OpenSim
                                           "Force the update of all objects on clients",
                                           HandleForceUpdate);
 
-            m_console.Commands.AddCommand("Debug", false, "debug packet",
-                                          "debug packet <level> [<avatar-first-name> <avatar-last-name>]",
-                                          "Turn on packet debugging",
-                                            "If level >  255 then all incoming and outgoing packets are logged.\n"
-                                          + "If level <= 255 then incoming AgentUpdate and outgoing SimStats and SimulatorViewerTimeMessage packets are not logged.\n"
-                                          + "If level <= 200 then incoming RequestImage and outgoing ImagePacket, ImageData, LayerData and CoarseLocationUpdate packets are not logged.\n"
-                                          + "If level <= 100 then incoming ViewerEffect and AgentAnimation and outgoing ViewerEffect and AvatarAnimation packets are not logged.\n"
-                                          + "If level <=  50 then outgoing ImprovedTerseObjectUpdate packets are not logged.\n"
-                                          + "If level <= 0 then no packets are logged.\n"
-                                          + "If an avatar name is given then only packets from that avatar are logged",
-                                          Debug);
-
             m_console.Commands.AddCommand("General", false, "change region",
                                           "change region <region name>",
                                           "Change current console region", ChangeSelectedRegion);
@@ -358,21 +355,9 @@ namespace OpenSim
             m_console.Commands.AddCommand("Regions", false, "delete-region",
                                           "delete-region <name>",
                                           "Delete a region from disk", RunCommand);
-
-            m_console.Commands.AddCommand("General", false, "modules list",
-                                          "modules list",
-                                          "List modules", HandleModules);
-
-            m_console.Commands.AddCommand("General", false, "modules load",
-                                          "modules load <name>",
-                                          "Load a module", HandleModules);
-
-            m_console.Commands.AddCommand("General", false, "modules unload",
-                                          "modules unload <name>",
-                                          "Unload a module", HandleModules);
         }
 
-        public override void ShutdownSpecific()
+        protected override void ShutdownSpecific()
         {
             if (m_shutdownCommandsFile != String.Empty)
             {
@@ -435,8 +420,8 @@ namespace OpenSim
             {
                 RegionInfo regionInfo = presence.Scene.RegionInfo;
 
-                if (presence.Firstname.ToLower().Contains(mainParams[2].ToLower()) &&
-                    presence.Lastname.ToLower().Contains(mainParams[3].ToLower()))
+                if (presence.Firstname.ToLower().Equals(mainParams[2].ToLower()) &&
+                    presence.Lastname.ToLower().Equals(mainParams[3].ToLower()))
                 {
                     MainConsole.Instance.Output(
                         String.Format(
@@ -450,6 +435,7 @@ namespace OpenSim
                         presence.ControllingClient.Kick("\nYou have been logged out by an administrator.\n");
 
                     presence.Scene.IncomingCloseAgent(presence.UUID, force);
+                    break;
                 }
             }
 
@@ -566,34 +552,6 @@ namespace OpenSim
         }
 
         /// <summary>
-        /// Load, Unload, and list Region modules in use
-        /// </summary>
-        /// <param name="module"></param>
-        /// <param name="cmd"></param>
-        private void HandleModules(string module, string[] cmd)
-        {
-            List<string> args = new List<string>(cmd);
-            args.RemoveAt(0);
-            string[] cmdparams = args.ToArray();
-
-            if (cmdparams.Length > 0)
-            {
-                switch (cmdparams[0].ToLower())
-                {
-                    case "list":
-                        //TODO: Convert to new region modules
-                        break;
-                    case "unload":
-                        //TODO: Convert to new region modules
-                        break;
-                    case "load":
-                        //TODO: Convert to new region modules
-                        break;
-                }
-            }
-        }
-
-        /// <summary>
         /// Runs commands issued by the server console from the operator
         /// </summary>
         /// <param name="command">The first argument of the parameter (the command)</param>
@@ -701,45 +659,6 @@ namespace OpenSim
             RefreshPrompt();
         }
 
-        /// <summary>
-        /// Turn on some debugging values for OpenSim.
-        /// </summary>
-        /// <param name="args"></param>
-        protected void Debug(string module, string[] args)
-        {
-            if (args.Length == 1)
-                return;
-
-            switch (args[1])
-            {
-                case "packet":
-                    string name = null;
-                    if (args.Length == 5)
-                        name = string.Format("{0} {1}", args[3], args[4]);
-
-                    if (args.Length > 2)
-                    {
-                        int newDebug;
-                        if (int.TryParse(args[2], out newDebug))
-                        {
-                            SceneManager.SetDebugPacketLevelOnCurrentScene(newDebug, name);
-                            // We provide user information elsewhere if any clients had their debug level set.
-//                            MainConsole.Instance.OutputFormat("Debug packet level set to {0}", newDebug);
-                        }
-                        else
-                        {
-                            MainConsole.Instance.Output("Usage: debug packet 0..255");
-                        }
-                    }
-
-                    break;
-
-                default:
-                    MainConsole.Instance.Output("Unknown debug command");
-                    break;
-            }
-        }
-
         // see BaseOpenSimServer
         /// <summary>
         /// Many commands list objects for debugging.  Some of the types are listed  here
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 88bd869..4891c1a 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -75,6 +75,7 @@ namespace OpenSim
         protected int proxyOffset = 0;
         
         public string userStatsURI = String.Empty;
+        public string managedStatsURI = String.Empty;
 
         protected bool m_autoCreateClientStack = true;
 
@@ -199,6 +200,8 @@ namespace OpenSim
                     new string[] { "Startup", "Permissions" }, "DefaultPermissionsModule");
 
                 m_permsModules = new List<string>(permissionModules.Split(','));
+
+                managedStatsURI = startupConfig.GetString("ManagedStatsRemoteFetchURI", String.Empty);
             }
 
             // Load the simulation data service
@@ -248,10 +251,7 @@ namespace OpenSim
             }
 
             if (m_console != null)
-            {
-                StatsManager.RegisterConsoleCommands(m_console);
                 AddPluginCommands(m_console);
-            }
         }
 
         protected virtual void AddPluginCommands(ICommandConsole console)
@@ -496,9 +496,6 @@ namespace OpenSim
                 scene.SnmpService.LinkUp(scene);
             }
 
-            scene.Start();
-            scene.StartScripts();
-
             return clientServers;
         }
 
@@ -813,7 +810,7 @@ namespace OpenSim
 
             if (foundClientServer)
             {
-                m_clientServers[clientServerElement].NetworkStop();
+                m_clientServers[clientServerElement].Stop();
                 m_clientServers.RemoveAt(clientServerElement);
             }
         }
@@ -827,6 +824,7 @@ namespace OpenSim
             ShutdownClientServer(whichRegion);
             IScene scene;
             CreateRegion(whichRegion, true, out scene);
+            scene.Start();
         }
 
         # region Setup methods
@@ -840,73 +838,49 @@ namespace OpenSim
         /// <summary>
         /// Handler to supply the current status of this sim
         /// </summary>
+        /// <remarks>
         /// Currently this is always OK if the simulator is still listening for connections on its HTTP service
-        public class SimStatusHandler : IStreamedRequestHandler
+        /// </remarks>
+        public class SimStatusHandler : BaseStreamHandler
         {
-            public byte[] Handle(string path, Stream request,
+            public SimStatusHandler() : base("GET", "/simstatus", "SimStatus", "Simulator Status") {}
+
+            protected override byte[] ProcessRequest(string path, Stream request,
                                  IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
             {
                 return Util.UTF8.GetBytes("OK");
             }
 
-            public string Name { get { return "SimStatus"; } }
-            public string Description { get { return "Simulator Status"; } }
-
-            public string ContentType
+            public override string ContentType
             {
                 get { return "text/plain"; }
             }
-
-            public string HttpMethod
-            {
-                get { return "GET"; }
-            }
-
-            public string Path
-            {
-                get { return "/simstatus"; }
-            }
         }
 
         /// <summary>
         /// Handler to supply the current extended status of this sim
         /// Sends the statistical data in a json serialization 
         /// </summary>
-        public class XSimStatusHandler : IStreamedRequestHandler
+        public class XSimStatusHandler : BaseStreamHandler
         {
             OpenSimBase m_opensim;
-            string osXStatsURI = String.Empty;
-
-            public string Name { get { return "XSimStatus"; } }
-            public string Description { get { return "Simulator XStatus"; } }
         
-            public XSimStatusHandler(OpenSimBase sim)
+            public XSimStatusHandler(OpenSimBase sim) 
+                : base("GET", "/" + Util.SHA1Hash(sim.osSecret), "XSimStatus", "Simulator XStatus")
             {
                 m_opensim = sim;
-                osXStatsURI = Util.SHA1Hash(sim.osSecret);
             }
             
-            public byte[] Handle(string path, Stream request,
+            protected override byte[] ProcessRequest(string path, Stream request,
                                  IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
             {
                 return Util.UTF8.GetBytes(m_opensim.StatReport(httpRequest));
             }
 
-            public string ContentType
+            public override string ContentType
             {
                 get { return "text/plain"; }
             }
-
-            public string HttpMethod
-            {
-                get { return "GET"; }
-            }
-
-            public string Path
-            {
-                // This is for the OpenSimulator instance and is the osSecret hashed
-                get { return "/" + osXStatsURI; }
-            }
         }
 
         /// <summary>
@@ -915,42 +889,26 @@ namespace OpenSim
         /// If the request contains a key, "callback" the response will be wrappend in the 
         /// associated value for jsonp used with ajax/javascript
         /// </summary>
-        public class UXSimStatusHandler : IStreamedRequestHandler
+        protected class UXSimStatusHandler : BaseStreamHandler
         {
             OpenSimBase m_opensim;
-            string osUXStatsURI = String.Empty;
-
-            public string Name { get { return "UXSimStatus"; } }
-            public string Description { get { return "Simulator UXStatus"; } }
         
             public UXSimStatusHandler(OpenSimBase sim)
+                : base("GET", "/" + sim.userStatsURI, "UXSimStatus", "Simulator UXStatus")
             {
-                m_opensim = sim;
-                osUXStatsURI = sim.userStatsURI;
-                
+                m_opensim = sim;                
             }
             
-            public byte[] Handle(string path, Stream request,
+            protected override byte[] ProcessRequest(string path, Stream request,
                                  IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
             {
                 return Util.UTF8.GetBytes(m_opensim.StatReport(httpRequest));
             }
 
-            public string ContentType
+            public override string ContentType
             {
                 get { return "text/plain"; }
             }
-
-            public string HttpMethod
-            {
-                get { return "GET"; }
-            }
-
-            public string Path
-            {
-                // This is for the OpenSimulator instance and is the user provided URI 
-                get { return "/" + osUXStatsURI; }
-            }
         }
 
         #endregion
@@ -958,7 +916,7 @@ namespace OpenSim
         /// <summary>
         /// Performs any last-minute sanity checking and shuts down the region server
         /// </summary>
-        public override void ShutdownSpecific()
+        protected override void ShutdownSpecific()
         {
             if (proxyUrl.Length > 0)
             {
@@ -978,6 +936,8 @@ namespace OpenSim
             {
                 m_log.Error("[SHUTDOWN]: Ignoring failure during shutdown - ", e);
             }
+
+            base.ShutdownSpecific();
         }
 
         /// <summary>
diff --git a/OpenSim/Region/ClientStack/IClientNetworkServer.cs b/OpenSim/Region/ClientStack/IClientNetworkServer.cs
index 54a441b..bb7e6d0 100644
--- a/OpenSim/Region/ClientStack/IClientNetworkServer.cs
+++ b/OpenSim/Region/ClientStack/IClientNetworkServer.cs
@@ -38,11 +38,22 @@ namespace OpenSim.Region.ClientStack
             IPAddress _listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, IConfigSource configSource, 
             AgentCircuitManager authenticateClass);
 
-        void NetworkStop();
         bool HandlesRegion(Location x);
-        void AddScene(IScene x);
 
+        /// <summary>
+        /// Add the given scene to be handled by this IClientNetworkServer.
+        /// </summary>
+        /// <param name='scene'></param>
+        void AddScene(IScene scene);
+
+        /// <summary>
+        /// Start sending and receiving data.
+        /// </summary>
         void Start();
+
+        /// <summary>
+        /// Stop sending and receiving data.
+        /// </summary>
         void Stop();
     }
 }
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs
new file mode 100644
index 0000000..10a4753
--- /dev/null
+++ b/OpenSim/Region/ClientStack/Linden/Caps/AvatarPickerSearchModule.cs
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Reflection;
+using System.IO;
+using System.Web;
+using log4net;
+using Nini.Config;
+using Mono.Addins;
+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.Capabilities.Handlers;
+
+namespace OpenSim.Region.ClientStack.Linden
+{
+
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "AvatarPickerSearchModule")]
+    public class AvatarPickerSearchModule : INonSharedRegionModule
+    {
+        private static readonly ILog m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        
+        private Scene m_scene;
+        private IPeople m_People;
+        private bool m_Enabled = false;
+
+        private string m_URL;
+
+        #region ISharedRegionModule Members
+
+        public void Initialise(IConfigSource source)
+        {
+            IConfig config = source.Configs["ClientStack.LindenCaps"];
+            if (config == null)
+                return;
+
+            m_URL = config.GetString("Cap_AvatarPickerSearch", 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;
+        }
+
+        public void RemoveRegion(Scene s)
+        {
+            if (!m_Enabled)
+                return;
+
+            m_scene.EventManager.OnRegisterCaps -= RegisterCaps;
+            m_scene = null;
+        }
+
+        public void RegionLoaded(Scene s)
+        {
+            if (!m_Enabled)
+                return;
+
+            m_People = m_scene.RequestModuleInterface<IPeople>();
+            m_scene.EventManager.OnRegisterCaps += RegisterCaps;
+        }
+
+        public void PostInitialise()
+        {
+        }
+
+        public void Close() { }
+
+        public string Name { get { return "AvatarPickerSearchModule"; } }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        #endregion
+
+        public void RegisterCaps(UUID agentID, Caps caps)
+        {
+            UUID capID = UUID.Random();
+
+            if (m_URL == "localhost")
+            {
+//                m_log.DebugFormat("[AVATAR PICKER SEARCH]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName);
+                caps.RegisterHandler(
+                    "AvatarPickerSearch",
+                    new AvatarPickerSearchHandler("/CAPS/" + capID + "/", m_People, "AvatarPickerSearch", "Search for avatars by name"));
+            }
+            else
+            {
+                //                m_log.DebugFormat("[AVATAR PICKER SEARCH]: {0} in region {1}", m_URL, m_scene.RegionInfo.RegionName);
+                caps.RegisterHandler("AvatarPickerSearch", m_URL);
+            }
+        }
+
+    }
+}
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 8241e07..762e22a 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -282,13 +282,19 @@ namespace OpenSim.Region.ClientStack.Linden
                 m_HostCapsObj.RegisterHandler("UpdateNotecardAgentInventory", req);
                 m_HostCapsObj.RegisterHandler("UpdateScriptAgentInventory", req);
                 m_HostCapsObj.RegisterHandler("UpdateScriptAgent", req);
-                IRequestHandler getObjectPhysicsDataHandler = new RestStreamHandler("POST", capsBase + m_getObjectPhysicsDataPath, GetObjectPhysicsData);
+
+                IRequestHandler getObjectPhysicsDataHandler 
+                    = new RestStreamHandler(
+                        "POST", capsBase + m_getObjectPhysicsDataPath, GetObjectPhysicsData, "GetObjectPhysicsData", null);
                 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);
+
+                IRequestHandler UpdateAgentInformationHandler
+                    = new RestStreamHandler(
+                        "POST", capsBase + m_UpdateAgentInformationPath, UpdateAgentInformation, "UpdateAgentInformation", null);
                 m_HostCapsObj.RegisterHandler("UpdateAgentInformation", UpdateAgentInformationHandler);
 
                 m_HostCapsObj.RegisterHandler(
@@ -361,18 +367,7 @@ namespace OpenSim.Region.ClientStack.Linden
             foreach (OSD c in capsRequested)
                 validCaps.Add(c.AsString());
 
-            Hashtable caps = m_HostCapsObj.CapsHandlers.GetCapsDetails(true, validCaps);
-
-            // Add the external too
-            foreach (KeyValuePair<string, string> kvp in m_HostCapsObj.ExternalCapsHandlers)
-            {
-                if (!validCaps.Contains(kvp.Key))
-                    continue;
-
-                caps[kvp.Key] = kvp.Value;
-            }
-
-            string result = LLSDHelpers.SerialiseLLSDReply(caps);
+            string result = LLSDHelpers.SerialiseLLSDReply(m_HostCapsObj.GetCapsDetails(true, validCaps));
 
             //m_log.DebugFormat("[CAPS] CapsRequest {0}", result);
 
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index eb40eb1..725bf06 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -65,6 +65,13 @@ namespace OpenSim.Region.ClientStack.Linden
         /// </value>
         public int DebugLevel { get; set; }
 
+        // Viewer post requests timeout in 60 secs
+        // https://bitbucket.org/lindenlab/viewer-release/src/421c20423df93d650cc305dc115922bb30040999/indra/llmessage/llhttpclient.cpp?at=default#cl-44
+        //
+        private const int VIEWER_TIMEOUT = 60 * 1000;
+        // Just to be safe, we work on a 10 sec shorter cycle
+        private const int SERVER_EQ_TIME_NO_EVENTS = VIEWER_TIMEOUT - (10 * 1000);
+
         protected Scene m_scene;
         
         private Dictionary<UUID, int> m_ids = new Dictionary<UUID, int>();
@@ -84,7 +91,6 @@ namespace OpenSim.Region.ClientStack.Linden
             scene.RegisterModuleInterface<IEventQueue>(this);
 
             scene.EventManager.OnClientClosed += ClientClosed;
-            scene.EventManager.OnMakeChildAgent += MakeChildAgent;
             scene.EventManager.OnRegisterCaps += OnRegisterCaps;
 
             MainConsole.Instance.Commands.AddCommand(
@@ -113,7 +119,6 @@ namespace OpenSim.Region.ClientStack.Linden
                 return;
 
             scene.EventManager.OnClientClosed -= ClientClosed;
-            scene.EventManager.OnMakeChildAgent -= MakeChildAgent;
             scene.EventManager.OnRegisterCaps -= OnRegisterCaps;
 
             scene.UnregisterModuleInterface<IEventQueue>(this);
@@ -182,14 +187,12 @@ namespace OpenSim.Region.ClientStack.Linden
             {
                 if (!queues.ContainsKey(agentId))
                 {
-                    /*
                     m_log.DebugFormat(
                         "[EVENTQUEUE]: Adding new queue for agent {0} in region {1}", 
                         agentId, m_scene.RegionInfo.RegionName);
-                    */
                     queues[agentId] = new Queue<OSD>();
                 }
-                
+
                 return queues[agentId];
             }
         }
@@ -221,8 +224,17 @@ namespace OpenSim.Region.ClientStack.Linden
             {
                 Queue<OSD> queue = GetQueue(avatarID);
                 if (queue != null)
+                {
                     lock (queue)
                         queue.Enqueue(ev);
+                }
+                else
+                {
+                    OSDMap evMap = (OSDMap)ev;
+                    m_log.WarnFormat(
+                        "[EVENTQUEUE]: (Enqueue) No queue found for agent {0} when placing message {1} in region {2}", 
+                        avatarID, evMap["message"], m_scene.Name);
+                }
             } 
             catch (NullReferenceException e)
             {
@@ -237,44 +249,14 @@ namespace OpenSim.Region.ClientStack.Linden
 
         private void ClientClosed(UUID agentID, Scene scene)
         {
-//            m_log.DebugFormat("[EVENTQUEUE]: Closed client {0} in region {1}", agentID, m_scene.RegionInfo.RegionName);
-
-            int count = 0;
-            while (queues.ContainsKey(agentID) && queues[agentID].Count > 0 && count++ < 5)
-            {
-                Thread.Sleep(1000);
-            }
+            //m_log.DebugFormat("[EVENTQUEUE]: Closed client {0} in region {1}", agentID, m_scene.RegionInfo.RegionName);
 
             lock (queues)
-            {
                 queues.Remove(agentID);
-            }
 
             List<UUID> removeitems = new List<UUID>();
             lock (m_AvatarQueueUUIDMapping)
-            {
-                foreach (UUID ky in m_AvatarQueueUUIDMapping.Keys)
-                {
-//                    m_log.DebugFormat("[EVENTQUEUE]: Found key {0} in m_AvatarQueueUUIDMapping while looking for {1}", ky, AgentID);
-                    if (ky == agentID)
-                    {
-                        removeitems.Add(ky);
-                    }
-                }
-
-                foreach (UUID ky in removeitems)
-                {
-                    UUID eventQueueGetUuid = m_AvatarQueueUUIDMapping[ky];
-                    m_AvatarQueueUUIDMapping.Remove(ky);
-
-                    string eqgPath = GenerateEqgCapPath(eventQueueGetUuid);
-                    MainServer.Instance.RemovePollServiceHTTPHandler("", eqgPath);
-
-//                    m_log.DebugFormat(
-//                        "[EVENT QUEUE GET MODULE]: Removed EQG handler {0} for {1} in {2}",
-//                        eqgPath, agentID, m_scene.RegionInfo.RegionName);
-                }
-            }
+                m_AvatarQueueUUIDMapping.Remove(agentID);
 
             UUID searchval = UUID.Zero;
 
@@ -295,19 +277,9 @@ namespace OpenSim.Region.ClientStack.Linden
                 foreach (UUID ky in removeitems)
                     m_QueueUUIDAvatarMapping.Remove(ky);
             }
-        }
 
-        private void MakeChildAgent(ScenePresence avatar)
-        {
-            //m_log.DebugFormat("[EVENTQUEUE]: Make Child agent {0} in region {1}.", avatar.UUID, m_scene.RegionInfo.RegionName);
-            //lock (m_ids)
-           // {
-                //if (m_ids.ContainsKey(avatar.UUID))
-                //{
-                    // close the event queue.
-                    //m_ids[avatar.UUID] = -1;
-                //}
-            //}
+            // m_log.DebugFormat("[EVENTQUEUE]: Deleted queues for {0} in region {1}", agentID, m_scene.RegionInfo.RegionName);
+
         }
 
         /// <summary>
@@ -359,28 +331,9 @@ namespace OpenSim.Region.ClientStack.Linden
                     m_AvatarQueueUUIDMapping.Add(agentID, eventQueueGetUUID);
             }
 
-            string eventQueueGetPath = GenerateEqgCapPath(eventQueueGetUUID);
-
-            // Register this as a caps handler
-            // FIXME: Confusingly, we need to register separate as a capability so that the client is told about
-            // EventQueueGet when it receive capability information, but then we replace the rest handler immediately
-            // afterwards with the poll service.  So for now, we'll pass a null instead to simplify code reading, but
-            // really it should be possible to directly register the poll handler as a capability.
-            caps.RegisterHandler("EventQueueGet", new RestHTTPHandler("POST", eventQueueGetPath, null));
-//                                                       delegate(Hashtable m_dhttpMethod)
-//                                                       {
-//                                                           return ProcessQueue(m_dhttpMethod, agentID, caps);
-//                                                       }));
-
-            // This will persist this beyond the expiry of the caps handlers
-            // TODO: Add EventQueueGet name/description for diagnostics
-            MainServer.Instance.AddPollServiceHTTPHandler(
-                eventQueueGetPath,
-                new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, agentID, 40000));
-
-//            m_log.DebugFormat(
-//                "[EVENT QUEUE GET MODULE]: Registered EQG handler {0} for {1} in {2}",
-//                eventQueueGetPath, agentID, m_scene.RegionInfo.RegionName);
+            caps.RegisterPollHandler(
+                "EventQueueGet",
+                new PollServiceEventArgs(null, GenerateEqgCapPath(eventQueueGetUUID), HasEvents, GetEvents, NoEvents, agentID, SERVER_EQ_TIME_NO_EVENTS));
 
             Random rnd = new Random(Environment.TickCount);
             lock (m_ids)
@@ -398,7 +351,10 @@ namespace OpenSim.Region.ClientStack.Linden
             Queue<OSD> queue = GetQueue(agentID);
             if (queue != null)
                 lock (queue)
+                {
+                    //m_log.WarnFormat("POLLED FOR EVENTS BY {0} in {1} -- {2}", agentID, m_scene.RegionInfo.RegionName, queue.Count);
                     return queue.Count > 0;
+                }
 
             return false;
         }
@@ -414,16 +370,21 @@ namespace OpenSim.Region.ClientStack.Linden
                 OSDMap ev = (OSDMap)element;
                 m_log.DebugFormat(
                     "Eq OUT {0,-30} to {1,-20} {2,-20}",
-                    ev["message"], m_scene.GetScenePresence(agentId).Name, m_scene.RegionInfo.RegionName);
+                    ev["message"], m_scene.GetScenePresence(agentId).Name, m_scene.Name);
             }
         }
 
         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);
+                m_log.WarnFormat("POLLED FOR EQ MESSAGES BY {0} in {1}", pAgentId, m_scene.Name);
+
+            Queue<OSD> queue = GetQueue(pAgentId);
+            if (queue == null)
+            {
+                return NoEvents(requestID, pAgentId);
+            }
 
-            Queue<OSD> queue = TryGetQueue(pAgentId);
             OSD element;
             lock (queue)
             {
@@ -794,12 +755,12 @@ namespace OpenSim.Region.ClientStack.Linden
 
         }
 
-        public void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID toAgent, bool canVoiceChat, 
+        public void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID anotherAgent, bool canVoiceChat, 
                                                       bool isModerator, bool textMute)
         {
             OSD item = EventQueueHelper.ChatterBoxSessionAgentListUpdates(sessionID, fromAgent, canVoiceChat,
                                                                           isModerator, textMute);
-            Enqueue(item, toAgent);
+            Enqueue(item, fromAgent);
             //m_log.InfoFormat("########### eq ChatterBoxSessionAgentListUpdates #############\n{0}", item);
         }
 
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
index 141af8a..b3b0b8a 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
         }
 
         [Test]
-        public void AddForClient()
+        public void TestAddForClient()
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
@@ -88,10 +88,10 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
         }
 
         [Test]
-        public void RemoveForClient()
+        public void TestRemoveForClient()
         {
             TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();
+//            TestHelpers.EnableLogging();
 
             UUID spId = TestHelpers.ParseTail(0x1);
 
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
index 6ec1115..7b15284 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
@@ -246,8 +246,8 @@ namespace OpenSim.Region.ClientStack.Linden
 
             private Scene m_scene;
             private MeshCapsDataThrottler m_throttler;
-            public PollServiceMeshEventArgs(UUID pId, Scene scene) :
-                base(null, null, null, null, pId, int.MaxValue)
+            public PollServiceMeshEventArgs(string uri, UUID pId, Scene scene) :
+                base(null, uri, null, null, null, pId, int.MaxValue)
             {
                 m_scene = scene;
                 m_throttler = new MeshCapsDataThrottler(100000, 1400000, 10000, scene, pId);
@@ -361,7 +361,7 @@ namespace OpenSim.Region.ClientStack.Linden
                 string capUrl = "/CAPS/" + UUID.Random() + "/";
 
                 // Register this as a poll service           
-                PollServiceMeshEventArgs args = new PollServiceMeshEventArgs(agentID, m_scene);
+                PollServiceMeshEventArgs args = new PollServiceMeshEventArgs(capUrl, agentID, m_scene);
 
                 args.Type = PollServiceEventArgs.EventType.Mesh;
                 MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args);
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
index 0570144..e053054 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
@@ -84,6 +84,8 @@ namespace OpenSim.Region.ClientStack.Linden
 
         private Dictionary<UUID,PollServiceTextureEventArgs> m_pollservices = new Dictionary<UUID,PollServiceTextureEventArgs>();
 
+        private string m_URL;
+
         #region ISharedRegionModule Members
 
         public void Initialise(IConfigSource source)
@@ -215,7 +217,7 @@ namespace OpenSim.Region.ClientStack.Linden
             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)              
+                    base(null, "", null, null, null, pId, int.MaxValue)              
             {
                 m_scene = scene;
                 // x is request id, y is userid
@@ -368,7 +370,11 @@ namespace OpenSim.Region.ClientStack.Linden
                     port = MainServer.Instance.SSLPort;
                     protocol = "https";
                 }
-                caps.RegisterHandler("GetTexture", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl));
+                IExternalCapsModule handler = m_scene.RequestModuleInterface<IExternalCapsModule>();
+                if (handler != null)
+                    handler.RegisterExternalUserCapsHandler(agentID, caps, "GetTexture", capUrl);
+                else
+                    caps.RegisterHandler("GetTexture", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl));
                 m_pollservices[agentID] = args;
                 m_capsDict[agentID] = capUrl;
             }
@@ -380,13 +386,11 @@ namespace OpenSim.Region.ClientStack.Linden
 
         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);
-            }
+
+            MainServer.Instance.RemoveHTTPHandler("", m_URL);
+            m_capsDict.Remove(agentID);
+
             if (m_pollservices.TryGetValue(agentID, out args))
             {
                 m_pollservices.Remove(agentID);
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs
index 79d56c4..5196368 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs
@@ -183,7 +183,7 @@ namespace OpenSim.Region.ClientStack.Linden
             m_isGod = m_scene.Permissions.IsGod(agentID);
         }
 
-        public override byte[] Handle(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        protected override byte[] ProcessRequest(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             StreamReader reader = new StreamReader(request);
             string message = reader.ReadToEnd();
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
index 7d9f935..e4d8a20 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
@@ -68,7 +68,6 @@ namespace OpenSim.Region.ClientStack.Linden
         /// </summary>
         private OSDMap m_features = new OSDMap();
 
-        private string m_MapImageServerURL = string.Empty;
         private string m_SearchURL = string.Empty;
         private bool m_ExportSupported = false;
 
@@ -78,15 +77,7 @@ namespace OpenSim.Region.ClientStack.Linden
         {
             IConfig config = source.Configs["SimulatorFeatures"];
             if (config != null)
-            {
-                m_MapImageServerURL = config.GetString("MapImageServerURI", string.Empty);
-                if (m_MapImageServerURL != string.Empty)
-                {
-                    m_MapImageServerURL = m_MapImageServerURL.Trim();
-                    if (!m_MapImageServerURL.EndsWith("/"))
-                        m_MapImageServerURL = m_MapImageServerURL + "/";
-                }
-    
+            {    
                 m_SearchURL = config.GetString("SearchServerURI", string.Empty);
 
                 m_ExportSupported = config.GetBoolean("ExportSupported", m_ExportSupported);
@@ -149,15 +140,16 @@ namespace OpenSim.Region.ClientStack.Linden
                 m_features["PhysicsShapeTypes"] = typesMap;
     
                 // Extra information for viewers that want to use it
-                OSDMap gridServicesMap = new OSDMap();
-                if (m_MapImageServerURL != string.Empty)
-                    gridServicesMap["map-server-url"] = m_MapImageServerURL;
+                // TODO: Take these out of here into their respective modules, like map-server-url
+                OSDMap extrasMap = new OSDMap();
                 if (m_SearchURL != string.Empty)
-                    gridServicesMap["search"] = m_SearchURL;
-                m_features["GridServices"] = gridServicesMap;
-
+                    extrasMap["search-server-url"] = m_SearchURL;
                 if (m_ExportSupported)
-                    m_features["ExportSupported"] = true;
+                    extrasMap["ExportSupported"] = true;
+
+                if (extrasMap.Count > 0)
+                    m_features["OpenSimExtras"] = extrasMap;
+
             }
         }
 
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
index eca576d..cf95463 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
@@ -64,11 +64,18 @@ namespace OpenSim.Region.ClientStack.Linden
 
         private Scene m_scene;
         private bool m_persistBakedTextures;
+        private string m_URL;
 
         private IBakedTextureModule m_BakedTextureModule;
 
         public void Initialise(IConfigSource source)
         {
+            IConfig config = source.Configs["ClientStack.LindenCaps"];
+            if (config == null)
+                return;
+
+            m_URL = config.GetString("Cap_UploadBakedTexture", string.Empty);
+
             IConfig appearanceConfig = source.Configs["Appearance"];
             if (appearanceConfig != null)
                 m_persistBakedTextures = appearanceConfig.GetBoolean("PersistBakedTextures", m_persistBakedTextures);
@@ -280,23 +287,28 @@ namespace OpenSim.Region.ClientStack.Linden
 
         public void RegisterCaps(UUID agentID, Caps caps)
         {
-            UploadBakedTextureHandler avatarhandler = new UploadBakedTextureHandler(
-                caps, m_scene.AssetService, m_persistBakedTextures);
+            UUID capID = UUID.Random();
 
-           
-            
-            caps.RegisterHandler(
-                "UploadBakedTexture",
-                new RestStreamHandler(
-                    "POST",
-                    "/CAPS/" + caps.CapsObjectPath + m_uploadBakedTexturePath,
-                    avatarhandler.UploadBakedTexture,
-                    "UploadBakedTexture",
-                    agentID.ToString()));
-
-           
-            
+            //caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture));
+            if (m_URL == "localhost")
+            {
+                UploadBakedTextureHandler avatarhandler = new UploadBakedTextureHandler(
+                    caps, m_scene.AssetService, m_persistBakedTextures);
 
+                caps.RegisterHandler(
+                    "UploadBakedTexture",
+                    new RestStreamHandler(
+                        "POST",
+                        "/CAPS/" + caps.CapsObjectPath + m_uploadBakedTexturePath,
+                        avatarhandler.UploadBakedTexture,
+                        "UploadBakedTexture",
+                        agentID.ToString()));
+                
+            }
+            else
+            {
+                caps.RegisterHandler("UploadBakedTexture", m_URL);
+            }
         }
     }
-}
\ 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 707cc93..f816ad3 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -71,9 +71,13 @@ namespace OpenSim.Region.ClientStack.Linden
         private IInventoryService m_InventoryService;
         private ILibraryService m_LibraryService;
 
+        private bool m_Enabled;
+
+        private string m_fetchInventoryDescendents2Url;
+        private string m_webFetchInventoryDescendentsUrl;
+
         private static WebFetchInvDescHandler m_webFetchHandler;
 
-        private Dictionary<UUID, string> m_capsDict = new Dictionary<UUID, string>();
         private static Thread[] m_workerThreads = null;
 
         private static DoubleQueue<aPollRequest> m_queue =
@@ -83,22 +87,45 @@ namespace OpenSim.Region.ClientStack.Linden
 
         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;
+
+            foreach (Thread t in m_workerThreads)
+                Watchdog.AbortThread(t.ManagedThreadId); 
+
             m_scene = null;
         }
 
         public void RegionLoaded(Scene s)
         {
+            if (!m_Enabled)
+                return;
+
             m_InventoryService = m_scene.InventoryService;
             m_LibraryService = m_scene.LibraryService;
 
@@ -106,7 +133,6 @@ namespace OpenSim.Region.ClientStack.Linden
             m_webFetchHandler = new WebFetchInvDescHandler(m_InventoryService, m_LibraryService);
 
             m_scene.EventManager.OnRegisterCaps += RegisterCaps;
-            m_scene.EventManager.OnDeregisterCaps += DeregisterCaps;
 
             if (m_workerThreads == null)
             {
@@ -140,12 +166,6 @@ namespace OpenSim.Region.ClientStack.Linden
 
         #endregion
 
-        ~WebFetchInvDescModule()
-        {
-            foreach (Thread t in m_workerThreads)
-                Watchdog.AbortThread(t.ManagedThreadId);               
-        }
-
         private class PollServiceInventoryEventArgs : PollServiceEventArgs
         {
             private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -155,8 +175,8 @@ namespace OpenSim.Region.ClientStack.Linden
 
             private Scene m_scene;
 
-            public PollServiceInventoryEventArgs(Scene scene, UUID pId) :
-                    base(null, null, null, null, pId, int.MaxValue)
+            public PollServiceInventoryEventArgs(Scene scene, string url, UUID pId) :
+                    base(null, url, null, null, null, pId, int.MaxValue)
             {
                 m_scene = scene;
 
@@ -284,47 +304,53 @@ namespace OpenSim.Region.ClientStack.Linden
 
         private void RegisterCaps(UUID agentID, Caps caps)
         {
-            string capUrl = "/CAPS/" + UUID.Random() + "/";
+            if (m_fetchInventoryDescendents2Url == "")
+                return;
 
             // Register this as a poll service          
-            PollServiceInventoryEventArgs args = new PollServiceInventoryEventArgs(m_scene, agentID);
-            
+            PollServiceInventoryEventArgs args 
+                = new PollServiceInventoryEventArgs(m_scene, "/CAPS/" + UUID.Random() + "/", 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)
-            {
-                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.RegisterPollHandler("FetchInventoryDescendents2", args);
+
+//            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("FetchInventoryDescendents2", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, 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);
-            }
-        }
+//        private void DeregisterCaps(UUID agentID, Caps caps)
+//        {
+//            string capUrl;
+//
+//            if (m_capsDict.TryGetValue(agentID, out capUrl))
+//            {
+//                MainServer.Instance.RemoveHTTPHandler("", capUrl);
+//                m_capsDict.Remove(agentID);
+//            }
+//        }
 
         private void DoInventoryRequests()
         {
             while (true)
             {
+                Watchdog.UpdateThread();
+
                 aPollRequest poolreq = m_queue.Dequeue();
 
-                poolreq.thepoll.Process(poolreq);
+                if (poolreq != null && poolreq.thepoll != null)
+                    poolreq.thepoll.Process(poolreq);
             }
         }
     }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
index 3995620..15d6f7f 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs
@@ -424,12 +424,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 // foreign user is visiting, we need to try again after the first fail to the local
                 // asset service.
                 string assetServerURL = string.Empty;
-                if (InventoryAccessModule.IsForeignUser(AgentID, out assetServerURL))
+                if (InventoryAccessModule.IsForeignUser(AgentID, out assetServerURL) && !string.IsNullOrEmpty(assetServerURL))
                 {
                     if (!assetServerURL.EndsWith("/") && !assetServerURL.EndsWith("="))
                         assetServerURL = assetServerURL + "/";
 
-                    m_log.DebugFormat("[J2KIMAGE]: texture {0} not found in local asset storage. Trying user's storage.", assetServerURL + id);
+//                    m_log.DebugFormat("[J2KIMAGE]: texture {0} not found in local asset storage. Trying user's storage.", assetServerURL + id);
                     AssetService.Get(assetServerURL + id, InventoryAccessModule, AssetReceived);
                     return;
                 }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index f4ea975..36edd0b 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -84,6 +84,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public event ModifyTerrain OnModifyTerrain;
         public event Action<IClientAPI> OnRegionHandShakeReply;
         public event GenericCall1 OnRequestWearables;
+        public event CachedTextureRequest OnCachedTextureRequest;
         public event SetAppearance OnSetAppearance;
         public event AvatarNowWearing OnAvatarNowWearing;
         public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv;
@@ -95,6 +96,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public event Action<IClientAPI, bool> OnCompleteMovementToRegion;
         public event UpdateAgent OnPreAgentUpdate;
         public event UpdateAgent OnAgentUpdate;
+        public event UpdateAgent OnAgentCameraUpdate;
         public event AgentRequestSit OnAgentRequestSit;
         public event AgentSit OnAgentSit;
         public event AvatarPickerRequest OnAvatarPickerRequest;
@@ -335,6 +337,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         private bool m_VelocityInterpolate = false;
         private const uint MaxTransferBytesPerPacket = 600;
 
+        private volatile bool m_justEditedTerrain = false;
 
         /// <value>
         /// List used in construction of data blocks for an object update packet.  This is to stop us having to
@@ -367,7 +370,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// This does mean that agent updates must be processed synchronously, at least for each client, and called methods
         /// cannot retain a reference to it outside of that method.
         /// </remarks>
-        private AgentUpdateArgs m_lastAgentUpdateArgs;
+        private AgentUpdateArgs m_thisAgentUpdateArgs = new AgentUpdateArgs();
 
         protected Dictionary<PacketType, PacketProcessor> m_packetHandlers = new Dictionary<PacketType, PacketProcessor>();
         protected Dictionary<string, GenericMessage> m_genericPacketHandlers = new Dictionary<string, GenericMessage>(); //PauPaw:Local Generic Message handlers
@@ -504,6 +507,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_udpServer = udpServer;
             m_udpClient = udpClient;
             m_udpClient.OnQueueEmpty += HandleQueueEmpty;
+            m_udpClient.HasUpdates += HandleHasUpdates;
             m_udpClient.OnPacketStats += PopulateStats;
 
             m_prioritizer = new Prioritizer(m_scene);
@@ -533,7 +537,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 // We still perform a force close inside the sync lock since this is intended to attempt close where
                 // there is some unidentified connection problem, not where we have issues due to deadlock
                 if (!IsActive && !force)
+                {
+                    m_log.DebugFormat(
+                        "[CLIENT]: Not attempting to close inactive client {0} in {1} since force flag is not set", 
+                        Name, m_scene.Name);
+
                     return;
+                }
 
                 IsActive = false;
                 CloseWithoutChecks(sendStop);
@@ -709,12 +719,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 //there is a local handler for this packet type
                 if (pprocessor.Async)
                 {
+                    ClientInfo cinfo = UDPClient.GetClientInfo();
+                    if (!cinfo.AsyncRequests.ContainsKey(packet.Type.ToString()))
+                        cinfo.AsyncRequests[packet.Type.ToString()] = 0;
+                    cinfo.AsyncRequests[packet.Type.ToString()]++;
+
                     object obj = new AsyncPacketProcess(this, pprocessor.method, packet);
                     Util.FireAndForget(ProcessSpecificPacketAsync, obj);
                     result = true;
                 }
                 else
                 {
+                    ClientInfo cinfo = UDPClient.GetClientInfo();
+                    if (!cinfo.SyncRequests.ContainsKey(packet.Type.ToString()))
+                        cinfo.SyncRequests[packet.Type.ToString()] = 0;
+                    cinfo.SyncRequests[packet.Type.ToString()]++;
+
                     result = pprocessor.method(this, packet);
                 }
             }
@@ -729,6 +749,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 }
                 if (found)
                 {
+                    ClientInfo cinfo = UDPClient.GetClientInfo();
+                    if (!cinfo.GenericRequests.ContainsKey(packet.Type.ToString()))
+                        cinfo.GenericRequests[packet.Type.ToString()] = 0;
+                    cinfo.GenericRequests[packet.Type.ToString()]++;
+
                     result = method(this, packet);
                 }
             }
@@ -820,12 +845,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             handshake.RegionInfo3.ProductName = Util.StringToBytes256(regionInfo.RegionType);
             handshake.RegionInfo3.ProductSKU = Utils.EmptyBytes;
 
-            handshake.RegionInfo4 = new RegionHandshakePacket.RegionInfo4Block[0];
-//            OutPacket(handshake, ThrottleOutPacketType.Task);
-            // use same as MoveAgentIntoRegion (both should be task )
+            handshake.RegionInfo4 = new RegionHandshakePacket.RegionInfo4Block[1];
+            handshake.RegionInfo4[0] = new RegionHandshakePacket.RegionInfo4Block();
+            handshake.RegionInfo4[0].RegionFlagsExtended = args.regionFlags;
+            handshake.RegionInfo4[0].RegionProtocols = 0; // 1 here would indicate that SSB is supported
+
             OutPacket(handshake, ThrottleOutPacketType.Unknown);
         }
 
+
         public void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look)
         {
             AgentMovementCompletePacket mov = (AgentMovementCompletePacket)PacketPool.Instance.GetPacket(PacketType.AgentMovementComplete);
@@ -1210,9 +1238,32 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     LLHeightFieldMoronize(map);
 
                 LayerDataPacket layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches);
-                layerpack.Header.Reliable = true;
+                
+                // When a user edits the terrain, so much data is sent, the data queues up fast and presents a sub optimal editing experience.  
+                // To alleviate this issue, when the user edits the terrain, we start skipping the queues until they're done editing the terrain.
+                // We also make them unreliable because it's extremely likely that multiple packets will be sent for a terrain patch area 
+                // invalidating previous packets for that area.
 
-                OutPacket(layerpack, ThrottleOutPacketType.Task);
+                // It's possible for an editing user to flood themselves with edited packets but the majority of use cases are such that only a 
+                // tiny percentage of users will be editing the terrain.     Other, non-editing users will see the edits much slower.
+                
+                // One last note on this topic, by the time users are going to be editing the terrain, it's extremely likely that the sim will 
+                // have rezzed already and therefore this is not likely going to cause any additional issues with lost packets, objects or terrain 
+                // patches.
+
+                // m_justEditedTerrain is volatile, so test once and duplicate two affected statements so we only have one cache miss.
+                if (m_justEditedTerrain)
+                {
+                    layerpack.Header.Reliable = false;
+                    OutPacket(layerpack,
+                               ThrottleOutPacketType.Unknown );
+                }
+                else
+                {
+                    layerpack.Header.Reliable = true;
+                    OutPacket(layerpack,
+                               ThrottleOutPacketType.Task);
+                }
             }
             catch (Exception e)
             {
@@ -1580,7 +1631,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             OutPacket(pc, ThrottleOutPacketType.Unknown);
         }
 
-        public void SendKillObject(ulong regionHandle, List<uint> localIDs)
+        public void SendKillObject(List<uint> localIDs)
         {
 //            foreach (uint id in localIDs)
 //                m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, id, regionHandle);
@@ -3797,6 +3848,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 ResendPrimUpdate(update);
         }
 
+//        OpenSim.Framework.Lazy<List<ObjectUpdatePacket.ObjectDataBlock>> objectUpdateBlocks = new OpenSim.Framework.Lazy<List<ObjectUpdatePacket.ObjectDataBlock>>();
+//        OpenSim.Framework.Lazy<List<ObjectUpdateCompressedPacket.ObjectDataBlock>> compressedUpdateBlocks = new OpenSim.Framework.Lazy<List<ObjectUpdateCompressedPacket.ObjectDataBlock>>();
+//        OpenSim.Framework.Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>> terseUpdateBlocks = new OpenSim.Framework.Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>>();
+//        OpenSim.Framework.Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>> terseAgentUpdateBlocks = new OpenSim.Framework.Lazy<List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>>();
+//
+//        OpenSim.Framework.Lazy<List<EntityUpdate>> objectUpdates = new OpenSim.Framework.Lazy<List<EntityUpdate>>();
+//        OpenSim.Framework.Lazy<List<EntityUpdate>> compressedUpdates = new OpenSim.Framework.Lazy<List<EntityUpdate>>();
+//        OpenSim.Framework.Lazy<List<EntityUpdate>> terseUpdates = new OpenSim.Framework.Lazy<List<EntityUpdate>>();
+//        OpenSim.Framework.Lazy<List<EntityUpdate>> terseAgentUpdates = new OpenSim.Framework.Lazy<List<EntityUpdate>>();
+
+
         private void ProcessEntityUpdates(int maxUpdates)
         {
             OpenSim.Framework.Lazy<List<ObjectUpdatePacket.ObjectDataBlock>> objectUpdateBlocks = new OpenSim.Framework.Lazy<List<ObjectUpdatePacket.ObjectDataBlock>>();
@@ -3809,6 +3871,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             OpenSim.Framework.Lazy<List<EntityUpdate>> terseUpdates = new OpenSim.Framework.Lazy<List<EntityUpdate>>();
             OpenSim.Framework.Lazy<List<EntityUpdate>> terseAgentUpdates = new OpenSim.Framework.Lazy<List<EntityUpdate>>();
 
+//            objectUpdateBlocks.Value.Clear();
+//            compressedUpdateBlocks.Value.Clear();
+//            terseUpdateBlocks.Value.Clear();
+//            terseAgentUpdateBlocks.Value.Clear();
+//            objectUpdates.Value.Clear();
+//            compressedUpdates.Value.Clear();
+//            terseUpdates.Value.Clear();
+//            terseAgentUpdates.Value.Clear();
+
             // Check to see if this is a flush
             if (maxUpdates <= 0)
             {
@@ -4137,8 +4208,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         void HandleQueueEmpty(ThrottleOutPacketTypeFlags categories)
         {
+//            if (!m_udpServer.IsRunningOutbound)
+//                return;
+
             if ((categories & ThrottleOutPacketTypeFlags.Task) != 0)
             {
+//                if (!m_udpServer.IsRunningOutbound)
+//                    return;
+
                 if (m_maxUpdates == 0 || m_LastQueueFill == 0)
                 {
                     m_maxUpdates = m_udpServer.PrimUpdatesPerCallback;
@@ -4164,6 +4241,27 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 ImageManager.ProcessImageQueue(m_udpServer.TextureSendLimit);
         }
 
+        internal bool HandleHasUpdates(ThrottleOutPacketTypeFlags categories)
+        {
+            bool hasUpdates = false;
+
+            if ((categories & ThrottleOutPacketTypeFlags.Task) != 0)
+            {
+                if (m_entityUpdates.Count > 0)
+                    hasUpdates = true;
+                else if (m_entityProps.Count > 0)
+                    hasUpdates = true;                   
+            }
+
+            if ((categories & ThrottleOutPacketTypeFlags.Texture) != 0)
+            {
+                if (ImageManager.HasUpdates())
+                    hasUpdates = true;
+            }
+
+            return hasUpdates;
+        }
+
         public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID)
         {
             AssetUploadCompletePacket newPack = new AssetUploadCompletePacket();
@@ -4874,7 +4972,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public void SendForceClientSelectObjects(List<uint> ObjectIDs)
         {
-            m_log.WarnFormat("[LLCLIENTVIEW] sending select with {0} objects", ObjectIDs.Count);
+//            m_log.DebugFormat("[LLCLIENTVIEW] sending select with {0} objects", ObjectIDs.Count);
             
             bool firstCall = true;
             const int MAX_OBJECTS_PER_PACKET = 251;
@@ -5031,7 +5129,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 SceneObjectPart part = (SceneObjectPart)entity;
 
                 attachPoint = part.ParentGroup.AttachmentPoint;
-
+                attachPoint = ((attachPoint % 16) * 16 + (attachPoint / 16));
 //                m_log.DebugFormat(
 //                    "[LLCLIENTVIEW]: Sending attachPoint {0} for {1} {2} to {3}",
 //                    attachPoint, part.Name, part.LocalId, Name);
@@ -5059,7 +5157,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             pos += 4;
 
             // Avatar/CollisionPlane
-            data[pos++] = (byte)((attachPoint % 16) * 16 + (attachPoint / 16)); ;
+            data[pos++] = (byte) attachPoint;
             if (avatar)
             {
                 data[pos++] = 1;
@@ -5384,7 +5482,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             AddLocalPacketHandler(PacketType.RezObject, HandlerRezObject);
             AddLocalPacketHandler(PacketType.DeRezObject, HandlerDeRezObject);
             AddLocalPacketHandler(PacketType.ModifyLand, HandlerModifyLand);
-            AddLocalPacketHandler(PacketType.RegionHandshakeReply, HandlerRegionHandshakeReply);
+            AddLocalPacketHandler(PacketType.RegionHandshakeReply, HandlerRegionHandshakeReply, false);
             AddLocalPacketHandler(PacketType.AgentWearablesRequest, HandlerAgentWearablesRequest);
             AddLocalPacketHandler(PacketType.AgentSetAppearance, HandlerAgentSetAppearance);
             AddLocalPacketHandler(PacketType.AgentIsNowWearing, HandlerAgentIsNowWearing);
@@ -5445,8 +5543,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             AddLocalPacketHandler(PacketType.ScriptAnswerYes, HandleScriptAnswerYes, false);
             AddLocalPacketHandler(PacketType.ObjectClickAction, HandleObjectClickAction, false);
             AddLocalPacketHandler(PacketType.ObjectMaterial, HandleObjectMaterial, false);
-            AddLocalPacketHandler(PacketType.RequestImage, HandleRequestImage);
-            AddLocalPacketHandler(PacketType.TransferRequest, HandleTransferRequest);
+            AddLocalPacketHandler(PacketType.RequestImage, HandleRequestImage, false);
+            AddLocalPacketHandler(PacketType.TransferRequest, HandleTransferRequest, false);
             AddLocalPacketHandler(PacketType.AssetUploadRequest, HandleAssetUploadRequest);
             AddLocalPacketHandler(PacketType.RequestXfer, HandleRequestXfer);
             AddLocalPacketHandler(PacketType.SendXferPacket, HandleSendXferPacket);
@@ -5478,7 +5576,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             AddLocalPacketHandler(PacketType.TeleportCancel, HandleTeleportCancel);
             AddLocalPacketHandler(PacketType.TeleportLocationRequest, HandleTeleportLocationRequest);
             AddLocalPacketHandler(PacketType.UUIDNameRequest, HandleUUIDNameRequest, false);
-            AddLocalPacketHandler(PacketType.RegionHandleRequest, HandleRegionHandleRequest);
+            AddLocalPacketHandler(PacketType.RegionHandleRequest, HandleRegionHandleRequest, false);
             AddLocalPacketHandler(PacketType.ParcelInfoRequest, HandleParcelInfoRequest);
             AddLocalPacketHandler(PacketType.ParcelAccessListRequest, HandleParcelAccessListRequest, false);
             AddLocalPacketHandler(PacketType.ParcelAccessListUpdate, HandleParcelAccessListUpdate, false);
@@ -5591,83 +5689,137 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         #region Packet Handlers
 
+        public int TotalAgentUpdates { get; set; }
+
         #region Scene/Avatar
 
-        private bool HandleAgentUpdate(IClientAPI sener, Packet packet)
+        // Threshold for body rotation to be a significant agent update
+        private const float QDELTA = 0.000001f;
+        // Threshold for camera rotation to be a significant agent update
+        private const float VDELTA = 0.01f;
+
+        /// <summary>
+        /// This checks the update significance against the last update made.
+        /// </summary>
+        /// <remarks>Can only be called by one thread at a time</remarks>
+        /// <returns></returns>
+        /// <param name='x'></param>
+        public bool CheckAgentUpdateSignificance(AgentUpdatePacket.AgentDataBlock x)
         {
-            if (OnAgentUpdate != null)
-            {
-                AgentUpdatePacket agentUpdate = (AgentUpdatePacket)packet;
+            return CheckAgentMovementUpdateSignificance(x) || CheckAgentCameraUpdateSignificance(x);
+        }
 
-                #region Packet Session and User Check
-                if (agentUpdate.AgentData.SessionID != SessionId || agentUpdate.AgentData.AgentID != AgentId)
-                {
-                    PacketPool.Instance.ReturnPacket(packet);
-                    return false;
-                }
-                #endregion
+        /// <summary>
+        /// This checks the movement/state update significance against the last update made.
+        /// </summary>
+        /// <remarks>Can only be called by one thread at a time</remarks>
+        /// <returns></returns>
+        /// <param name='x'></param>
+        private bool CheckAgentMovementUpdateSignificance(AgentUpdatePacket.AgentDataBlock x)
+        {
+            float qdelta1 = 1 - (float)Math.Pow(Quaternion.Dot(x.BodyRotation, m_thisAgentUpdateArgs.BodyRotation), 2);
+            //qdelta2 = 1 - (float)Math.Pow(Quaternion.Dot(x.HeadRotation, m_thisAgentUpdateArgs.HeadRotation), 2);
+
+            bool movementSignificant =
+                (qdelta1 > QDELTA)                                          // significant if body rotation above threshold
+                // Ignoring head rotation altogether, because it's not being used for anything interesting up the stack
+                // || (qdelta2 > QDELTA * 10)                               // significant if head rotation above threshold
+                || (x.ControlFlags != m_thisAgentUpdateArgs.ControlFlags)   // significant if control flags changed
+                || (x.ControlFlags != (byte)AgentManager.ControlFlags.NONE) // significant if user supplying any movement update commands
+                || (x.Far != m_thisAgentUpdateArgs.Far)                     // significant if far distance changed
+                || (x.Flags != m_thisAgentUpdateArgs.Flags)                 // significant if Flags changed
+                || (x.State != m_thisAgentUpdateArgs.State)                 // significant if Stats changed
+            ;
+            //if (movementSignificant)
+            //{
+                //m_log.DebugFormat("[LLCLIENTVIEW]: Bod {0} {1}",
+                //    qdelta1, qdelta2);
+                //m_log.DebugFormat("[LLCLIENTVIEW]: St {0} {1} {2} {3}",
+                //    x.ControlFlags, x.Flags, x.Far, x.State);
+            //}
+            return movementSignificant;
+        }
 
-                bool update = false;
-                AgentUpdatePacket.AgentDataBlock x = agentUpdate.AgentData;
-
-                if (m_lastAgentUpdateArgs != null)
-                {
-                    // These should be ordered from most-likely to
-                    // least likely to change. I've made an initial
-                    // guess at that.
-                    update =
-                       (
-                        (x.BodyRotation != m_lastAgentUpdateArgs.BodyRotation) ||
-                        (x.CameraAtAxis != m_lastAgentUpdateArgs.CameraAtAxis) ||
-                        (x.CameraCenter != m_lastAgentUpdateArgs.CameraCenter) ||
-                        (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) ||
-                        (x.HeadRotation != m_lastAgentUpdateArgs.HeadRotation) ||
-                        (x.SessionID != m_lastAgentUpdateArgs.SessionID) ||
-                        (x.AgentID != m_lastAgentUpdateArgs.AgentID)
-                       );
-                }
-                else
-                {
-                    m_lastAgentUpdateArgs = new AgentUpdateArgs();
-                    update = true;
-                }
+        /// <summary>
+        /// This checks the camera update significance against the last update made.
+        /// </summary>
+        /// <remarks>Can only be called by one thread at a time</remarks>
+        /// <returns></returns>
+        /// <param name='x'></param>
+        private bool CheckAgentCameraUpdateSignificance(AgentUpdatePacket.AgentDataBlock x)
+        {
+            float vdelta1 = Vector3.Distance(x.CameraAtAxis, m_thisAgentUpdateArgs.CameraAtAxis);
+            float vdelta2 = Vector3.Distance(x.CameraCenter, m_thisAgentUpdateArgs.CameraCenter);
+            float vdelta3 = Vector3.Distance(x.CameraLeftAxis, m_thisAgentUpdateArgs.CameraLeftAxis);
+            float vdelta4 = Vector3.Distance(x.CameraUpAxis, m_thisAgentUpdateArgs.CameraUpAxis);
 
-                if (update)
-                {
-//                    m_log.DebugFormat("[LLCLIENTVIEW]: Triggered AgentUpdate for {0}", sener.Name);
+            bool cameraSignificant =
+                (vdelta1 > VDELTA) ||
+                (vdelta2 > VDELTA) ||
+                (vdelta3 > VDELTA) ||
+                (vdelta4 > VDELTA)
+            ;
 
-                    m_lastAgentUpdateArgs.AgentID = x.AgentID;
-                    m_lastAgentUpdateArgs.BodyRotation = x.BodyRotation;
-                    m_lastAgentUpdateArgs.CameraAtAxis = x.CameraAtAxis;
-                    m_lastAgentUpdateArgs.CameraCenter = x.CameraCenter;
-                    m_lastAgentUpdateArgs.CameraLeftAxis = x.CameraLeftAxis;
-                    m_lastAgentUpdateArgs.CameraUpAxis = x.CameraUpAxis;
-                    m_lastAgentUpdateArgs.ControlFlags = x.ControlFlags;
-                    m_lastAgentUpdateArgs.Far = x.Far;
-                    m_lastAgentUpdateArgs.Flags = x.Flags;
-                    m_lastAgentUpdateArgs.HeadRotation = x.HeadRotation;
-                    m_lastAgentUpdateArgs.SessionID = x.SessionID;
-                    m_lastAgentUpdateArgs.State = x.State;
+            //if (cameraSignificant)
+            //{
+                //m_log.DebugFormat("[LLCLIENTVIEW]: Cam1 {0} {1}",
+                //    x.CameraAtAxis, x.CameraCenter);
+                //m_log.DebugFormat("[LLCLIENTVIEW]: Cam2 {0} {1}",
+                //    x.CameraLeftAxis, x.CameraUpAxis);
+            //}
 
-                    UpdateAgent handlerAgentUpdate = OnAgentUpdate;
-                    UpdateAgent handlerPreAgentUpdate = OnPreAgentUpdate;
+            return cameraSignificant;
+        }
 
-                    if (handlerPreAgentUpdate != null)
-                        OnPreAgentUpdate(this, m_lastAgentUpdateArgs);
+        private bool HandleAgentUpdate(IClientAPI sener, Packet packet)
+        {            
+            // We got here, which means that something in agent update was significant
 
-                    if (handlerAgentUpdate != null)
-                        OnAgentUpdate(this, m_lastAgentUpdateArgs);
+            AgentUpdatePacket agentUpdate = (AgentUpdatePacket)packet;
+            AgentUpdatePacket.AgentDataBlock x = agentUpdate.AgentData;
 
-                    handlerAgentUpdate = null;
-                    handlerPreAgentUpdate = null;
-                }
-            }
+            if (x.AgentID != AgentId || x.SessionID != SessionId)
+                return false;
+
+            // Before we update the current m_thisAgentUpdateArgs, let's check this again
+            // to see what exactly changed
+            bool movement = CheckAgentMovementUpdateSignificance(x);
+            bool camera = CheckAgentCameraUpdateSignificance(x);
+
+            m_thisAgentUpdateArgs.AgentID = x.AgentID;
+            m_thisAgentUpdateArgs.BodyRotation = x.BodyRotation;
+            m_thisAgentUpdateArgs.CameraAtAxis = x.CameraAtAxis;
+            m_thisAgentUpdateArgs.CameraCenter = x.CameraCenter;
+            m_thisAgentUpdateArgs.CameraLeftAxis = x.CameraLeftAxis;
+            m_thisAgentUpdateArgs.CameraUpAxis = x.CameraUpAxis;
+            m_thisAgentUpdateArgs.ControlFlags = x.ControlFlags;
+            m_thisAgentUpdateArgs.Far = x.Far;
+            m_thisAgentUpdateArgs.Flags = x.Flags;
+            m_thisAgentUpdateArgs.HeadRotation = x.HeadRotation;
+            m_thisAgentUpdateArgs.SessionID = x.SessionID;
+            m_thisAgentUpdateArgs.State = x.State;
+
+            UpdateAgent handlerAgentUpdate = OnAgentUpdate;
+            UpdateAgent handlerPreAgentUpdate = OnPreAgentUpdate;
+            UpdateAgent handlerAgentCameraUpdate = OnAgentCameraUpdate;
+
+            // Was there a significant movement/state change?
+            if (movement)
+            {
+                if (handlerPreAgentUpdate != null)
+                    OnPreAgentUpdate(this, m_thisAgentUpdateArgs);
+
+                if (handlerAgentUpdate != null)
+                    OnAgentUpdate(this, m_thisAgentUpdateArgs);
+            }
+            // Was there a significant camera(s) change?
+            if (camera)
+                if (handlerAgentCameraUpdate != null)
+                    handlerAgentCameraUpdate(this, m_thisAgentUpdateArgs);
+
+            handlerAgentUpdate = null;
+            handlerPreAgentUpdate = null;
+            handlerAgentCameraUpdate = null;
 
             PacketPool.Instance.ReturnPacket(packet);
 
@@ -6257,6 +6409,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             //m_log.Info("[LAND]: LAND:" + modify.ToString());
             if (modify.ParcelData.Length > 0)
             {
+                // Note: the ModifyTerrain event handler sends out updated packets before the end of this event.  Therefore, 
+                // a simple boolean value should work and perhaps queue up just a few terrain patch packets at the end of the edit.
+                m_justEditedTerrain = true; // Prevent terrain packet (Land layer) from being queued, make it unreliable
                 if (OnModifyTerrain != null)
                 {
                     for (int i = 0; i < modify.ParcelData.Length; i++)
@@ -6272,6 +6427,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         }
                     }
                 }
+                m_justEditedTerrain = false; // Queue terrain packet (Land layer) if necessary, make it reliable again
             }
 
             return true;
@@ -6633,6 +6789,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 }
                 #endregion
 
+                if (SceneAgent.IsChildAgent)
+                {
+                    SendCantSitBecauseChildAgentResponse();
+                    return true;
+                }
+
                 AgentRequestSit handlerAgentRequestSit = OnAgentRequestSit;
 
                 if (handlerAgentRequestSit != null)
@@ -6657,6 +6819,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 }
                 #endregion
 
+                if (SceneAgent.IsChildAgent)
+                {
+                    SendCantSitBecauseChildAgentResponse();
+                    return true;
+                }
+
                 AgentSit handlerAgentSit = OnAgentSit;
                 if (handlerAgentSit != null)
                 {
@@ -6666,6 +6834,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             return true;
         }
 
+        /// <summary>
+        /// Used when a child agent gets a sit response which should not be fulfilled.
+        /// </summary>
+        private void SendCantSitBecauseChildAgentResponse()
+        {
+            SendAlertMessage("Try moving closer.  Can't sit on object because it is not in the same region as you.");
+        }
+
         private bool HandleSoundTrigger(IClientAPI sender, Packet Pack)
         {
             SoundTriggerPacket soundTriggerPacket = (SoundTriggerPacket)Pack;
@@ -7876,129 +8052,145 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             //m_log.Debug("ClientView.ProcessPackets.cs:ProcessInPacket() - Got transfer request");
 
             TransferRequestPacket transfer = (TransferRequestPacket)Pack;
-            //m_log.Debug("Transfer Request: " + transfer.ToString());
-            // Validate inventory transfers
-            // Has to be done here, because AssetCache can't do it
-            //
             UUID taskID = UUID.Zero;
             if (transfer.TransferInfo.SourceType == (int)SourceType.SimInventoryItem)
             {
-                taskID = new UUID(transfer.TransferInfo.Params, 48);
-                UUID itemID = new UUID(transfer.TransferInfo.Params, 64);
-                UUID requestID = new UUID(transfer.TransferInfo.Params, 80);
-
-//                m_log.DebugFormat(
-//                    "[CLIENT]: Got request for asset {0} from item {1} in prim {2} by {3}",
-//                    requestID, itemID, taskID, Name);
-
                 if (!(((Scene)m_scene).Permissions.BypassPermissions()))
                 {
-                    if (taskID != UUID.Zero) // Prim
+                    // We're spawning a thread because the permissions check can block this thread
+                    Util.FireAndForget(delegate
                     {
-                        SceneObjectPart part = ((Scene)m_scene).GetSceneObjectPart(taskID);
+                        // This requests the asset if needed
+                        HandleSimInventoryTransferRequestWithPermsCheck(sender, transfer);
+                    });
+                    return true;
+                }
+            }
+            else if (transfer.TransferInfo.SourceType == (int)SourceType.SimEstate)
+            {
+                //TransferRequestPacket does not include covenant uuid?
+                //get scene covenant uuid
+                taskID = m_scene.RegionInfo.RegionSettings.Covenant;
+            }
 
-                        if (part == null)
-                        {
-                            m_log.WarnFormat(
-                                "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but prim does not exist",
-                                Name, requestID, itemID, taskID);
-                            return true;
-                        }
+            // This is non-blocking
+            MakeAssetRequest(transfer, taskID);
 
-                        TaskInventoryItem tii = part.Inventory.GetInventoryItem(itemID);
-                        if (tii == null)
-                        {
-                            m_log.WarnFormat(
-                                "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but item does not exist",
-                                Name, requestID, itemID, taskID);
-                            return true;
-                        }
+            return true;
+        }
 
-                        if (tii.Type == (int)AssetType.LSLText)
-                        {
-                            if (!((Scene)m_scene).Permissions.CanEditScript(itemID, taskID, AgentId))
-                                return true;
-                        }
-                        else if (tii.Type == (int)AssetType.Notecard)
-                        {
-                            if (!((Scene)m_scene).Permissions.CanEditNotecard(itemID, taskID, AgentId))
-                                return true;
-                        }
-                        else
-                        {
-                            // TODO: Change this code to allow items other than notecards and scripts to be successfully
-                            // shared with group.  In fact, this whole block of permissions checking should move to an IPermissionsModule
-                            if (part.OwnerID != AgentId)
-                            {
-                                m_log.WarnFormat(
-                                    "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but the prim is owned by {4}",
-                                    Name, requestID, itemID, taskID, part.OwnerID);
-                                return true;
-                            }
+        private void HandleSimInventoryTransferRequestWithPermsCheck(IClientAPI sender, TransferRequestPacket transfer)
+        {
+            UUID taskID = new UUID(transfer.TransferInfo.Params, 48);
+            UUID itemID = new UUID(transfer.TransferInfo.Params, 64);
+            UUID requestID = new UUID(transfer.TransferInfo.Params, 80);
 
-                            if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
-                            {
-                                m_log.WarnFormat(
-                                    "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but modify permissions are not set",
-                                    Name, requestID, itemID, taskID);
-                                return true;
-                            }
+            //m_log.DebugFormat(
+            //    "[CLIENT]: Got request for asset {0} from item {1} in prim {2} by {3}",
+            //    requestID, itemID, taskID, Name);
 
-                            if (tii.OwnerID != AgentId)
-                            {
-                                m_log.WarnFormat(
-                                    "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but the item is owned by {4}",
-                                    Name, requestID, itemID, taskID, tii.OwnerID);
-                                return true;
-                            }
+            //m_log.Debug("Transfer Request: " + transfer.ToString());
+            // Validate inventory transfers
+            // Has to be done here, because AssetCache can't do it
+            //
+            if (taskID != UUID.Zero) // Prim
+            {
+                SceneObjectPart part = ((Scene)m_scene).GetSceneObjectPart(taskID);
 
-                            if ((
-                                tii.CurrentPermissions & ((uint)PermissionMask.Modify | (uint)PermissionMask.Copy | (uint)PermissionMask.Transfer))
-                                    != ((uint)PermissionMask.Modify | (uint)PermissionMask.Copy | (uint)PermissionMask.Transfer))
-                            {
-                                m_log.WarnFormat(
-                                    "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but item permissions are not modify/copy/transfer",
-                                    Name, requestID, itemID, taskID);
-                                return true;
-                            }
+                if (part == null)
+                {
+                    m_log.WarnFormat(
+                        "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but prim does not exist",
+                        Name, requestID, itemID, taskID);
+                    return;
+                }
 
-                            if (tii.AssetID != requestID)
-                            {
-                                m_log.WarnFormat(
-                                    "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but this does not match item's asset {4}",
-                                    Name, requestID, itemID, taskID, tii.AssetID);
-                                return true;
-                            }
-                        }
+                TaskInventoryItem tii = part.Inventory.GetInventoryItem(itemID);
+                if (tii == null)
+                {
+                    m_log.WarnFormat(
+                        "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but item does not exist",
+                        Name, requestID, itemID, taskID);
+                    return;
+                }
+
+                if (tii.Type == (int)AssetType.LSLText)
+                {
+                    if (!((Scene)m_scene).Permissions.CanEditScript(itemID, taskID, AgentId))
+                        return;
+                }
+                else if (tii.Type == (int)AssetType.Notecard)
+                {
+                    if (!((Scene)m_scene).Permissions.CanEditNotecard(itemID, taskID, AgentId))
+                        return;
+                }
+                else
+                {
+                    // TODO: Change this code to allow items other than notecards and scripts to be successfully
+                    // shared with group.  In fact, this whole block of permissions checking should move to an IPermissionsModule
+                    if (part.OwnerID != AgentId)
+                    {
+                        m_log.WarnFormat(
+                            "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but the prim is owned by {4}",
+                            Name, requestID, itemID, taskID, part.OwnerID);
+                        return;
                     }
-                    else // Agent
+
+                    if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0)
                     {
-                        IInventoryAccessModule invAccess = m_scene.RequestModuleInterface<IInventoryAccessModule>();
-                        if (invAccess != null)
-                        {
-                            if (!invAccess.CanGetAgentInventoryItem(this, itemID, requestID))
-                                return false;
-                        }
-                        else
-                        {
-                            return false;
-                        }
+                        m_log.WarnFormat(
+                            "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but modify permissions are not set",
+                            Name, requestID, itemID, taskID);
+                        return;
+                    }
+
+                    if (tii.OwnerID != AgentId)
+                    {
+                        m_log.WarnFormat(
+                            "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but the item is owned by {4}",
+                            Name, requestID, itemID, taskID, tii.OwnerID);
+                        return;
+                    }
+
+                    if ((
+                        tii.CurrentPermissions & ((uint)PermissionMask.Modify | (uint)PermissionMask.Copy | (uint)PermissionMask.Transfer))
+                            != ((uint)PermissionMask.Modify | (uint)PermissionMask.Copy | (uint)PermissionMask.Transfer))
+                    {
+                        m_log.WarnFormat(
+                            "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but item permissions are not modify/copy/transfer",
+                            Name, requestID, itemID, taskID);
+                        return;
+                    }
+
+                    if (tii.AssetID != requestID)
+                    {
+                        m_log.WarnFormat(
+                            "[CLIENT]: {0} requested asset {1} from item {2} in prim {3} but this does not match item's asset {4}",
+                            Name, requestID, itemID, taskID, tii.AssetID);
+                        return;
                     }
                 }
             }
-            else
-                if (transfer.TransferInfo.SourceType == (int)SourceType.SimEstate)
+            else // Agent
+            {
+                IInventoryAccessModule invAccess = m_scene.RequestModuleInterface<IInventoryAccessModule>();
+                if (invAccess != null)
+                {
+                    if (!invAccess.CanGetAgentInventoryItem(this, itemID, requestID))
+                        return;
+                }
+                else
                 {
-                    //TransferRequestPacket does not include covenant uuid?
-                    //get scene covenant uuid
-                    taskID = m_scene.RegionInfo.RegionSettings.Covenant;
+                    return;
                 }
+            }
 
+            // Permissions out of the way, let's request the asset
             MakeAssetRequest(transfer, taskID);
 
-            return true;
         }
 
+
         private bool HandleAssetUploadRequest(IClientAPI sender, Packet Pack)
         {
             AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack;
@@ -11729,8 +11921,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         }
 
         /// <summary>
-        /// Send a response back to a client when it asks the asset server (via the region server) if it has
-        /// its appearance texture cached.
         /// </summary>
         /// <remarks>
         /// At the moment, we always reply that there is no cached texture.
@@ -11738,6 +11928,35 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name="simclient"></param>
         /// <param name="packet"></param>
         /// <returns></returns>
+        // TODO: Convert old handler to use new method
+        /*protected bool HandleAgentTextureCached(IClientAPI simclient, Packet packet)
+        {
+            AgentCachedTexturePacket cachedtex = (AgentCachedTexturePacket)packet;
+
+            if (cachedtex.AgentData.SessionID != SessionId)
+                return false;
+            
+
+            List<CachedTextureRequestArg> requestArgs = new List<CachedTextureRequestArg>();
+
+            for (int i = 0; i < cachedtex.WearableData.Length; i++)
+            {
+                CachedTextureRequestArg arg = new CachedTextureRequestArg();
+                arg.BakedTextureIndex = cachedtex.WearableData[i].TextureIndex;
+                arg.WearableHashID = cachedtex.WearableData[i].ID;
+                
+                requestArgs.Add(arg);
+            }
+
+            CachedTextureRequest handlerCachedTextureRequest = OnCachedTextureRequest;
+            if (handlerCachedTextureRequest != null)
+            {
+                handlerCachedTextureRequest(simclient,cachedtex.AgentData.SerialNum,requestArgs);
+            }
+
+            return true;
+        }*/
+
         protected bool HandleAgentTextureCached(IClientAPI simclient, Packet packet)
         {
             //m_log.Debug("texture cached: " + packet.ToString());
@@ -11896,6 +12115,40 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             return true;
         }
 
+        /// <summary>
+        /// Send a response back to a client when it asks the asset server (via the region server) if it has
+        /// its appearance texture cached.
+        /// </summary>
+        /// <param name="avatar"></param>
+        /// <param name="serial"></param>
+        /// <param name="cachedTextures"></param>
+        /// <returns></returns>
+        public void SendCachedTextureResponse(ISceneEntity avatar, int serial, List<CachedTextureResponseArg> cachedTextures)
+        {
+            ScenePresence presence = avatar as ScenePresence;
+            if (presence == null)
+                return;
+
+            AgentCachedTextureResponsePacket cachedresp = (AgentCachedTextureResponsePacket)PacketPool.Instance.GetPacket(PacketType.AgentCachedTextureResponse);
+
+            // TODO: don't create new blocks if recycling an old packet
+            cachedresp.AgentData.AgentID = m_agentId;
+            cachedresp.AgentData.SessionID = m_sessionId;
+            cachedresp.AgentData.SerialNum = serial;
+            cachedresp.WearableData = new AgentCachedTextureResponsePacket.WearableDataBlock[cachedTextures.Count];
+
+            for (int i = 0; i < cachedTextures.Count; i++)
+            {
+                cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
+                cachedresp.WearableData[i].TextureIndex = (byte)cachedTextures[i].BakedTextureIndex;
+                cachedresp.WearableData[i].TextureID = cachedTextures[i].BakedTextureID;
+                cachedresp.WearableData[i].HostName = new byte[0];
+            }
+
+            cachedresp.Header.Zerocoded = true;
+            OutPacket(cachedresp, ThrottleOutPacketType.Task);
+        }
+
         protected bool HandleMultipleObjUpdate(IClientAPI simClient, Packet packet)
         {
             MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket)packet;
@@ -11921,8 +12174,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     if (part == null)
                     {
                         // It's a ghost! tell the client to delete it from view.
-                        simClient.SendKillObject(Scene.RegionInfo.RegionHandle,
-                                                 new List<uint> { localId });
+                        simClient.SendKillObject(new List<uint> { localId });
                     }
                     else
                     {
@@ -12326,7 +12578,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             ClientInfo info = m_udpClient.GetClientInfo();
 
             info.proxyEP = null;
-            info.agentcircuit = RequestClientInfo();
+            if (info.agentcircuit == null)
+                info.agentcircuit = RequestClientInfo();
 
             return info;
         }
@@ -12709,11 +12962,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             OutPacket(dialog, ThrottleOutPacketType.Task);
         }
 
-        public void StopFlying(ISceneEntity p)
+        public void SendAgentTerseUpdate(ISceneEntity p)
         {
             if (p is ScenePresence)
             {
-                ScenePresence presence = p as ScenePresence;
                 // It turns out to get the agent to stop flying, you have to feed it stop flying velocities
                 // There's no explicit message to send the client to tell it to stop flying..   it relies on the
                 // velocity, collision plane and avatar height
@@ -12721,34 +12973,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 // Add 1/6 the avatar's height to it's position so it doesn't shoot into the air
                 // when the avatar stands up
 
-                Vector3 pos = presence.AbsolutePosition;
-
-                if (presence.Appearance.AvatarHeight != 127.0f)
-                    pos += new Vector3(0f, 0f, (presence.Appearance.AvatarHeight/6f));
-                else
-                    pos += new Vector3(0f, 0f, (1.56f/6f));
-
-                presence.AbsolutePosition = pos;
-
-                // attach a suitable collision plane regardless of the actual situation to force the LLClient to land.
-                // Collision plane below the avatar's position a 6th of the avatar's height is suitable.
-                // Mind you, that this method doesn't get called if the avatar's velocity magnitude is greater then a
-                // certain amount..   because the LLClient wouldn't land in that situation anyway.
-
-                // why are we still testing for this really old height value default???
-                if (presence.Appearance.AvatarHeight != 127.0f)
-                    presence.CollisionPlane = new Vector4(0, 0, 0, pos.Z - presence.Appearance.AvatarHeight/6f);
-                else
-                    presence.CollisionPlane = new Vector4(0, 0, 0, pos.Z - (1.56f/6f));
-
-
                 ImprovedTerseObjectUpdatePacket.ObjectDataBlock block =
                     CreateImprovedTerseBlock(p, false);
 
                 const float TIME_DILATION = 1.0f;
                 ushort timeDilation = Utils.FloatToUInt16(TIME_DILATION, 0.0f, 1.0f);
 
-
                 ImprovedTerseObjectUpdatePacket packet
                     = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(
                         PacketType.ImprovedTerseObjectUpdate);
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs
index 073c357..41dd4d1 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs
@@ -206,6 +206,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
         }
 
+        public bool HasUpdates()
+        {
+            J2KImage image = GetHighestPriorityImage();
+
+            return image != null && image.IsDecoded;
+        }
+
         public bool ProcessImageQueue(int packetsToSend)
         {
             int packetsSent = 0;
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
index e52ac37..d52ad7e 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
@@ -31,6 +31,7 @@ using System.Net;
 using System.Threading;
 using log4net;
 using OpenSim.Framework;
+using OpenSim.Framework.Monitoring;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
 
@@ -81,6 +82,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// hooked to put more data on the empty queue</summary>
         public event QueueEmpty OnQueueEmpty;
 
+        public event Func<ThrottleOutPacketTypeFlags, bool> HasUpdates;
+
         /// <summary>AgentID for this client</summary>
         public readonly UUID AgentID;
         /// <summary>The remote address of the connected client</summary>
@@ -160,6 +163,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         private int m_maxRTO = 60000;
         public bool m_deliverPackets = true;
 
+        private ClientInfo m_info = new ClientInfo();
+
         /// <summary>
         /// Default constructor
         /// </summary>
@@ -241,20 +246,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             // TODO: This data structure is wrong in so many ways. Locking and copying the entire lists
             // of pending and needed ACKs for every client every time some method wants information about
             // this connection is a recipe for poor performance
-            ClientInfo info = new ClientInfo();
-            info.pendingAcks = new Dictionary<uint, uint>();
-            info.needAck = new Dictionary<uint, byte[]>();
-
-            info.resendThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Resend].DripRate;
-            info.landThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Land].DripRate;
-            info.windThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Wind].DripRate;
-            info.cloudThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Cloud].DripRate;
-            info.taskThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Task].DripRate;
-            info.assetThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Asset].DripRate;
-            info.textureThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Texture].DripRate;
-            info.totalThrottle = (int)m_throttleCategory.DripRate;
-
-            return info;
+
+            m_info.resendThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Resend].DripRate;
+            m_info.landThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Land].DripRate;
+            m_info.windThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Wind].DripRate;
+            m_info.cloudThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Cloud].DripRate;
+            m_info.taskThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Task].DripRate;
+            m_info.assetThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Asset].DripRate;
+            m_info.textureThrottle = (int)m_throttleCategories[(int)ThrottleOutPacketType.Texture].DripRate;
+            m_info.totalThrottle = (int)m_throttleCategory.DripRate;
+
+            return m_info;
         }
 
         /// <summary>
@@ -646,15 +648,38 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name="categories">Throttle categories to fire the callback for</param>
         private void BeginFireQueueEmpty(ThrottleOutPacketTypeFlags categories)
         {
-            if (m_nextOnQueueEmpty != 0 && (Environment.TickCount & Int32.MaxValue) >= m_nextOnQueueEmpty)
+//            if (m_nextOnQueueEmpty != 0 && (Environment.TickCount & Int32.MaxValue) >= m_nextOnQueueEmpty)
+            if (!m_isQueueEmptyRunning && (Environment.TickCount & Int32.MaxValue) >= m_nextOnQueueEmpty)
             {
+                m_isQueueEmptyRunning = true;
+
+                int start = Environment.TickCount & Int32.MaxValue;
+                const int MIN_CALLBACK_MS = 30;
+
+                m_nextOnQueueEmpty = start + MIN_CALLBACK_MS;
+                if (m_nextOnQueueEmpty == 0)
+                    m_nextOnQueueEmpty = 1;
+
                 // Use a value of 0 to signal that FireQueueEmpty is running
-                m_nextOnQueueEmpty = 0;
-                // Asynchronously run the callback
-                Util.FireAndForget(FireQueueEmpty, categories);
+//                m_nextOnQueueEmpty = 0;
+
+                m_categories = categories;
+
+                if (HasUpdates(m_categories))
+                {
+                    // Asynchronously run the callback
+                    Util.FireAndForget(FireQueueEmpty, categories);
+                }
+                else
+                {
+                    m_isQueueEmptyRunning = false;
+                }
             }
         }
 
+        private bool m_isQueueEmptyRunning;
+        private ThrottleOutPacketTypeFlags m_categories = 0;
+
         /// <summary>
         /// Fires the OnQueueEmpty callback and sets the minimum time that it
         /// can be called again
@@ -664,22 +689,31 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// signature</param>
         private void FireQueueEmpty(object o)
         {
-            const int MIN_CALLBACK_MS = 30;
+//            int start = Environment.TickCount & Int32.MaxValue;
+//            const int MIN_CALLBACK_MS = 30;
 
-            ThrottleOutPacketTypeFlags categories = (ThrottleOutPacketTypeFlags)o;
-            QueueEmpty callback = OnQueueEmpty;
-            
-            int start = Environment.TickCount & Int32.MaxValue;
+//            if (m_udpServer.IsRunningOutbound)
+//            {        
+                ThrottleOutPacketTypeFlags categories = (ThrottleOutPacketTypeFlags)o;
+                QueueEmpty callback = OnQueueEmpty;                      
 
-            if (callback != null)
-            {
-                try { callback(categories); }
-                catch (Exception e) { m_log.Error("[LLUDPCLIENT]: OnQueueEmpty(" + categories + ") threw an exception: " + e.Message, e); }
-            }
+                if (callback != null)
+                {
+//                    if (m_udpServer.IsRunningOutbound)
+//                    {                
+                        try { callback(categories); }
+                        catch (Exception e) { m_log.Error("[LLUDPCLIENT]: OnQueueEmpty(" + categories + ") threw an exception: " + e.Message, e); }
+//                    }
+                }
+//            }
+
+//            m_nextOnQueueEmpty = start + MIN_CALLBACK_MS;
+//            if (m_nextOnQueueEmpty == 0)
+//                m_nextOnQueueEmpty = 1;
+
+//            }
 
-            m_nextOnQueueEmpty = start + MIN_CALLBACK_MS;
-            if (m_nextOnQueueEmpty == 0)
-                m_nextOnQueueEmpty = 1;
+            m_isQueueEmptyRunning = false;
         }
         internal void ForceThrottleSetting(int throttle, int setting)
         {
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 4154ef2..ad3f715 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -34,6 +34,7 @@ using System.Net.Sockets;
 using System.Reflection;
 using System.Threading;
 using log4net;
+using NDesk.Options;
 using Nini.Config;
 using OpenMetaverse.Packets;
 using OpenSim.Framework;
@@ -62,20 +63,41 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_udpServer = new LLUDPServer(listenIP, ref port, proxyPortOffsetParm, allow_alternate_port, configSource, circuitManager);
         }
 
-        public void NetworkStop()
-        {
-            m_udpServer.Stop();
-        }
-
         public void AddScene(IScene scene)
         {
             m_udpServer.AddScene(scene);
 
             StatsManager.RegisterStat(
                 new Stat(
+                    "ClientLogoutsDueToNoReceives",
+                    "Number of times a client has been logged out because no packets were received before the timeout.",
+                    "",
+                    "",
+                    "clientstack",
+                    scene.Name,
+                    StatType.Pull,
+                    MeasuresOfInterest.None,
+                    stat => stat.Value = m_udpServer.ClientLogoutsDueToNoReceives,
+                    StatVerbosity.Debug));
+
+            StatsManager.RegisterStat(
+                new Stat(
+                    "IncomingUDPReceivesCount",
+                    "Number of UDP receives performed",
+                    "",
+                    "",
+                    "clientstack",
+                    scene.Name,
+                    StatType.Pull,
+                    MeasuresOfInterest.AverageChangeOverTime,
+                    stat => stat.Value = m_udpServer.UdpReceives,
+                    StatVerbosity.Debug));
+
+            StatsManager.RegisterStat(
+                new Stat(
                     "IncomingPacketsProcessedCount",
-                    "Number of inbound UDP packets processed",
-                    "Number of inbound UDP packets processed",
+                    "Number of inbound LL protocol packets processed",
+                    "",
                     "",
                     "clientstack",
                     scene.Name,
@@ -83,6 +105,60 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     MeasuresOfInterest.AverageChangeOverTime,
                     stat => stat.Value = m_udpServer.IncomingPacketsProcessed,
                     StatVerbosity.Debug));
+
+            StatsManager.RegisterStat(
+                new Stat(
+                    "IncomingPacketsMalformedCount",
+                    "Number of inbound UDP packets that could not be recognized as LL protocol packets.",
+                    "",
+                    "",
+                    "clientstack",
+                    scene.Name,
+                    StatType.Pull,
+                    MeasuresOfInterest.AverageChangeOverTime,
+                    stat => stat.Value = m_udpServer.IncomingMalformedPacketCount,
+                    StatVerbosity.Info));
+
+            StatsManager.RegisterStat(
+                new Stat(
+                    "IncomingPacketsOrphanedCount",
+                    "Number of inbound packets that were not initial connections packets and could not be associated with a viewer.",
+                    "",
+                    "",
+                    "clientstack",
+                    scene.Name,
+                    StatType.Pull,
+                    MeasuresOfInterest.AverageChangeOverTime,
+                    stat => stat.Value = m_udpServer.IncomingOrphanedPacketCount,
+                    StatVerbosity.Info));
+
+            StatsManager.RegisterStat(
+                new Stat(
+                    "OutgoingUDPSendsCount",
+                    "Number of UDP sends performed",
+                    "",
+                    "",
+                    "clientstack",
+                    scene.Name,
+                    StatType.Pull,
+                    MeasuresOfInterest.AverageChangeOverTime,
+                    stat => stat.Value = m_udpServer.UdpSends,
+                    StatVerbosity.Debug));
+
+            StatsManager.RegisterStat(
+                new Stat(
+                    "AverageUDPProcessTime",
+                    "Average number of milliseconds taken to process each incoming UDP packet in a sample.",
+                    "This is for initial receive processing which is separate from the later client LL packet processing stage.",
+                    "ms",
+                    "clientstack",
+                    scene.Name,
+                    StatType.Pull,
+                    MeasuresOfInterest.None,
+                    stat => stat.Value = m_udpServer.AverageReceiveTicksForLastSamplePeriod / TimeSpan.TicksPerMillisecond,
+//                    stat => 
+//                        stat.Value = Math.Round(m_udpServer.AverageReceiveTicksForLastSamplePeriod / TimeSpan.TicksPerMillisecond, 7),
+                    StatVerbosity.Debug));
         }
 
         public bool HandlesRegion(Location x)
@@ -107,10 +183,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
     /// </summary>
     public class LLUDPServer : OpenSimUDPBase
     {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         /// <summary>Maximum transmission unit, or UDP packet size, for the LLUDP protocol</summary>
         public const int MTU = 1400;
 
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        /// <summary>Number of forced client logouts due to no receipt of packets before timeout.</summary>
+        public int ClientLogoutsDueToNoReceives { get; private set; }
+
+        /// <summary>
+        /// Default packet debug level given to new clients
+        /// </summary>
+        public int DefaultClientPacketDebugLevel { get; set; }
 
         /// <summary>The measured resolution of Environment.TickCount</summary>
         public readonly float TickCountResolution;
@@ -184,6 +268,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         protected bool m_sendPing;
 
         private ExpiringCache<IPEndPoint, Queue<UDPPacketBuffer>> m_pendingCache = new ExpiringCache<IPEndPoint, Queue<UDPPacketBuffer>>();
+
+        /// <summary>
+        /// Event used to signal when queued packets are available for sending.
+        /// </summary>
+        /// <remarks>
+        /// This allows the outbound loop to only operate when there is data to send rather than continuously polling.
+        /// Some data is sent immediately and not queued.  That data would not trigger this event.
+        /// </remarks>
+        private AutoResetEvent m_dataPresentEvent = new AutoResetEvent(false);
+
         private Pool<IncomingPacket> m_incomingPacketPool;
 
         /// <summary>
@@ -204,7 +298,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public Socket Server { get { return null; } }
 
-        private int m_malformedCount = 0; // Guard against a spamming attack
+        /// <summary>
+        /// Record how many inbound packets could not be recognized as LLUDP packets.
+        /// </summary>
+        public int IncomingMalformedPacketCount { get; private set; }
+
+        /// <summary>
+        /// Record how many inbound packets could not be associated with a simulator circuit.
+        /// </summary>
+        public int IncomingOrphanedPacketCount { get; private set; }
 
         /// <summary>
         /// Record current outgoing client for monitoring purposes.
@@ -461,6 +563,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_scene = (Scene)scene;
             m_location = new Location(m_scene.RegionInfo.RegionHandle);
 
+            StatsManager.RegisterStat(
+                new Stat(
+                    "InboxPacketsCount",
+                    "Number of LL protocol packets waiting for the second stage of processing after initial receive.",
+                    "Number of LL protocol packets waiting for the second stage of processing after initial receive.",
+                    "",
+                    "clientstack",
+                    scene.Name,
+                    StatType.Pull,
+                    MeasuresOfInterest.AverageChangeOverTime,
+                    stat => stat.Value = packetInbox.Count,
+                    StatVerbosity.Debug));
+
             // XXX: These stats are also pool stats but we register them separately since they are currently not
             // turned on and off by EnablePools()/DisablePools()
             StatsManager.RegisterStat(
@@ -521,6 +636,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 EnablePoolStats();
 
             MainConsole.Instance.Commands.AddCommand(
+                "Debug", false, "debug lludp packet",
+                 "debug lludp packet [--default] <level> [<avatar-first-name> <avatar-last-name>]",
+                 "Turn on packet debugging",
+                   "If level >  255 then all incoming and outgoing packets are logged.\n"
+                 + "If level <= 255 then incoming AgentUpdate and outgoing SimStats and SimulatorViewerTimeMessage packets are not logged.\n"
+                 + "If level <= 200 then incoming RequestImage and outgoing ImagePacket, ImageData, LayerData and CoarseLocationUpdate packets are not logged.\n"
+                 + "If level <= 100 then incoming ViewerEffect and AgentAnimation and outgoing ViewerEffect and AvatarAnimation packets are not logged.\n"
+                 + "If level <=  50 then outgoing ImprovedTerseObjectUpdate packets are not logged.\n"
+                 + "If level <= 0 then no packets are logged.\n"
+                 + "If --default is specified then the level becomes the default logging level for all subsequent agents.\n"
+                 + "In this case, you cannot also specify an avatar name.\n"
+                 + "If an avatar name is given then only packets from that avatar are logged.",
+                 HandlePacketCommand);
+
+            MainConsole.Instance.Commands.AddCommand(
                 "Debug",
                 false,
                 "debug lludp start",
@@ -559,10 +689,78 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 "debug lludp status",
                 "Return status of LLUDP packet processing.",
                 HandleStatusCommand);
+
+            MainConsole.Instance.Commands.AddCommand(
+                "Debug",
+                false,
+                "debug lludp toggle agentupdate",
+                "debug lludp toggle agentupdate",
+                "Toggle whether agentupdate packets are processed or simply discarded.",
+                HandleAgentUpdateCommand);
+        }
+
+        private void HandlePacketCommand(string module, string[] args)
+        {
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_scene)
+                return;
+
+            bool setAsDefaultLevel = false;
+            OptionSet optionSet = new OptionSet().Add("default", o => setAsDefaultLevel = o != null);
+            List<string> filteredArgs = optionSet.Parse(args);
+
+            string name = null;
+
+            if (filteredArgs.Count == 6)
+            {
+                if (!setAsDefaultLevel)
+                {
+                    name = string.Format("{0} {1}", filteredArgs[4], filteredArgs[5]);
+                }
+                else
+                {
+                    MainConsole.Instance.OutputFormat("ERROR: Cannot specify a user name when setting default logging level");
+                    return;
+                }
+            }
+
+            if (filteredArgs.Count > 3)
+            {
+                int newDebug;
+                if (int.TryParse(filteredArgs[3], out newDebug))
+                {
+                    if (setAsDefaultLevel)
+                    {
+                        DefaultClientPacketDebugLevel = newDebug;
+                        MainConsole.Instance.OutputFormat(
+                            "Debug packet debug for new clients set to {0} in {1}", DefaultClientPacketDebugLevel, m_scene.Name);
+                    }
+                    else
+                    {
+                        m_scene.ForEachScenePresence(sp =>
+                        {
+                            if (name == null || sp.Name == name)
+                            {
+                                MainConsole.Instance.OutputFormat(
+                                    "Packet debug for {0} ({1}) set to {2} in {3}",
+                                    sp.Name, sp.IsChildAgent ? "child" : "root", newDebug, m_scene.Name);
+
+                                sp.ControllingClient.DebugPacketLevel = newDebug;
+                            }
+                        });
+                    }
+                }
+                else
+                {
+                    MainConsole.Instance.Output("Usage: debug lludp packet [--default] 0..255 [<first-name> <last-name>]");
+                }
+            }
         }
 
         private void HandleStartCommand(string module, string[] args)
         {
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_scene)
+                return;
+
             if (args.Length != 4)
             {
                 MainConsole.Instance.Output("Usage: debug lludp start <in|out|all>");
@@ -580,6 +778,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         private void HandleStopCommand(string module, string[] args)
         {
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_scene)
+                return;
+
             if (args.Length != 4)
             {
                 MainConsole.Instance.Output("Usage: debug lludp stop <in|out|all>");
@@ -597,6 +798,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         private void HandlePoolCommand(string module, string[] args)
         {
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_scene)
+                return;
+
             if (args.Length != 4)
             {
                 MainConsole.Instance.Output("Usage: debug lludp pool <on|off>");
@@ -627,8 +831,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
         }
 
+        bool m_discardAgentUpdates;
+
+        private void HandleAgentUpdateCommand(string module, string[] args)
+        {
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_scene)
+                return;
+
+            m_discardAgentUpdates = !m_discardAgentUpdates;
+
+            MainConsole.Instance.OutputFormat(
+                "Discard AgentUpdates now {0} for {1}", m_discardAgentUpdates, m_scene.Name);
+        }
+
         private void HandleStatusCommand(string module, string[] args)
         {
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_scene)
+                return;
+
             MainConsole.Instance.OutputFormat(
                 "IN  LLUDP packet processing for {0} is {1}", m_scene.Name, IsRunningInbound ? "enabled" : "disabled");
 
@@ -636,6 +856,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 "OUT LLUDP packet processing for {0} is {1}", m_scene.Name, IsRunningOutbound ? "enabled" : "disabled");
 
             MainConsole.Instance.OutputFormat("LLUDP pools in {0} are {1}", m_scene.Name, UsePools ? "on" : "off");
+
+            MainConsole.Instance.OutputFormat(
+                "Packet debug level for new clients is {0}", DefaultClientPacketDebugLevel);
         }
 
         public bool HandlesRegion(Location x)
@@ -721,6 +944,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
 
             PacketPool.Instance.ReturnPacket(packet);
+
+            m_dataPresentEvent.Set();
         }
 
         /// <summary>
@@ -883,7 +1108,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 // Fire this out on a different thread so that we don't hold up outgoing packet processing for
                 // everybody else if this is being called due to an ack timeout.
                 // This is the same as processing as the async process of a logout request.
-                Util.FireAndForget(o => DeactivateClientDueToTimeout(client));
+                Util.FireAndForget(o => DeactivateClientDueToTimeout(client, timeoutTicks));
 
                 return;
             }
@@ -1002,6 +1227,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             outgoingPacket.TickCount = Environment.TickCount & Int32.MaxValue;
         }
 
+        private void RecordMalformedInboundPacket(IPEndPoint endPoint)
+        {
+//                if (m_malformedCount < 100)
+//                    m_log.DebugFormat("[LLUDPSERVER]: Dropped malformed packet: " + e.ToString());
+
+            IncomingMalformedPacketCount++;
+
+            if ((IncomingMalformedPacketCount % 10000) == 0)
+                m_log.WarnFormat(
+                    "[LLUDPSERVER]: Received {0} malformed packets so far, probable network attack.  Last was from {1}", 
+                    IncomingMalformedPacketCount, endPoint);
+        }
+
         public override void PacketReceived(UDPPacketBuffer buffer)
         {
             // Debugging/Profiling
@@ -1023,6 +1261,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 //                    "[LLUDPSERVER]: Dropping undersized packet with {0} bytes received from {1} in {2}",
 //                    buffer.DataLength, buffer.RemoteEndPoint, m_scene.RegionInfo.RegionName);
 
+                RecordMalformedInboundPacket(endPoint);
+
                 return; // Drop undersized packet
             }
 
@@ -1041,6 +1281,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 //                    "[LLUDPSERVER]: Dropping packet with malformed header received from {0} in {1}",
 //                    buffer.RemoteEndPoint, m_scene.RegionInfo.RegionName);
 
+                RecordMalformedInboundPacket(endPoint);
+
                 return; // Malformed header
             }
 
@@ -1056,34 +1298,23 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     // Only allocate a buffer for zerodecoding if the packet is zerocoded
                     ((buffer.Data[0] & Helpers.MSG_ZEROCODED) != 0) ? new byte[4096] : null);
             }
-            catch (MalformedDataException)
-            {
-            }
-            catch (IndexOutOfRangeException)
-            {
-//                m_log.WarnFormat(
-//                    "[LLUDPSERVER]: Dropping short packet received from {0} in {1}",
-//                    buffer.RemoteEndPoint, m_scene.RegionInfo.RegionName);
-
-                return; // Drop short packet
-            }
             catch (Exception e)
             {
-                if (m_malformedCount < 100)
+                if (IncomingMalformedPacketCount < 100)
                     m_log.DebugFormat("[LLUDPSERVER]: Dropped malformed packet: " + e.ToString());
-
-                m_malformedCount++;
-
-                if ((m_malformedCount % 100000) == 0)
-                    m_log.DebugFormat("[LLUDPSERVER]: Received {0} malformed packets so far, probable network attack.", m_malformedCount);
             }
 
             // Fail-safe check
             if (packet == null)
             {
-                m_log.ErrorFormat("[LLUDPSERVER]: Malformed data, cannot parse {0} byte packet from {1}:",
-                    buffer.DataLength, buffer.RemoteEndPoint);
-                m_log.Error(Utils.BytesToHexString(buffer.Data, buffer.DataLength, null));
+                if (IncomingMalformedPacketCount < 100)
+                {
+                    m_log.WarnFormat("[LLUDPSERVER]: Malformed data, cannot parse {0} byte packet from {1}, data {2}:",
+                        buffer.DataLength, buffer.RemoteEndPoint, Utils.BytesToHexString(buffer.Data, buffer.DataLength, null));
+                }
+
+                RecordMalformedInboundPacket(endPoint);
+
                 return;
             }
 
@@ -1127,12 +1358,33 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     queue.Enqueue(buffer);
                     return;
                 }
+                else if (packet.Type == PacketType.CompleteAgentMovement)
+                {
+                    // Send ack straight away to let the viewer know that we got it.
+                    SendAckImmediate(endPoint, packet.Header.Sequence);
+
+                    // 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(HandleCompleteMovementIntoRegion, array);
+
+                    return;
+                }
             }
 
             // Determine which agent this packet came from
             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);
+
+                IncomingOrphanedPacketCount++;
+
+                if ((IncomingOrphanedPacketCount % 10000) == 0)
+                    m_log.WarnFormat(
+                        "[LLUDPSERVER]: Received {0} orphaned packets so far.  Last was from {1}", 
+                        IncomingOrphanedPacketCount, endPoint);
+
                 return;
             }
 
@@ -1233,6 +1485,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             LogPacketHeader(true, udpClient.CircuitCode, 0, packet.Type, (ushort)packet.Length);
             #endregion BinaryStats
 
+            if (packet.Type == PacketType.AgentUpdate)
+            {
+                if (m_discardAgentUpdates)
+                    return;
+
+                ((LLClientView)client).TotalAgentUpdates++;
+
+                AgentUpdatePacket agentUpdate = (AgentUpdatePacket)packet;
+
+                LLClientView llClient = client as LLClientView;
+                if (agentUpdate.AgentData.SessionID != client.SessionId 
+                    || agentUpdate.AgentData.AgentID != client.AgentId
+                    || !(llClient == null || llClient.CheckAgentUpdateSignificance(agentUpdate.AgentData)) )
+                {
+                    PacketPool.Instance.ReturnPacket(packet);
+                    return;
+                }
+            }
+
             #region Ping Check Handling
 
             if (packet.Type == PacketType.StartPingCheck)
@@ -1421,7 +1692,13 @@ 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();
+                    {
+                        AgentCircuitData aCircuit = m_scene.AuthenticateHandler.GetAgentCircuitData(uccp.CircuitCode.Code);
+                        bool tp = (aCircuit.teleportFlags > 0);
+                        // Let's delay this for TP agents, otherwise the viewer doesn't know where to get resources from
+                        if (!tp)
+                            client.SceneAgent.SendInitialDataToMe();
+                    }
 
                     // Now we know we can handle more data
                     Thread.Sleep(200);
@@ -1476,6 +1753,72 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
         }
 
+        private void HandleCompleteMovementIntoRegion(object o)
+        {
+            IPEndPoint endPoint = null;
+            IClientAPI client = null;
+
+            try
+            {
+                object[] array = (object[])o;
+                endPoint = (IPEndPoint)array[0];
+                CompleteAgentMovementPacket packet = (CompleteAgentMovementPacket)array[1];
+
+                // Determine which agent this packet came from
+                int count = 20;
+                bool ready = false;
+                while (!ready && count-- > 0)
+                {
+                    if (m_scene.TryGetClient(endPoint, out client) && client.IsActive && client.SceneAgent != null)
+                    {
+                        LLClientView llClientView = (LLClientView)client;
+                        LLUDPClient udpClient = llClientView.UDPClient;
+                        if (udpClient != null && udpClient.IsConnected)
+                            ready = true;
+                        else
+                        {
+                            m_log.Debug("[LLUDPSERVER]: Received a CompleteMovementIntoRegion in " + m_scene.RegionInfo.RegionName + " (not ready yet)");
+                            Thread.Sleep(200);
+                        }
+                    }
+                    else
+                    {
+                        m_log.Debug("[LLUDPSERVER]: Received a CompleteMovementIntoRegion in " + m_scene.RegionInfo.RegionName + " (not ready yet)");
+                        Thread.Sleep(200);
+                    }
+                }
+
+                if (client == null)
+                    return;
+
+                IncomingPacket incomingPacket1;
+
+                // Inbox insertion
+                if (UsePools)
+                {
+                    incomingPacket1 = m_incomingPacketPool.GetObject();
+                    incomingPacket1.Client = (LLClientView)client;
+                    incomingPacket1.Packet = packet;
+                }
+                else
+                {
+                    incomingPacket1 = new IncomingPacket((LLClientView)client, packet);
+                }
+
+                packetInbox.Enqueue(incomingPacket1);
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat(
+                    "[LLUDPSERVER]: CompleteMovementIntoRegion handling from endpoint {0}, client {1} {2} failed.  Exception {3}{4}",
+                    endPoint != null ? endPoint.ToString() : "n/a",
+                    client != null ? client.Name : "unknown",
+                    client != null ? client.AgentId.ToString() : "unknown",
+                    e.Message,
+                    e.StackTrace);
+            }
+        }
+
         /// <summary>
         /// Send an ack immediately to the given endpoint.
         /// </summary>
@@ -1544,6 +1887,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
     
                     client = new LLClientView(m_scene, this, udpClient, sessionInfo, agentID, sessionID, circuitCode);
                     client.OnLogout += LogoutHandler;
+                    client.DebugPacketLevel = DefaultClientPacketDebugLevel;
     
                     ((LLClientView)client).DisableFacelights = m_disableFacelights;
     
@@ -1562,21 +1906,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// regular client pings.
         /// </remarks>
         /// <param name='client'></param>
-        private void DeactivateClientDueToTimeout(LLClientView client)
+        /// <param name='timeoutTicks'></param>
+        private void DeactivateClientDueToTimeout(LLClientView client, int timeoutTicks)
         {
             lock (client.CloseSyncLock)
-            {
+            {    
+                ClientLogoutsDueToNoReceives++;
+
                 m_log.WarnFormat(
-                    "[LLUDPSERVER]: Ack timeout, disconnecting {0} agent for {1} in {2}",
-                    client.SceneAgent.IsChildAgent ? "child" : "root", client.Name, m_scene.RegionInfo.RegionName);
-    
-                StatsManager.SimExtraStats.AddAbnormalClientThreadTermination();
+                    "[LLUDPSERVER]: No packets received from {0} agent of {1} for {2}ms in {3}.  Disconnecting.",
+                    client.SceneAgent.IsChildAgent ? "child" : "root", client.Name, timeoutTicks, m_scene.Name);
     
                 if (!client.SceneAgent.IsChildAgent)
-                     client.Kick("Simulator logged you out due to connection timeout");
-    
-                client.CloseWithoutChecks(true);
+                     client.Kick("Simulator logged you out due to connection timeout.");
             }
+
+            m_scene.IncomingCloseAgent(client.AgentId, true);
         }
 
         private void IncomingPacketHandler()
@@ -1592,6 +1937,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 {
                     IncomingPacket incomingPacket = null;
 
+                    /*
                     // HACK: This is a test to try and rate limit packet handling on Mono.
                     // If it works, a more elegant solution can be devised
                     if (Util.FireAndForgetCount() < 2)
@@ -1599,6 +1945,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         //m_log.Debug("[LLUDPSERVER]: Incoming packet handler is sleeping");
                         Thread.Sleep(30);
                     }
+                     */
 
                     if (packetInbox.Dequeue(100, ref incomingPacket))
                     {
@@ -1694,8 +2041,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                     // If nothing was sent, sleep for the minimum amount of time before a
                     // token bucket could get more tokens
+                    //if (!m_packetSent)
+                    //    Thread.Sleep((int)TickCountResolution);
+                    //
+                    // Instead, now wait for data present to be explicitly signalled.  Evidence so far is that with
+                    // modern mono it reduces CPU base load since there is no more continuous polling.
                     if (!m_packetSent)
-                        Thread.Sleep((int)TickCountResolution);
+                        m_dataPresentEvent.WaitOne(100);
 
                     Watchdog.UpdateThread();
                 }
@@ -1912,7 +2264,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             if (!client.IsLoggingOut)
             {
                 client.IsLoggingOut = true;
-                client.Close(false, false);
+                m_scene.IncomingCloseAgent(client.AgentId, false);
             }
         }
     }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
index 7035e38..48c5b37 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
@@ -78,6 +78,36 @@ namespace OpenMetaverse
         public bool IsRunningOutbound { get; private set; }
 
         /// <summary>
+        /// Number of UDP receives.
+        /// </summary>
+        public int UdpReceives { get; private set; }
+
+        /// <summary>
+        /// Number of UDP sends
+        /// </summary>
+        public int UdpSends { get; private set; }
+
+        /// <summary>
+        /// Number of receives over which to establish a receive time average.
+        /// </summary>
+        private readonly static int s_receiveTimeSamples = 500;
+
+        /// <summary>
+        /// Current number of samples taken to establish a receive time average.
+        /// </summary>
+        private int m_currentReceiveTimeSamples;
+
+        /// <summary>
+        /// Cumulative receive time for the sample so far.
+        /// </summary>
+        private int m_receiveTicksInCurrentSamplePeriod;
+
+        /// <summary>
+        /// The average time taken for each require receive in the last sample.
+        /// </summary>
+        public float AverageReceiveTicksForLastSamplePeriod { get; private set; }
+
+        /// <summary>
         /// Default constructor
         /// </summary>
         /// <param name="bindAddress">Local IP address to bind the server to</param>
@@ -111,6 +141,8 @@ namespace OpenMetaverse
 
             if (!IsRunningInbound)
             {
+                m_log.DebugFormat("[UDPBASE]: Starting inbound UDP loop");
+
                 const int SIO_UDP_CONNRESET = -1744830452;
 
                 IPEndPoint ipep = new IPEndPoint(m_localBindAddress, m_udpPort);
@@ -151,6 +183,8 @@ namespace OpenMetaverse
         /// </summary>
         public void StartOutbound()
         {
+            m_log.DebugFormat("[UDPBASE]: Starting outbound UDP loop");
+
             IsRunningOutbound = true;
         }
 
@@ -158,10 +192,8 @@ namespace OpenMetaverse
         {
             if (IsRunningInbound)
             {
-                // wait indefinitely for a writer lock.  Once this is called, the .NET runtime
-                // will deny any more reader locks, in effect blocking all other send/receive
-                // threads.  Once we have the lock, we set IsRunningInbound = false to inform the other
-                // threads that the socket is closed.
+                m_log.DebugFormat("[UDPBASE]: Stopping inbound UDP loop");
+
                 IsRunningInbound = false;
                 m_udpSocket.Close();
             }
@@ -169,6 +201,8 @@ namespace OpenMetaverse
 
         public void StopOutbound()
         {
+            m_log.DebugFormat("[UDPBASE]: Stopping outbound UDP loop");
+
             IsRunningOutbound = false;
         }
 
@@ -267,6 +301,8 @@ namespace OpenMetaverse
             // to AsyncBeginReceive
             if (IsRunningInbound)
             {
+                UdpReceives++;
+
                 // Asynchronous mode will start another receive before the
                 // callback for this packet is even fired. Very parallel :-)
                 if (m_asyncPacketHandling)
@@ -278,6 +314,8 @@ namespace OpenMetaverse
 
                 try
                 {
+                    int startTick = Util.EnvironmentTickCount();
+
                     // get the length of data actually read from the socket, store it with the
                     // buffer
                     buffer.DataLength = m_udpSocket.EndReceiveFrom(iar, ref buffer.RemoteEndPoint);
@@ -285,6 +323,23 @@ namespace OpenMetaverse
                     // call the abstract method PacketReceived(), passing the buffer that
                     // has just been filled from the socket read.
                     PacketReceived(buffer);
+
+                    // If more than one thread can be calling AsyncEndReceive() at once (e.g. if m_asyncPacketHandler)
+                    // then a particular stat may be inaccurate due to a race condition.  We won't worry about this
+                    // since this should be rare and  won't cause a runtime problem.
+                    if (m_currentReceiveTimeSamples >= s_receiveTimeSamples)
+                    {
+                        AverageReceiveTicksForLastSamplePeriod 
+                            = (float)m_receiveTicksInCurrentSamplePeriod / s_receiveTimeSamples;
+
+                        m_receiveTicksInCurrentSamplePeriod = 0;
+                        m_currentReceiveTimeSamples = 0;
+                    }
+                    else
+                    {
+                        m_receiveTicksInCurrentSamplePeriod += Util.EnvironmentTickCountSubtract(startTick);
+                        m_currentReceiveTimeSamples++;
+                    }
                 }
                 catch (SocketException) { }
                 catch (ObjectDisposedException) { }
@@ -298,14 +353,13 @@ namespace OpenMetaverse
                     if (!m_asyncPacketHandling)
                         AsyncBeginReceive();
                 }
-
             }
         }
 
         public void AsyncBeginSend(UDPPacketBuffer buf)
         {
-            if (IsRunningOutbound)
-            {
+//            if (IsRunningOutbound)
+//            {
                 try
                 {
                     m_udpSocket.BeginSendTo(
@@ -319,7 +373,7 @@ namespace OpenMetaverse
                 }
                 catch (SocketException) { }
                 catch (ObjectDisposedException) { }
-            }
+//            }
         }
 
         void AsyncEndSend(IAsyncResult result)
@@ -328,6 +382,8 @@ namespace OpenMetaverse
             {
 //                UDPPacketBuffer buf = (UDPPacketBuffer)result.AsyncState;
                 m_udpSocket.EndSendTo(result);
+
+                UdpSends++;
             }
             catch (SocketException) { }
             catch (ObjectDisposedException) { }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/PacketPool.cs b/OpenSim/Region/ClientStack/Linden/UDP/PacketPool.cs
index 1fdc410..5a2bcee 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/PacketPool.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/PacketPool.cs
@@ -145,39 +145,32 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             return packet;
         }
 
-        // private byte[] decoded_header = new byte[10];
         private static PacketType GetType(byte[] bytes)
         {
-            byte[] decoded_header = new byte[10 + 8];
             ushort id;
             PacketFrequency freq;
+            bool isZeroCoded = (bytes[0] & Helpers.MSG_ZEROCODED) != 0;
 
-            if ((bytes[0] & Helpers.MSG_ZEROCODED) != 0)
+            if (bytes[6] == 0xFF)
             {
-                Helpers.ZeroDecode(bytes, 16, decoded_header);
-            }
-            else
-            {
-                Buffer.BlockCopy(bytes, 0, decoded_header, 0, 10);
-            }
-
-            if (decoded_header[6] == 0xFF)
-            {
-                if (decoded_header[7] == 0xFF)
+                if (bytes[7] == 0xFF)
                 {
-                    id = (ushort) ((decoded_header[8] << 8) + decoded_header[9]);
                     freq = PacketFrequency.Low;
+                    if (isZeroCoded && bytes[8] == 0)
+                        id = bytes[10];
+                    else
+                        id = (ushort)((bytes[8] << 8) + bytes[9]);
                 }
                 else
                 {
-                    id = decoded_header[7];
                     freq = PacketFrequency.Medium;
+                    id = bytes[7];
                 }
             }
             else
             {
-                id = decoded_header[6];
                 freq = PacketFrequency.High;
+                id = bytes[6];
             }
 
             return Packet.GetType(id, freq);
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
index 556df30..9700224 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
@@ -33,6 +33,7 @@ using NUnit.Framework;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
 using OpenSim.Framework;
+using OpenSim.Framework.Monitoring;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Tests.Common;
 using OpenSim.Tests.Common.Mock;
@@ -69,6 +70,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
         {
             base.SetUp();
             m_scene = new SceneHelpers().SetupScene();
+            StatsManager.SimExtraStats = new SimExtraStatsCollector();
         }
         
         /// <summary>
@@ -198,7 +200,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
         public void TestLogoutClientDueToAck()
         {
             TestHelpers.InMethod();
-//            TestHelpers.EnableLogging();
+            TestHelpers.EnableLogging();
 
             IniConfigSource ics = new IniConfigSource();
             IConfig config = ics.AddConfig("ClientStack.LindenUDP");
@@ -210,8 +212,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 
             ScenePresence spAfterAckTimeout = m_scene.GetScenePresence(sp.UUID);
             Assert.That(spAfterAckTimeout, Is.Null);
-
-//            TestHelpers.DisableLogging();
         }
 
 //        /// <summary>
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs
index 7d9f581..575e54c 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs
@@ -29,6 +29,7 @@ using System;
 using System.IO;
 using System.Net;
 using System.Reflection;
+using System.Threading;
 using log4net.Config;
 using Nini.Config;
 using NUnit.Framework;
@@ -53,6 +54,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
         [TestFixtureSetUp]
         public void FixtureInit()
         {
+            // Don't allow tests to be bamboozled by asynchronous events.  Execute everything on the same thread.
+            Util.FireAndForgetMethod = FireAndForgetMethod.None;
+
             using (
                 Stream resource
                     = GetType().Assembly.GetManifestResourceStream(
@@ -72,9 +76,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             }
         }
 
+        [TestFixtureTearDown]
+        public void TearDown()
+        {
+            // We must set this back afterwards, otherwise later tests will fail since they're expecting multiple
+            // threads.  Possibly, later tests should be rewritten not to worry about such things.
+            Util.FireAndForgetMethod = Util.DefaultFireAndForgetMethod;
+        }
+
         [SetUp]
-        public void SetUp()
+        public override void SetUp()
         {
+            base.SetUp();
+
             UUID userId = TestHelpers.ParseTail(0x3);
 
             J2KDecoderModule j2kdm = new J2KDecoderModule();
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
index 3764685..d9b0eff 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
@@ -166,7 +166,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
 
                 // Do Decode!
                 if (decode)
-                    Decode(assetID, j2kData);
+                    Util.FireAndForget(delegate { Decode(assetID, j2kData); });
             }
         }
 
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 6495f3f..95cc6b7 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using System.IO;
+using System.Threading;
 using System.Xml;
 using log4net;
 using Mono.Addins;
@@ -51,6 +52,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public int DebugLevel { get; set; }
+
+        /// <summary>
+        /// Period to sleep per 100 prims in order to avoid CPU spikes when an avatar with many attachments logs in/changes
+        /// outfit or many avatars with a medium levels of attachments login/change outfit simultaneously.
+        /// </summary>
+        /// <remarks>
+        /// A value of 0 will apply no pause.  The pause is specified in milliseconds.
+        /// </remarks>
+        public int ThrottlePer100PrimsRezzed { get; set; }
         
         private Scene m_scene;
         private IInventoryAccessModule m_invAccessModule;
@@ -67,18 +77,26 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         {
             IConfig config = source.Configs["Attachments"];
             if (config != null)
+            {
                 Enabled = config.GetBoolean("Enabled", true);
+
+                ThrottlePer100PrimsRezzed = config.GetInt("ThrottlePer100PrimsRezzed", 0);
+            }
             else
+            {
                 Enabled = true;
+            }
         }
         
         public void AddRegion(Scene scene)
         {
             m_scene = scene;
-            m_scene.RegisterModuleInterface<IAttachmentsModule>(this);
-
             if (Enabled)
             {
+                // Only register module with scene if it is enabled. All callers check for a null attachments module.
+                // Ideally, there should be a null attachments module for when this core attachments module has been 
+                // disabled. Registering only when enabled allows for other attachments module implementations.
+                m_scene.RegisterModuleInterface<IAttachmentsModule>(this);
                 m_scene.EventManager.OnNewClient += SubscribeToClientEvents;
                 m_scene.EventManager.OnStartScript += (localID, itemID) => HandleScriptStateChange(localID, true);
                 m_scene.EventManager.OnStopScript += (localID, itemID) => HandleScriptStateChange(localID, false);
@@ -86,24 +104,43 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 MainConsole.Instance.Commands.AddCommand(
                     "Debug",
                     false,
-                    "debug attachments",
-                    "debug attachments [0|1]",
-                    "Turn on attachments debugging\n"
-                        + "  <= 0 - turns off debugging\n"
-                        + "  >= 1 - turns on attachment message logging\n",
-                    HandleDebugAttachments);
+                    "debug attachments log",
+                    "debug attachments log [0|1]",
+                    "Turn on attachments debug logging",
+                    "  <= 0 - turns off debug logging\n"
+                        + "  >= 1 - turns on attachment message debug logging",
+                    HandleDebugAttachmentsLog);
+
+                MainConsole.Instance.Commands.AddCommand(
+                    "Debug",
+                    false,
+                    "debug attachments throttle",
+                    "debug attachments throttle <ms>",
+                    "Turn on attachments throttling.",
+                    "This requires a millisecond value.  " +
+                    "  == 0 - disable throttling.\n"
+                        + "  > 0 - sleeps for this number of milliseconds per 100 prims rezzed.",
+                    HandleDebugAttachmentsThrottle);
+
+                MainConsole.Instance.Commands.AddCommand(
+                    "Debug",
+                    false,
+                    "debug attachments status",
+                    "debug attachments status",
+                    "Show current attachments debug status",
+                    HandleDebugAttachmentsStatus);
             }
 
             // TODO: Should probably be subscribing to CloseClient too, but this doesn't yet give us IClientAPI
         }
 
-        private void HandleDebugAttachments(string module, string[] args)
+        private void HandleDebugAttachmentsLog(string module, string[] args)
         {
             int debugLevel;
 
-            if (!(args.Length == 3 && int.TryParse(args[2], out debugLevel)))
+            if (!(args.Length == 4 && int.TryParse(args[3], out debugLevel)))
             {
-                MainConsole.Instance.OutputFormat("Usage: debug attachments [0|1]");
+                MainConsole.Instance.OutputFormat("Usage: debug attachments log [0|1]");
             }
             else
             {
@@ -113,6 +150,29 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             }
         }
 
+        private void HandleDebugAttachmentsThrottle(string module, string[] args)
+        {
+            int ms;
+
+            if (args.Length == 4 && int.TryParse(args[3], out ms))
+            {
+                ThrottlePer100PrimsRezzed = ms;
+                MainConsole.Instance.OutputFormat(
+                    "Attachments rez throttle per 100 prims is now {0} in {1}", ThrottlePer100PrimsRezzed, m_scene.Name);
+
+                return;
+            }
+
+            MainConsole.Instance.OutputFormat("Usage: debug attachments throttle <ms>");
+        }
+
+        private void HandleDebugAttachmentsStatus(string module, string[] args)
+        {
+            MainConsole.Instance.OutputFormat("Settings for {0}", m_scene.Name);
+            MainConsole.Instance.OutputFormat("Debug logging level: {0}", DebugLevel);
+            MainConsole.Instance.OutputFormat("Throttle per 100 prims: {0}ms", ThrottlePer100PrimsRezzed);
+        }
+
         /// <summary>
         /// Listen for client triggered running state changes so that we can persist the script's object if necessary.
         /// </summary>
@@ -273,7 +333,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             List<AvatarAttachment> attachments = sp.Appearance.GetAttachments();
             foreach (AvatarAttachment attach in attachments)
             {
-                uint p = (uint)attach.AttachPoint;
+                uint attachmentPt = (uint)attach.AttachPoint;
 
 //                m_log.DebugFormat(
 //                    "[ATTACHMENTS MODULE]: Doing initial rez of attachment with itemID {0}, assetID {1}, point {2} for {3} in {4}",
@@ -302,13 +362,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     // If we're an NPC then skip all the item checks and manipulations since we don't have an
                     // inventory right now.
                     RezSingleAttachmentFromInventoryInternal(
-                        sp, sp.PresenceType == PresenceType.Npc ? UUID.Zero : attach.ItemID, attach.AssetID, p, true, d);
+                        sp, sp.PresenceType == PresenceType.Npc ? UUID.Zero : attach.ItemID, attach.AssetID, attachmentPt, true, d);
                 }
                 catch (Exception e)
                 {
                     UUID agentId = (sp.ControllingClient == null) ? (UUID)null : sp.ControllingClient.AgentId;
                     m_log.ErrorFormat("[ATTACHMENTS MODULE]: Unable to rez attachment with itemID {0}, assetID {1}, point {2} for {3}: {4}\n{5}",
-                        attach.ItemID, attach.AssetID, p, agentId, e.Message, e.StackTrace);
+                        attach.ItemID, attach.AssetID, attachmentPt, agentId, e.Message, e.StackTrace);
                 }
             }
         }
@@ -841,7 +901,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                     m_scene.ForEachClient(
                         client =>
                             { if (client.AgentId != so.AttachedAvatar)
-                                client.SendKillObject(m_scene.RegionInfo.RegionHandle, new List<uint>() { so.LocalId });
+                                client.SendKillObject(new List<uint>() { so.LocalId });
                             });
                 }
 
@@ -982,8 +1042,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
             if (DebugLevel > 0)
                 m_log.DebugFormat(
-                    "[ATTACHMENTS MODULE]: Rezzed single object {0} for attachment to {1} on point {2} in {3}",
-                    objatt.Name, sp.Name, attachmentPt, m_scene.Name);
+                    "[ATTACHMENTS MODULE]: Rezzed single object {0} with {1} prims for attachment to {2} on point {3} in {4}",
+                    objatt.Name, objatt.PrimCount, sp.Name, attachmentPt, m_scene.Name);
 
             // HasGroupChanged is being set from within RezObject.  Ideally it would be set by the caller.
             objatt.HasGroupChanged = false;
@@ -1020,7 +1080,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             }
 
             if (tainted)
-                objatt.HasGroupChanged = true;
+                objatt.HasGroupChanged = true;           
+
+            if (ThrottlePer100PrimsRezzed > 0)
+            {
+                int throttleMs = (int)Math.Round((float)objatt.PrimCount / 100 * ThrottlePer100PrimsRezzed);
+
+                if (DebugLevel > 0)
+                    m_log.DebugFormat(
+                        "[ATTACHMENTS MODULE]: Throttling by {0}ms after rez of {1} with {2} prims for attachment to {3} on point {4} in {5}",
+                        throttleMs, objatt.Name, objatt.PrimCount, sp.Name, attachmentPt, m_scene.Name);
+
+                Thread.Sleep(throttleMs);
+            }
 
             return objatt;
         }
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
index 1a38619..62acd78 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
@@ -38,6 +38,8 @@ using NUnit.Framework;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.CoreModules.Avatar.Attachments;
 using OpenSim.Region.CoreModules.Framework;
 using OpenSim.Region.CoreModules.Framework.EntityTransfer;
@@ -797,11 +799,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
         }
 
         [Test]
-        public void TestSameSimulatorNeighbouringRegionsTeleport()
+        public void TestSameSimulatorNeighbouringRegionsTeleportV1()
         {
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
 
+            BaseHttpServer httpServer = new BaseHttpServer(99999);
+            MainServer.AddHttpServer(httpServer);
+            MainServer.Instance = httpServer;
+
             AttachmentsModule attModA = new AttachmentsModule();
             AttachmentsModule attModB = new AttachmentsModule();
             EntityTransferModule etmA = new EntityTransferModule();
@@ -830,14 +836,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             SceneHelpers.SetupSceneModules(
                 sceneB, config, new CapabilitiesModule(), etmB, attModB, new BasicInventoryAccessModule());
 
+            // FIXME: Hack - this is here temporarily to revert back to older entity transfer behaviour
+            lscm.ServiceVersion = "SIMULATION/0.1";
+
             UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(sceneA, 0x1);
 
             AgentCircuitData acd = SceneHelpers.GenerateAgentData(ua1.PrincipalID);
-            TestClient tc = new TestClient(acd, sceneA, sh.SceneManager);
+            TestClient tc = new TestClient(acd, sceneA);
             List<TestClient> destinationTestClients = new List<TestClient>();
-            EntityTransferHelpers.SetUpInformClientOfNeighbour(tc, destinationTestClients);
+            EntityTransferHelpers.SetupInformClientOfNeighbourTriggersNeighbourClientCreate(tc, destinationTestClients);
 
-            ScenePresence beforeTeleportSp = SceneHelpers.AddScenePresence(sceneA, tc, acd, sh.SceneManager);
+            ScenePresence beforeTeleportSp = SceneHelpers.AddScenePresence(sceneA, tc, acd);
             beforeTeleportSp.AbsolutePosition = new Vector3(30, 31, 32);
 
             InventoryItemBase attItem = CreateAttachmentItem(sceneA, ua1.PrincipalID, "att", 0x10, 0x20);
@@ -895,5 +904,115 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
             // Check events
             Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(0));
         }
+
+        [Test]
+        public void TestSameSimulatorNeighbouringRegionsTeleportV2()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            BaseHttpServer httpServer = new BaseHttpServer(99999);
+            MainServer.AddHttpServer(httpServer);
+            MainServer.Instance = httpServer;
+
+            AttachmentsModule attModA = new AttachmentsModule();
+            AttachmentsModule attModB = new AttachmentsModule();
+            EntityTransferModule etmA = new EntityTransferModule();
+            EntityTransferModule etmB = new EntityTransferModule();
+            LocalSimulationConnectorModule lscm = new LocalSimulationConnectorModule();
+
+            IConfigSource config = new IniConfigSource();
+            IConfig modulesConfig = config.AddConfig("Modules");
+            modulesConfig.Set("EntityTransferModule", etmA.Name);
+            modulesConfig.Set("SimulationServices", lscm.Name);
+
+            modulesConfig.Set("InventoryAccessModule", "BasicInventoryAccessModule");
+
+            SceneHelpers sh = new SceneHelpers();
+            TestScene sceneA = sh.SetupScene("sceneA", TestHelpers.ParseTail(0x100), 1000, 1000);
+            TestScene sceneB = sh.SetupScene("sceneB", TestHelpers.ParseTail(0x200), 1001, 1000);
+
+            SceneHelpers.SetupSceneModules(new Scene[] { sceneA, sceneB }, config, lscm);
+            SceneHelpers.SetupSceneModules(
+                sceneA, config, new CapabilitiesModule(), etmA, attModA, new BasicInventoryAccessModule());
+            SceneHelpers.SetupSceneModules(
+                sceneB, config, new CapabilitiesModule(), etmB, attModB, new BasicInventoryAccessModule());
+
+            UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(sceneA, 0x1);
+
+            AgentCircuitData acd = SceneHelpers.GenerateAgentData(ua1.PrincipalID);
+            TestClient tc = new TestClient(acd, sceneA);
+            List<TestClient> destinationTestClients = new List<TestClient>();
+            EntityTransferHelpers.SetupInformClientOfNeighbourTriggersNeighbourClientCreate(tc, destinationTestClients);
+
+            ScenePresence beforeTeleportSp = SceneHelpers.AddScenePresence(sceneA, tc, acd);
+            beforeTeleportSp.AbsolutePosition = new Vector3(30, 31, 32);
+
+            Assert.That(destinationTestClients.Count, Is.EqualTo(1));
+            Assert.That(destinationTestClients[0], Is.Not.Null);
+
+            InventoryItemBase attItem = CreateAttachmentItem(sceneA, ua1.PrincipalID, "att", 0x10, 0x20);
+
+            sceneA.AttachmentsModule.RezSingleAttachmentFromInventory(
+                beforeTeleportSp, attItem.ID, (uint)AttachmentPoint.Chest);
+
+            Vector3 teleportPosition = new Vector3(10, 11, 12);
+            Vector3 teleportLookAt = new Vector3(20, 21, 22);
+
+            // Here, we need to make clientA's receipt of SendRegionTeleport trigger clientB's CompleteMovement().  This
+            // is to operate the teleport V2 mechanism where the EntityTransferModule will first request the client to
+            // CompleteMovement to the region and then call UpdateAgent to the destination region to confirm the receipt
+            // Both these operations will occur on different threads and will wait for each other.
+            // We have to do this via ThreadPool directly since FireAndForget has been switched to sync for the V1
+            // test protocol, where we are trying to avoid unpredictable async operations in regression tests.
+            tc.OnTestClientSendRegionTeleport 
+                += (regionHandle, simAccess, regionExternalEndPoint, locationID, flags, capsURL) 
+                    => ThreadPool.UnsafeQueueUserWorkItem(o => destinationTestClients[0].CompleteMovement(), null);
+
+            m_numberOfAttachEventsFired = 0;
+            sceneA.RequestTeleportLocation(
+                beforeTeleportSp.ControllingClient,
+                sceneB.RegionInfo.RegionHandle,
+                teleportPosition,
+                teleportLookAt,
+                (uint)TeleportFlags.ViaLocation);
+
+            // Check attachments have made it into sceneB
+            ScenePresence afterTeleportSceneBSp = sceneB.GetScenePresence(ua1.PrincipalID);
+
+            // This is appearance data, as opposed to actually rezzed attachments
+            List<AvatarAttachment> sceneBAttachments = afterTeleportSceneBSp.Appearance.GetAttachments();
+            Assert.That(sceneBAttachments.Count, Is.EqualTo(1));
+            Assert.That(sceneBAttachments[0].AttachPoint, Is.EqualTo((int)AttachmentPoint.Chest));
+            Assert.That(sceneBAttachments[0].ItemID, Is.EqualTo(attItem.ID));
+            Assert.That(sceneBAttachments[0].AssetID, Is.EqualTo(attItem.AssetID));
+            Assert.That(afterTeleportSceneBSp.Appearance.GetAttachpoint(attItem.ID), Is.EqualTo((int)AttachmentPoint.Chest));
+
+            // This is the actual attachment
+            List<SceneObjectGroup> actualSceneBAttachments = afterTeleportSceneBSp.GetAttachments();
+            Assert.That(actualSceneBAttachments.Count, Is.EqualTo(1));
+            SceneObjectGroup actualSceneBAtt = actualSceneBAttachments[0];
+            Assert.That(actualSceneBAtt.Name, Is.EqualTo(attItem.Name));
+            Assert.That(actualSceneBAtt.AttachmentPoint, Is.EqualTo((uint)AttachmentPoint.Chest));
+
+            Assert.That(sceneB.GetSceneObjectGroups().Count, Is.EqualTo(1));
+
+            // Check attachments have been removed from sceneA
+            ScenePresence afterTeleportSceneASp = sceneA.GetScenePresence(ua1.PrincipalID);
+
+            // Since this is appearance data, it is still present on the child avatar!
+            List<AvatarAttachment> sceneAAttachments = afterTeleportSceneASp.Appearance.GetAttachments();
+            Assert.That(sceneAAttachments.Count, Is.EqualTo(1));
+            Assert.That(afterTeleportSceneASp.Appearance.GetAttachpoint(attItem.ID), Is.EqualTo((int)AttachmentPoint.Chest));
+
+            // This is the actual attachment, which should no longer exist
+            List<SceneObjectGroup> actualSceneAAttachments = afterTeleportSceneASp.GetAttachments();
+            Assert.That(actualSceneAAttachments.Count, Is.EqualTo(0));
+
+            Assert.That(sceneA.GetSceneObjectGroups().Count, Is.EqualTo(0));
+
+            // Check events
+            Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(0));
+        }
     }
 }
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index bc79944..09cc998 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -55,6 +55,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
         private int m_savetime = 5; // seconds to wait before saving changed appearance
         private int m_sendtime = 2; // seconds to wait before sending changed appearance
+        private bool m_reusetextures = false;
 
         private int m_checkTime = 500; // milliseconds to wait between checks for appearance updates
         private System.Timers.Timer m_updateTimer = new System.Timers.Timer();
@@ -73,6 +74,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             {
                 m_savetime = Convert.ToInt32(appearanceConfig.GetString("DelayBeforeAppearanceSave",Convert.ToString(m_savetime)));
                 m_sendtime = Convert.ToInt32(appearanceConfig.GetString("DelayBeforeAppearanceSend",Convert.ToString(m_sendtime)));
+                m_reusetextures = appearanceConfig.GetBoolean("ReuseTextures",m_reusetextures);
+                
                 // m_log.InfoFormat("[AVFACTORY] configured for {0} save and {1} send",m_savetime,m_sendtime);
             }
 
@@ -131,6 +134,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             client.OnRequestWearables += Client_OnRequestWearables;
             client.OnSetAppearance += Client_OnSetAppearance;
             client.OnAvatarNowWearing += Client_OnAvatarNowWearing;
+            client.OnCachedTextureRequest += Client_OnCachedTextureRequest;
         }
 
         #endregion
@@ -1068,6 +1072,61 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
                 QueueAppearanceSave(client.AgentId);
             }
         }
+
+        /// <summary>
+        /// Respond to the cached textures request from the client
+        /// </summary>
+        /// <param name="client"></param>
+        /// <param name="serial"></param>
+        /// <param name="cachedTextureRequest"></param>
+        private void Client_OnCachedTextureRequest(IClientAPI client, int serial, List<CachedTextureRequestArg> cachedTextureRequest)
+        {
+            // m_log.WarnFormat("[AVFACTORY]: Client_OnCachedTextureRequest called for {0} ({1})", client.Name, client.AgentId);
+            ScenePresence sp = m_scene.GetScenePresence(client.AgentId);
+
+            List<CachedTextureResponseArg> cachedTextureResponse = new List<CachedTextureResponseArg>();
+            foreach (CachedTextureRequestArg request in cachedTextureRequest)
+            {
+                UUID texture = UUID.Zero;
+                int index = request.BakedTextureIndex;
+                
+                if (m_reusetextures)
+                {
+                    // this is the most insanely dumb way to do this... however it seems to
+                    // actually work. if the appearance has been reset because wearables have
+                    // changed then the texture entries are zero'd out until the bakes are 
+                    // uploaded. on login, if the textures exist in the cache (eg if you logged
+                    // into the simulator recently, then the appearance will pull those and send
+                    // them back in the packet and you won't have to rebake. if the textures aren't
+                    // in the cache then the intial makeroot() call in scenepresence will zero
+                    // them out.
+                    //
+                    // a better solution (though how much better is an open question) is to
+                    // store the hashes in the appearance and compare them. Thats's coming.
+
+                    Primitive.TextureEntryFace face = sp.Appearance.Texture.FaceTextures[index];
+                    if (face != null)
+                        texture = face.TextureID;
+
+                    // m_log.WarnFormat("[AVFACTORY]: reuse texture {0} for index {1}",texture,index);
+                }
+                
+                CachedTextureResponseArg response = new CachedTextureResponseArg();
+                response.BakedTextureIndex = index;
+                response.BakedTextureID = texture;
+                response.HostName = null;
+
+                cachedTextureResponse.Add(response);
+            }
+            
+            // m_log.WarnFormat("[AVFACTORY]: serial is {0}",serial);
+            // The serial number appears to be used to match requests and responses
+            // in the texture transaction. We just send back the serial number
+            // that was provided in the request. The viewer bumps this for us.
+            client.SendCachedTextureResponse(sp, serial, cachedTextureResponse);
+        }
+
+
         #endregion
 
         public void WriteBakedTexturesReport(IScenePresence sp, ReportOutputAction outputAction)
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index 174642d..917f164 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -372,21 +372,24 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
             UUID fromAgentID, UUID ownerID, string fromName, ChatTypeEnum type,
             string message, ChatSourceType src, bool ignoreDistance)
         {
-            // don't send chat to child agents
-            if (presence.IsChildAgent) return false;
-
-            Vector3 fromRegionPos = fromPos + regionPos;
-            Vector3 toRegionPos = presence.AbsolutePosition +
-                new Vector3(presence.Scene.RegionInfo.RegionLocX * Constants.RegionSize,
-                            presence.Scene.RegionInfo.RegionLocY * Constants.RegionSize, 0);
+            if (presence.LifecycleState != ScenePresenceState.Running)
+                return false;
 
-            int dis = (int)Util.GetDistanceTo(toRegionPos, fromRegionPos);
-            
-            if (type == ChatTypeEnum.Whisper && dis > m_whisperdistance ||
-                type == ChatTypeEnum.Say && dis > m_saydistance ||
-                type == ChatTypeEnum.Shout && dis > m_shoutdistance)
+            if (!ignoreDistance)
             {
-                return false;
+                Vector3 fromRegionPos = fromPos + regionPos;
+                Vector3 toRegionPos = presence.AbsolutePosition +
+                    new Vector3(presence.Scene.RegionInfo.RegionLocX * Constants.RegionSize,
+                                presence.Scene.RegionInfo.RegionLocY * Constants.RegionSize, 0);
+
+                int dis = (int)Util.GetDistanceTo(toRegionPos, fromRegionPos);
+
+                if (type == ChatTypeEnum.Whisper && dis > m_whisperdistance ||
+                    type == ChatTypeEnum.Say && dis > m_saydistance ||
+                    type == ChatTypeEnum.Shout && dis > m_shoutdistance)
+                {
+                    return false;
+                }
             }
 
             // TODO: should change so the message is sent through the avatar rather than direct to the ClientView
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 8056030..b693f2d 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -371,7 +371,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             foreach (string fid in outstanding)
             {
                 UUID fromAgentID;
-                string firstname = "Unknown", lastname = "User";
+                string firstname = "Unknown", lastname = "UserFMSFOIN";
                 if (!GetAgentInfo(client.Scene.RegionInfo.ScopeID, fid, out fromAgentID, out firstname, out lastname))
                 {
                     m_log.DebugFormat("[FRIENDS MODULE]: skipping malformed friend {0}", fid);
@@ -397,7 +397,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
         protected virtual bool GetAgentInfo(UUID scopeID, string fid, out UUID agentID, out string first, out string last)
         {
-            first = "Unknown"; last = "User";
+            first = "Unknown"; last = "UserFMGAI";
             if (!UUID.TryParse(fid, out agentID))
                 return false;
 
@@ -498,6 +498,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
         protected virtual void StatusNotify(List<FriendInfo> friendList, UUID userID, bool online)
         {
+            //m_log.DebugFormat("[FRIENDS]: Entering StatusNotify for {0}", userID);
+
             List<string> friendStringIds = friendList.ConvertAll<string>(friend => friend.Friend);
             List<string> remoteFriendStringIds = new List<string>();
             foreach (string friendStringId in friendStringIds)
@@ -523,12 +525,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             foreach (PresenceInfo friendSession in friendSessions)
             {
                 // let's guard against sessions-gone-bad
-                if (friendSession.RegionID != UUID.Zero)
+                if (friendSession != null && friendSession.RegionID != UUID.Zero)
                 {
+                    //m_log.DebugFormat("[FRIENDS]: Get region {0}", friendSession.RegionID);
                     GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
-                    //m_log.DebugFormat("[FRIENDS]: Remote Notify to region {0}", region.RegionName);
-                    m_FriendsSimConnector.StatusNotify(region, userID, friendSession.UserID, online);
+                    if (region != null)
+                    {
+                        m_FriendsSimConnector.StatusNotify(region, userID, friendSession.UserID, online);
+                    }
                 }
+                //else
+                //    m_log.DebugFormat("[FRIENDS]: friend session is null or the region is UUID.Zero");
             }
         }
 
@@ -685,7 +692,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             //
 
             // Try local
-            if (LocalFriendshipTerminated(exfriendID))
+            if (LocalFriendshipTerminated(client.AgentId, exfriendID))
                 return;
 
             PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { exfriendID.ToString() });
@@ -827,13 +834,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             return false;
         }
 
-        public bool LocalFriendshipTerminated(UUID exfriendID)
+        public bool LocalFriendshipTerminated(UUID userID, UUID exfriendID)
         {
             IClientAPI friendClient = LocateClientObject(exfriendID);
             if (friendClient != null)
             {
                 // the friend in this sim as root agent
-                friendClient.SendTerminateFriend(exfriendID);
+                friendClient.SendTerminateFriend(userID);
                 // update local cache
                 RecacheFriends(friendClient);
                 // we're done
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
index 637beef..2116605 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             m_FriendsModule = fmodule;
         }
 
-        public override byte[] Handle(
+        protected override byte[] ProcessRequest(
             string path, Stream requestData, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             StreamReader sr = new StreamReader(requestData);
@@ -193,7 +193,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             if (!UUID.TryParse(request["ToID"].ToString(), out toID))
                 return FailureResult();
 
-            if (m_FriendsModule.LocalFriendshipTerminated(toID))
+            if (m_FriendsModule.LocalFriendshipTerminated(fromID, toID))
                 return SuccessResult();
 
             return FailureResult();
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
index bf5c0bb..d00945e 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
@@ -183,6 +183,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                                 if (Util.ParseUniversalUserIdentifier(finfo.Friend, out id, out url, out first, out last, out tmp))
                                 {
                                     IUserManagement uMan = m_Scenes[0].RequestModuleInterface<IUserManagement>();
+                                    m_log.DebugFormat("[HGFRIENDS MODULE]: caching {0}", finfo.Friend);
                                     uMan.AddUser(id, url + ";" + first + " " + last);
                                 }
                             }
@@ -251,7 +252,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
         protected override void StatusNotify(List<FriendInfo> friendList, UUID userID, bool online)
         {
-//            m_log.DebugFormat("[HGFRIENDS MODULE]: Entering StatusNotify for {0}", userID);
+            //m_log.DebugFormat("[HGFRIENDS MODULE]: Entering StatusNotify for {0}", userID);
 
             // First, let's divide the friends on a per-domain basis
             Dictionary<string, List<FriendInfo>> friendsPerDomain = new Dictionary<string, List<FriendInfo>>();
@@ -293,7 +294,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
         protected override bool GetAgentInfo(UUID scopeID, string fid, out UUID agentID, out string first, out string last)
         {
-            first = "Unknown"; last = "User";
+            first = "Unknown"; last = "UserHGGAI";
             if (base.GetAgentInfo(scopeID, fid, out agentID, out first, out last))
                 return true;
 
@@ -349,7 +350,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
         public override FriendInfo[] GetFriendsFromService(IClientAPI client)
         {
-//            m_log.DebugFormat("[HGFRIENDS MODULE]: Entering GetFriendsFromService for {0}", client.Name);
+            //            m_log.DebugFormat("[HGFRIENDS MODULE]: Entering GetFriendsFromService for {0}", client.Name);
             Boolean agentIsLocal = true;
             if (UserManagementModule != null)
                 agentIsLocal = UserManagementModule.IsLocalGridUser(client.AgentId);
@@ -362,13 +363,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             AgentCircuitData agentClientCircuit = ((Scene)(client.Scene)).AuthenticateHandler.GetAgentCircuitData(client.CircuitCode);
             if (agentClientCircuit != null)
             {
-                //[XXX] string agentUUI = Util.ProduceUserUniversalIdentifier(agentClientCircuit);
-
+                // Note that this is calling a different interface than base; this one calls with a string param!
                 finfos = FriendsService.GetFriends(client.AgentId.ToString());
                 m_log.DebugFormat("[HGFRIENDS MODULE]: Fetched {0} local friends for visitor {1}", finfos.Length, client.AgentId.ToString());
             }
 
-//            m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting GetFriendsFromService for {0}", client.Name);
+            //            m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting GetFriendsFromService for {0}", client.Name);
 
             return finfos;
         }
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
index fa8c3f3..6b14fa6 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
@@ -26,27 +26,25 @@
  */
 
 using System;
-using System.Collections.Generic;
-using Nini.Config;
-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.Generic;
 using System.Collections.Specialized;
-using System.Reflection;
 using System.IO;
+using System.Reflection;
 using System.Web;
 using System.Xml;
 using log4net;
 using Mono.Addins;
+using Nini.Config;
+using OpenMetaverse;
 using OpenMetaverse.Messages.Linden;
 using OpenMetaverse.StructuredData;
+using OpenSim.Framework;
 using OpenSim.Framework.Capabilities;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Interfaces;
 using Caps = OpenSim.Framework.Capabilities.Caps;
 using OSDArray = OpenMetaverse.StructuredData.OSDArray;
 using OSDMap = OpenMetaverse.StructuredData.OSDMap;
@@ -127,9 +125,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
         {
             string uri = "/CAPS/" + UUID.Random();
 
-            caps.RegisterHandler("UntrustedSimulatorMessage",
-                    new RestStreamHandler("POST", uri,
-                    HandleUntrustedSimulatorMessage));
+            caps.RegisterHandler(
+                "UntrustedSimulatorMessage", 
+                new RestStreamHandler("POST", uri, HandleUntrustedSimulatorMessage, "UntrustedSimulatorMessage", null));
         }
 
         private string HandleUntrustedSimulatorMessage(string request,
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index 1627f6c..b321adb 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -392,7 +392,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                     gim.fromAgentName = fromAgentName;
                     gim.fromGroup = fromGroup;
                     gim.imSessionID = imSessionID.Guid;
-                    gim.RegionID = UUID.Zero.Guid; // RegionID.Guid;
+                    gim.RegionID = RegionID.Guid;
                     gim.timestamp = timestamp;
                     gim.toAgentID = toAgentID.Guid;
                     gim.message = message;
@@ -728,7 +728,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             gim["position_x"] = msg.Position.X.ToString();
             gim["position_y"] = msg.Position.Y.ToString();
             gim["position_z"] = msg.Position.Z.ToString();
-            gim["region_id"] = msg.RegionID.ToString();
+            gim["region_id"] = new UUID(msg.RegionID).ToString();
             gim["binary_bucket"] = Convert.ToBase64String(msg.binaryBucket,Base64FormattingOptions.None);
             if (m_MessageKey != String.Empty)
                 gim["message_key"] = m_MessageKey;
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index 659b178..d56e469 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -67,10 +67,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// </summary>
         protected bool m_merge;
 
-        /// <value>
-        /// We only use this to request modules
-        /// </value>
-        protected Scene m_scene;
+        protected IInventoryService m_InventoryService;
+        protected IAssetService m_AssetService;
+        protected IUserAccountService m_UserAccountService;
 
         /// <value>
         /// The stream from which the inventory archive will be loaded.
@@ -118,9 +117,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         protected Dictionary<UUID, UUID> m_creatorIdForAssetId = new Dictionary<UUID, UUID>();        
 
         public InventoryArchiveReadRequest(
-            Scene scene, UserAccount userInfo, string invPath, string loadPath, bool merge)
+            IInventoryService inv, IAssetService assets, IUserAccountService uacc, UserAccount userInfo, string invPath, string loadPath, bool merge)
             : this(
-                scene,
+                inv,
+                assets,
+                uacc,
                 userInfo,
                 invPath,
                 new GZipStream(ArchiveHelpers.GetStream(loadPath), CompressionMode.Decompress),
@@ -129,9 +130,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         }
 
         public InventoryArchiveReadRequest(
-            Scene scene, UserAccount userInfo, string invPath, Stream loadStream, bool merge)
+            IInventoryService inv, IAssetService assets, IUserAccountService uacc, UserAccount userInfo, string invPath, Stream loadStream, bool merge)
         {
-            m_scene = scene;
+            m_InventoryService = inv;
+            m_AssetService = assets;
+            m_UserAccountService = uacc;
             m_merge = merge;
             m_userInfo = userInfo;
             m_invPath = invPath;
@@ -162,7 +165,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                
                 List<InventoryFolderBase> folderCandidates
                     = InventoryArchiveUtils.FindFoldersByPath(
-                        m_scene.InventoryService, m_userInfo.PrincipalID, m_invPath);
+                        m_InventoryService, m_userInfo.PrincipalID, m_invPath);
     
                 if (folderCandidates.Count == 0)
                 {
@@ -297,7 +300,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                         string plainPath = ArchiveConstants.ExtractPlainPathFromIarPath(archivePath);
                         List<InventoryFolderBase> folderCandidates
                             = InventoryArchiveUtils.FindFoldersByPath(
-                                m_scene.InventoryService, m_userInfo.PrincipalID, plainPath);
+                                m_InventoryService, m_userInfo.PrincipalID, plainPath);
             
                         if (folderCandidates.Count != 0)
                         {
@@ -380,7 +383,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                     = new InventoryFolderBase(
                         newFolderId, newFolderName, m_userInfo.PrincipalID, 
                         (short)AssetType.Unknown, destFolder.ID, 1);
-                m_scene.InventoryService.AddFolder(destFolder);
+                m_InventoryService.AddFolder(destFolder);
 
                 // Record that we have now created this folder
                 iarPathExisting += rawDirsToCreate[i] + "/";
@@ -406,7 +409,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             // Don't use the item ID that's in the file
             item.ID = UUID.Random();
 
-            UUID ospResolvedId = OspResolver.ResolveOspa(item.CreatorId, m_scene.UserAccountService);
+            UUID ospResolvedId = OspResolver.ResolveOspa(item.CreatorId, m_UserAccountService);
             if (UUID.Zero != ospResolvedId) // The user exists in this grid
             {
 //                m_log.DebugFormat("[INVENTORY ARCHIVER]: Found creator {0} via OSPA resolution", ospResolvedId);
@@ -436,7 +439,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             // relying on native tar tools.
             m_creatorIdForAssetId[item.AssetID] = item.CreatorIdAsUuid;
 
-            m_scene.AddInventoryItem(item);
+            if (!m_InventoryService.AddItem(item))
+                m_log.WarnFormat("[INVENTORY ARCHIVER]: Unable to save item {0} in folder {1}", item.Name, item.Folder);
         
             return item;
         }
@@ -533,7 +537,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 AssetBase asset = new AssetBase(assetId, "From IAR", assetType, UUID.Zero.ToString());
                 asset.Data = data;
 
-                m_scene.AssetService.Store(asset);
+                m_AssetService.Store(asset);
 
                 return true;
             }
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index f4f9e2d..ea660bd 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -294,7 +294,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
                         try
                         {
-                            request = new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadStream, merge);
+                            request = new InventoryArchiveReadRequest(m_aScene.InventoryService, m_aScene.AssetService, m_aScene.UserAccountService, userInfo, invPath, loadStream, merge);
                         }
                         catch (EntryPointNotFoundException e)
                         {
@@ -342,7 +342,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
                         try
                         {
-                            request = new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadPath, merge);
+                            request = new InventoryArchiveReadRequest(m_aScene.InventoryService, m_aScene.AssetService, m_aScene.UserAccountService, userInfo, invPath, loadPath, merge);
                         }
                         catch (EntryPointNotFoundException e)
                         {
@@ -538,7 +538,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[INVENTORY ARCHIVER]: Could not authenticate password, {0}", e.Message);
+                m_log.ErrorFormat("[INVENTORY ARCHIVER]: Could not authenticate password, {0}", e);
                 return null;
             }
             */
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadPathTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadPathTests.cs
index 95f562e..08f199a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadPathTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadPathTests.cs
@@ -229,7 +229,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 
             {
                 // Test replication of path1
-                new InventoryArchiveReadRequest(scene, ua1, null, (Stream)null, false)
+                new InventoryArchiveReadRequest(scene.InventoryService, scene.AssetService, scene.UserAccountService, ua1, null, (Stream)null, false)
                     .ReplicateArchivePathToUserInventory(
                         iarPath1, scene.InventoryService.GetRootFolder(ua1.PrincipalID), 
                         foldersCreated, nodesLoaded);
@@ -246,7 +246,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             
             {
                 // Test replication of path2
-                new InventoryArchiveReadRequest(scene, ua1, null, (Stream)null, false)
+                new InventoryArchiveReadRequest(scene.InventoryService, scene.AssetService, scene.UserAccountService, ua1, null, (Stream)null, false)
                     .ReplicateArchivePathToUserInventory(
                         iarPath2, scene.InventoryService.GetRootFolder(ua1.PrincipalID), 
                         foldersCreated, nodesLoaded);
@@ -291,8 +291,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             string folder2ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder2Name, UUID.Random());
             
             string itemArchivePath = string.Join("", new string[] { folder1ArchiveName, folder2ArchiveName });
-            
-            new InventoryArchiveReadRequest(scene, ua1, null, (Stream)null, false)
+
+            new InventoryArchiveReadRequest(scene.InventoryService, scene.AssetService, scene.UserAccountService, ua1, null, (Stream)null, false)
                 .ReplicateArchivePathToUserInventory(
                     itemArchivePath, scene.InventoryService.GetRootFolder(ua1.PrincipalID), 
                     new Dictionary<string, InventoryFolderBase>(), new HashSet<InventoryNodeBase>());
@@ -342,8 +342,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             string folder2ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder2Name, UUID.Random());
             
             string itemArchivePath = string.Join("", new string[] { folder1ArchiveName, folder2ArchiveName });
-            
-            new InventoryArchiveReadRequest(scene, ua1, folder1ExistingName, (Stream)null, true)
+
+            new InventoryArchiveReadRequest(scene.InventoryService, scene.AssetService, scene.UserAccountService, ua1, folder1ExistingName, (Stream)null, true)
                 .ReplicateArchivePathToUserInventory(
                     itemArchivePath, scene.InventoryService.GetRootFolder(ua1.PrincipalID), 
                     new Dictionary<string, InventoryFolderBase>(), new HashSet<InventoryNodeBase>());
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs
index 5e7e24c..b85739e 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             Assert.That(filePath, Is.EqualTo(ArchiveConstants.CONTROL_FILE_PATH));
             
             InventoryArchiveReadRequest iarr 
-                = new InventoryArchiveReadRequest(null, null, null, (Stream)null, false);
+                = new InventoryArchiveReadRequest(null, null, null, null, null, (Stream)null, false);
             iarr.LoadControlFile(filePath, data);
             
             Assert.That(iarr.ControlFileLoaded, Is.True);
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index f122d00..e285f21 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -47,10 +47,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
 
         /// <summary>
         private List<Scene> m_Scenelist = new List<Scene>();
-//        private Dictionary<UUID, Scene> m_AgentRegions =
-//                new Dictionary<UUID, Scene>();
 
-        private IMessageTransferModule m_TransferModule = null;
+        private IMessageTransferModule m_TransferModule;
         private bool m_Enabled = true;
 
         #region Region Module interface
@@ -81,9 +79,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
 //            scene.RegisterModuleInterface<IInventoryTransferModule>(this);
 
             scene.EventManager.OnNewClient += OnNewClient;
-//            scene.EventManager.OnClientClosed += ClientLoggedOut;
             scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage;
-//            scene.EventManager.OnSetRootAgentScene += OnSetRootAgentScene;
         }
 
         public void RegionLoaded(Scene scene)
@@ -96,11 +92,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                     m_log.Error("[INVENTORY TRANSFER]: No Message transfer module found, transfers will be local only");
                     m_Enabled = false;
 
-                    m_Scenelist.Clear();
-                    scene.EventManager.OnNewClient -= OnNewClient;
-//                    scene.EventManager.OnClientClosed -= ClientLoggedOut;
+//                    m_Scenelist.Clear();
+//                    scene.EventManager.OnNewClient -= OnNewClient;
                     scene.EventManager.OnIncomingInstantMessage -= OnGridInstantMessage;
-//                    scene.EventManager.OnSetRootAgentScene -= OnSetRootAgentScene;
                 }
             }
         }
@@ -108,9 +102,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
         public void RemoveRegion(Scene scene)
         {
             scene.EventManager.OnNewClient -= OnNewClient;
-//            scene.EventManager.OnClientClosed -= ClientLoggedOut;
             scene.EventManager.OnIncomingInstantMessage -= OnGridInstantMessage;
-//            scene.EventManager.OnSetRootAgentScene -= OnSetRootAgentScene;
             m_Scenelist.Remove(scene);
         }
 
@@ -139,11 +131,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
             // Inventory giving is conducted via instant message
             client.OnInstantMessage += OnInstantMessage;
         }
-        
-//        protected void OnSetRootAgentScene(UUID id, Scene scene)
-//        {
-//            m_AgentRegions[id] = scene;
-//        }
 
         private Scene FindClientScene(UUID agentId)
         {
@@ -188,9 +175,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                 {
                     UUID folderID = new UUID(im.binaryBucket, 1);
                     
-                    m_log.DebugFormat("[INVENTORY TRANSFER]: Inserting original folder {0} "+
-                            "into agent {1}'s inventory",
-                            folderID, new UUID(im.toAgentID));
+                    m_log.DebugFormat(
+                        "[INVENTORY TRANSFER]: Inserting original folder {0} into agent {1}'s inventory",
+                        folderID, new UUID(im.toAgentID));
                     
                     InventoryFolderBase folderCopy 
                         = scene.GiveInventoryFolder(recipientID, client.AgentId, folderID, UUID.Zero);
@@ -213,7 +200,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                         user.ControllingClient.SendBulkUpdateInventory(folderCopy);
 
                     // HACK!!
-                    // Insert the ID of the copied item into the IM so that we know which item to move to trash if it
+                    // Insert the ID of the copied folder into the IM so that we know which item to move to trash if it
                     // is rejected.
                     // XXX: This is probably a misuse of the session ID slot.
                     im.imSessionID = copyID.Guid;
@@ -425,7 +412,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                 {
                     folder = new InventoryFolderBase(inventoryID, client.AgentId);
                     folder = invService.GetFolder(folder);
-                    
+
                     if (folder != null & trashFolder != null)
                     {
                         previousParentFolderID = folder.ParentID;
@@ -477,70 +464,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
             }
         }
 
-//        public bool NeedSceneCacheClear(UUID agentID, Scene scene)
-//        {
-//            if (!m_AgentRegions.ContainsKey(agentID))
-//            {
-//                // Since we can get here two ways, we need to scan
-//                // the scenes here. This is somewhat more expensive
-//                // but helps avoid a nasty bug
-//                //
-//
-//                foreach (Scene s in m_Scenelist)
-//                {
-//                    ScenePresence presence;
-//
-//                    if (s.TryGetScenePresence(agentID, out presence))
-//                    {
-//                        // If the agent is in this scene, then we
-//                        // are being called twice in a single
-//                        // teleport. This is wasteful of cycles
-//                        // but harmless due to this 2nd level check
-//                        //
-//                        // If the agent is found in another scene
-//                        // then the list wasn't current
-//                        //
-//                        // If the agent is totally unknown, then what
-//                        // are we even doing here??
-//                        //
-//                        if (s == scene)
-//                        {
-//                            //m_log.Debug("[INVTRANSFERMOD]: s == scene. Returning true in " + scene.RegionInfo.RegionName);
-//                            return true;
-//                        }
-//                        else
-//                        {
-//                            //m_log.Debug("[INVTRANSFERMOD]: s != scene. Returning false in " + scene.RegionInfo.RegionName);
-//                            return false;
-//                        }
-//                    }
-//                }
-//                //m_log.Debug("[INVTRANSFERMOD]: agent not in scene. Returning true in " + scene.RegionInfo.RegionName);
-//                return true;
-//            }
-//
-//            // The agent is left in current Scene, so we must be
-//            // going to another instance
-//            //
-//            if (m_AgentRegions[agentID] == scene)
-//            {
-//                //m_log.Debug("[INVTRANSFERMOD]: m_AgentRegions[agentID] == scene. Returning true in " + scene.RegionInfo.RegionName);
-//                m_AgentRegions.Remove(agentID);
-//                return true;
-//            }
-//
-//            // Another region has claimed the agent
-//            //
-//            //m_log.Debug("[INVTRANSFERMOD]: last resort. Returning false in " + scene.RegionInfo.RegionName);
-//            return false;
-//        }
-//
-//        public void ClientLoggedOut(UUID agentID, Scene scene)
-//        {
-//            if (m_AgentRegions.ContainsKey(agentID))
-//                m_AgentRegions.Remove(agentID);
-//        }
-
         /// <summary>
         ///
         /// </summary>
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/Tests/InventoryTransferModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/Tests/InventoryTransferModuleTests.cs
new file mode 100644
index 0000000..162a0c3
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/Tests/InventoryTransferModuleTests.cs
@@ -0,0 +1,449 @@
+/*
+ * 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.Config;
+using Nini.Config;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenMetaverse.Assets;
+using OpenSim.Framework;
+using OpenSim.Region.CoreModules.Avatar.Inventory.Transfer;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using OpenSim.Tests.Common;
+using OpenSim.Tests.Common.Mock;
+
+namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests
+{
+    [TestFixture]
+    public class InventoryTransferModuleTests : OpenSimTestCase
+    {    
+        protected TestScene m_scene;       
+            
+        [SetUp]
+        public override void SetUp()
+        {
+            base.SetUp();
+
+            IConfigSource config = new IniConfigSource();
+            config.AddConfig("Messaging");
+            config.Configs["Messaging"].Set("InventoryTransferModule", "InventoryTransferModule");
+
+            m_scene = new SceneHelpers().SetupScene();            
+            SceneHelpers.SetupSceneModules(m_scene, config, new InventoryTransferModule());
+        } 
+
+        [Test]
+        public void TestAcceptGivenItem()
+        {
+//            TestHelpers.EnableLogging();
+
+            UUID initialSessionId = TestHelpers.ParseTail(0x10);
+            UUID itemId = TestHelpers.ParseTail(0x100);
+            UUID assetId = TestHelpers.ParseTail(0x200);
+
+            UserAccount ua1 
+                = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "One", TestHelpers.ParseTail(0x1), "pw");
+            UserAccount ua2 
+                = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "Two", TestHelpers.ParseTail(0x2), "pw");
+
+            ScenePresence giverSp = SceneHelpers.AddScenePresence(m_scene, ua1);
+            TestClient giverClient = (TestClient)giverSp.ControllingClient;
+
+            ScenePresence receiverSp = SceneHelpers.AddScenePresence(m_scene, ua2);
+            TestClient receiverClient = (TestClient)receiverSp.ControllingClient;
+
+            // Create the object to test give
+            InventoryItemBase originalItem 
+                = UserInventoryHelpers.CreateInventoryItem(
+                    m_scene, "givenObj", itemId, assetId, giverSp.UUID, InventoryType.Object);
+
+            byte[] giveImBinaryBucket = new byte[17];
+            byte[] itemIdBytes = itemId.GetBytes();
+            Array.Copy(itemIdBytes, 0, giveImBinaryBucket, 1, itemIdBytes.Length);
+
+            GridInstantMessage giveIm 
+                = new GridInstantMessage(
+                    m_scene, 
+                    giverSp.UUID, 
+                    giverSp.Name, 
+                    receiverSp.UUID, 
+                    (byte)InstantMessageDialog.InventoryOffered,
+                    false,
+                    "inventory offered msg", 
+                    initialSessionId,
+                    false, 
+                    Vector3.Zero,
+                    giveImBinaryBucket,
+                    true);
+
+            giverClient.HandleImprovedInstantMessage(giveIm);
+
+            // These details might not all be correct.  
+            GridInstantMessage acceptIm 
+                = new GridInstantMessage(
+                    m_scene, 
+                    receiverSp.UUID, 
+                    receiverSp.Name, 
+                    giverSp.UUID, 
+                    (byte)InstantMessageDialog.InventoryAccepted, 
+                    false,
+                    "inventory accepted msg", 
+                    initialSessionId,
+                    false, 
+                    Vector3.Zero,
+                    null,
+                    true);
+
+            receiverClient.HandleImprovedInstantMessage(acceptIm);
+
+            // Test for item remaining in the giver's inventory (here we assume a copy item)
+            // TODO: Test no-copy items.
+            InventoryItemBase originalItemAfterGive
+                = UserInventoryHelpers.GetInventoryItem(m_scene.InventoryService, giverSp.UUID, "Objects/givenObj");
+
+            Assert.That(originalItemAfterGive, Is.Not.Null);
+            Assert.That(originalItemAfterGive.ID, Is.EqualTo(originalItem.ID));
+
+            // Test for item successfully making it into the receiver's inventory
+            InventoryItemBase receivedItem 
+                = UserInventoryHelpers.GetInventoryItem(m_scene.InventoryService, receiverSp.UUID, "Objects/givenObj");
+
+            Assert.That(receivedItem, Is.Not.Null);
+            Assert.That(receivedItem.ID, Is.Not.EqualTo(originalItem.ID));
+
+            // Test that on a delete, item still exists and is accessible for the giver.
+            m_scene.InventoryService.DeleteItems(receiverSp.UUID, new List<UUID>() { receivedItem.ID });
+
+            InventoryItemBase originalItemAfterDelete
+                = UserInventoryHelpers.GetInventoryItem(m_scene.InventoryService, giverSp.UUID, "Objects/givenObj");
+
+            Assert.That(originalItemAfterDelete, Is.Not.Null);
+
+            // TODO: Test scenario where giver deletes their item first.
+        }       
+
+        /// <summary>
+        /// Test user rejection of a given item.
+        /// </summary>
+        /// <remarks>
+        /// A rejected item still ends up in the user's trash folder.
+        /// </remarks>
+        [Test]
+        public void TestRejectGivenItem()
+        {
+//            TestHelpers.EnableLogging();
+
+            UUID initialSessionId = TestHelpers.ParseTail(0x10);
+            UUID itemId = TestHelpers.ParseTail(0x100);
+            UUID assetId = TestHelpers.ParseTail(0x200);
+
+            UserAccount ua1 
+                = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "One", TestHelpers.ParseTail(0x1), "pw");
+            UserAccount ua2 
+                = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "Two", TestHelpers.ParseTail(0x2), "pw");
+
+            ScenePresence giverSp = SceneHelpers.AddScenePresence(m_scene, ua1);
+            TestClient giverClient = (TestClient)giverSp.ControllingClient;
+
+            ScenePresence receiverSp = SceneHelpers.AddScenePresence(m_scene, ua2);
+            TestClient receiverClient = (TestClient)receiverSp.ControllingClient;
+
+            // Create the object to test give
+            InventoryItemBase originalItem 
+                = UserInventoryHelpers.CreateInventoryItem(
+                    m_scene, "givenObj", itemId, assetId, giverSp.UUID, InventoryType.Object);
+
+            GridInstantMessage receivedIm = null;
+            receiverClient.OnReceivedInstantMessage += im => receivedIm = im;
+
+            byte[] giveImBinaryBucket = new byte[17];
+            byte[] itemIdBytes = itemId.GetBytes();
+            Array.Copy(itemIdBytes, 0, giveImBinaryBucket, 1, itemIdBytes.Length);
+
+            GridInstantMessage giveIm 
+                = new GridInstantMessage(
+                    m_scene, 
+                    giverSp.UUID, 
+                    giverSp.Name, 
+                    receiverSp.UUID, 
+                    (byte)InstantMessageDialog.InventoryOffered,
+                    false,
+                    "inventory offered msg", 
+                    initialSessionId,
+                    false, 
+                    Vector3.Zero,
+                    giveImBinaryBucket,
+                    true);
+
+            giverClient.HandleImprovedInstantMessage(giveIm);
+
+            // These details might not all be correct.  
+            // Session ID is now the created item ID (!)
+            GridInstantMessage rejectIm 
+                = new GridInstantMessage(
+                    m_scene, 
+                    receiverSp.UUID, 
+                    receiverSp.Name, 
+                    giverSp.UUID, 
+                    (byte)InstantMessageDialog.InventoryDeclined, 
+                    false,
+                    "inventory declined msg", 
+                    new UUID(receivedIm.imSessionID),
+                    false, 
+                    Vector3.Zero,
+                    null,
+                    true);
+
+            receiverClient.HandleImprovedInstantMessage(rejectIm);
+
+            // Test for item remaining in the giver's inventory (here we assume a copy item)
+            // TODO: Test no-copy items.
+            InventoryItemBase originalItemAfterGive
+                = UserInventoryHelpers.GetInventoryItem(m_scene.InventoryService, giverSp.UUID, "Objects/givenObj");
+
+            Assert.That(originalItemAfterGive, Is.Not.Null);
+            Assert.That(originalItemAfterGive.ID, Is.EqualTo(originalItem.ID));
+
+            // Test for item successfully making it into the receiver's inventory
+            InventoryItemBase receivedItem 
+                = UserInventoryHelpers.GetInventoryItem(m_scene.InventoryService, receiverSp.UUID, "Trash/givenObj");
+
+            InventoryFolderBase trashFolder 
+                = m_scene.InventoryService.GetFolderForType(receiverSp.UUID, AssetType.TrashFolder);
+
+            Assert.That(receivedItem, Is.Not.Null);
+            Assert.That(receivedItem.ID, Is.Not.EqualTo(originalItem.ID));
+            Assert.That(receivedItem.Folder, Is.EqualTo(trashFolder.ID));
+
+            // Test that on a delete, item still exists and is accessible for the giver.
+            m_scene.InventoryService.PurgeFolder(trashFolder);
+
+            InventoryItemBase originalItemAfterDelete
+                = UserInventoryHelpers.GetInventoryItem(m_scene.InventoryService, giverSp.UUID, "Objects/givenObj");
+
+            Assert.That(originalItemAfterDelete, Is.Not.Null);
+        }  
+
+        [Test]
+        public void TestAcceptGivenFolder()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            UUID initialSessionId = TestHelpers.ParseTail(0x10);
+            UUID folderId = TestHelpers.ParseTail(0x100);
+
+            UserAccount ua1 
+                = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "One", TestHelpers.ParseTail(0x1), "pw");
+            UserAccount ua2 
+                = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "Two", TestHelpers.ParseTail(0x2), "pw");
+
+            ScenePresence giverSp = SceneHelpers.AddScenePresence(m_scene, ua1);
+            TestClient giverClient = (TestClient)giverSp.ControllingClient;
+
+            ScenePresence receiverSp = SceneHelpers.AddScenePresence(m_scene, ua2);
+            TestClient receiverClient = (TestClient)receiverSp.ControllingClient;
+
+            InventoryFolderBase originalFolder 
+                = UserInventoryHelpers.CreateInventoryFolder(
+                    m_scene.InventoryService, giverSp.UUID, folderId, "f1", true);
+
+            byte[] giveImBinaryBucket = new byte[17];
+            giveImBinaryBucket[0] = (byte)AssetType.Folder;
+            byte[] itemIdBytes = folderId.GetBytes();
+            Array.Copy(itemIdBytes, 0, giveImBinaryBucket, 1, itemIdBytes.Length);
+
+            GridInstantMessage giveIm 
+                = new GridInstantMessage(
+                    m_scene, 
+                    giverSp.UUID, 
+                    giverSp.Name, 
+                    receiverSp.UUID, 
+                    (byte)InstantMessageDialog.InventoryOffered,
+                    false,
+                    "inventory offered msg", 
+                    initialSessionId,
+                    false, 
+                    Vector3.Zero,
+                    giveImBinaryBucket,
+                    true);
+
+            giverClient.HandleImprovedInstantMessage(giveIm);
+
+            // These details might not all be correct.  
+            GridInstantMessage acceptIm 
+                = new GridInstantMessage(
+                    m_scene, 
+                    receiverSp.UUID, 
+                    receiverSp.Name, 
+                    giverSp.UUID, 
+                    (byte)InstantMessageDialog.InventoryAccepted, 
+                    false,
+                    "inventory accepted msg", 
+                    initialSessionId,
+                    false, 
+                    Vector3.Zero,
+                    null,
+                    true);
+
+            receiverClient.HandleImprovedInstantMessage(acceptIm);
+
+            // Test for item remaining in the giver's inventory (here we assume a copy item)
+            // TODO: Test no-copy items.
+            InventoryFolderBase originalFolderAfterGive
+                = UserInventoryHelpers.GetInventoryFolder(m_scene.InventoryService, giverSp.UUID, "f1");
+
+            Assert.That(originalFolderAfterGive, Is.Not.Null);
+            Assert.That(originalFolderAfterGive.ID, Is.EqualTo(originalFolder.ID));
+
+            // Test for item successfully making it into the receiver's inventory
+            InventoryFolderBase receivedFolder 
+                = UserInventoryHelpers.GetInventoryFolder(m_scene.InventoryService, receiverSp.UUID, "f1");
+
+            Assert.That(receivedFolder, Is.Not.Null);
+            Assert.That(receivedFolder.ID, Is.Not.EqualTo(originalFolder.ID));
+
+            // Test that on a delete, item still exists and is accessible for the giver.
+            m_scene.InventoryService.DeleteFolders(receiverSp.UUID, new List<UUID>() { receivedFolder.ID });
+
+            InventoryFolderBase originalFolderAfterDelete
+                = UserInventoryHelpers.GetInventoryFolder(m_scene.InventoryService, giverSp.UUID, "f1");
+
+            Assert.That(originalFolderAfterDelete, Is.Not.Null);
+
+            // TODO: Test scenario where giver deletes their item first.
+        }       
+
+        /// <summary>
+        /// Test user rejection of a given item.
+        /// </summary>
+        /// <remarks>
+        /// A rejected item still ends up in the user's trash folder.
+        /// </remarks>
+        [Test]
+        public void TestRejectGivenFolder()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            UUID initialSessionId = TestHelpers.ParseTail(0x10);
+            UUID folderId = TestHelpers.ParseTail(0x100);
+
+            UserAccount ua1 
+                = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "One", TestHelpers.ParseTail(0x1), "pw");
+            UserAccount ua2 
+                = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "Two", TestHelpers.ParseTail(0x2), "pw");
+
+            ScenePresence giverSp = SceneHelpers.AddScenePresence(m_scene, ua1);
+            TestClient giverClient = (TestClient)giverSp.ControllingClient;
+
+            ScenePresence receiverSp = SceneHelpers.AddScenePresence(m_scene, ua2);
+            TestClient receiverClient = (TestClient)receiverSp.ControllingClient;
+
+            // Create the folder to test give
+            InventoryFolderBase originalFolder 
+                = UserInventoryHelpers.CreateInventoryFolder(
+                    m_scene.InventoryService, giverSp.UUID, folderId, "f1", true);
+
+            GridInstantMessage receivedIm = null;
+            receiverClient.OnReceivedInstantMessage += im => receivedIm = im;
+
+            byte[] giveImBinaryBucket = new byte[17];
+            giveImBinaryBucket[0] = (byte)AssetType.Folder;
+            byte[] itemIdBytes = folderId.GetBytes();
+            Array.Copy(itemIdBytes, 0, giveImBinaryBucket, 1, itemIdBytes.Length);
+
+            GridInstantMessage giveIm 
+                = new GridInstantMessage(
+                    m_scene, 
+                    giverSp.UUID, 
+                    giverSp.Name, 
+                    receiverSp.UUID, 
+                    (byte)InstantMessageDialog.InventoryOffered,
+                    false,
+                    "inventory offered msg", 
+                    initialSessionId,
+                    false, 
+                    Vector3.Zero,
+                    giveImBinaryBucket,
+                    true);
+
+            giverClient.HandleImprovedInstantMessage(giveIm);
+
+            // These details might not all be correct.  
+            // Session ID is now the created item ID (!)
+            GridInstantMessage rejectIm 
+                = new GridInstantMessage(
+                    m_scene, 
+                    receiverSp.UUID, 
+                    receiverSp.Name, 
+                    giverSp.UUID, 
+                    (byte)InstantMessageDialog.InventoryDeclined, 
+                    false,
+                    "inventory declined msg", 
+                    new UUID(receivedIm.imSessionID),
+                    false, 
+                    Vector3.Zero,
+                    null,
+                    true);
+
+            receiverClient.HandleImprovedInstantMessage(rejectIm);
+
+            // Test for item remaining in the giver's inventory (here we assume a copy item)
+            // TODO: Test no-copy items.
+            InventoryFolderBase originalFolderAfterGive
+                = UserInventoryHelpers.GetInventoryFolder(m_scene.InventoryService, giverSp.UUID, "f1");
+
+            Assert.That(originalFolderAfterGive, Is.Not.Null);
+            Assert.That(originalFolderAfterGive.ID, Is.EqualTo(originalFolder.ID));
+
+            // Test for folder successfully making it into the receiver's inventory
+            InventoryFolderBase receivedFolder 
+                = UserInventoryHelpers.GetInventoryFolder(m_scene.InventoryService, receiverSp.UUID, "Trash/f1");
+
+            InventoryFolderBase trashFolder 
+                = m_scene.InventoryService.GetFolderForType(receiverSp.UUID, AssetType.TrashFolder);
+
+            Assert.That(receivedFolder, Is.Not.Null);
+            Assert.That(receivedFolder.ID, Is.Not.EqualTo(originalFolder.ID));
+            Assert.That(receivedFolder.ParentID, Is.EqualTo(trashFolder.ID));
+
+            // Test that on a delete, item still exists and is accessible for the giver.
+            m_scene.InventoryService.PurgeFolder(trashFolder);
+
+            InventoryFolderBase originalFolderAfterDelete
+                = UserInventoryHelpers.GetInventoryFolder(m_scene.InventoryService, giverSp.UUID, "f1");
+
+            Assert.That(originalFolderAfterDelete, Is.Not.Null);
+        }  
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
index bf24030..2bb24ae 100644
--- a/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs
@@ -57,6 +57,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Profile
 
         public void Initialise(IConfigSource config)
         {
+            if(config.Configs["UserProfiles"] != null)
+                return;
+
             m_log.DebugFormat("[PROFILE MODULE]: Basic Profile Module enabled");
             m_Enabled = true;
         }
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
new file mode 100644
index 0000000..56ff2bd
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
@@ -0,0 +1,1343 @@
+/*
+ * 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.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Net;
+using System.Net.Sockets;
+using System.Reflection;
+using System.Xml;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using log4net;
+using Nini.Config;
+using Nwc.XmlRpc;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using Mono.Addins;
+using OpenSim.Services.Connectors.Hypergrid;
+
+namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles
+{
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "UserProfilesModule")]
+    public class UserProfileModule : IProfileModule, INonSharedRegionModule
+    {
+        /// <summary>
+        /// Logging
+        /// </summary>
+        static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        // The pair of Dictionaries are used to handle the switching of classified ads
+        // by maintaining a cache of classified id to creator id mappings and an interest
+        // count. The entries are removed when the interest count reaches 0.
+        Dictionary<UUID, UUID> m_classifiedCache = new Dictionary<UUID, UUID>();
+        Dictionary<UUID, int> m_classifiedInterest = new Dictionary<UUID, int>();
+
+        public Scene Scene
+        {
+            get; private set;
+        }
+
+        /// <summary>
+        /// Gets or sets the ConfigSource.
+        /// </summary>
+        /// <value>
+        /// The configuration
+        /// </value>
+        public IConfigSource Config {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Gets or sets the URI to the profile server.
+        /// </summary>
+        /// <value>
+        /// The profile server URI.
+        /// </value>
+        public string ProfileServerUri {
+            get;
+            set;
+        }
+
+        IProfileModule ProfileModule
+        {
+            get; set;
+        }
+
+        IUserManagement UserManagementModule
+        {
+            get; set;
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this
+        /// <see cref="OpenSim.Region.Coremodules.UserProfiles.UserProfileModule"/> is enabled.
+        /// </summary>
+        /// <value>
+        /// <c>true</c> if enabled; otherwise, <c>false</c>.
+        /// </value>
+        public bool Enabled {
+            get;
+            set;
+        }
+
+        #region IRegionModuleBase implementation
+        /// <summary>
+        ///  This is called to initialize the region module. For shared modules, this is called exactly once, after
+        /// creating the single (shared) instance. For non-shared modules, this is called once on each instance, after
+        /// the instace for the region has been created. 
+        /// </summary>
+        /// <param name='source'>
+        /// Source.
+        /// </param>
+        public void Initialise(IConfigSource source)
+        {
+            Config = source;
+            ReplaceableInterface = typeof(IProfileModule);
+
+            IConfig profileConfig = Config.Configs["UserProfiles"];
+
+            if (profileConfig == null)
+            {
+                m_log.Debug("[PROFILES]: UserProfiles disabled, no configuration");
+                Enabled = false;
+                return;
+            }
+
+            // If we find ProfileURL then we configure for FULL support
+            // else we setup for BASIC support
+            ProfileServerUri = profileConfig.GetString("ProfileServiceURL", "");
+            if (ProfileServerUri == "")
+            {
+                Enabled = false;
+                return;
+            }
+                
+            m_log.Debug("[PROFILES]: Full Profiles Enabled");
+            ReplaceableInterface = null;
+            Enabled = true;
+        }
+
+        /// <summary>
+        /// Adds the region.
+        /// </summary>
+        /// <param name='scene'>
+        /// Scene.
+        /// </param>
+        public void AddRegion(Scene scene)
+        {
+            if(!Enabled)
+                return;
+
+            Scene = scene;
+            Scene.RegisterModuleInterface<IProfileModule>(this);
+            Scene.EventManager.OnNewClient += OnNewClient;
+            Scene.EventManager.OnMakeRootAgent += HandleOnMakeRootAgent;
+
+            UserManagementModule = Scene.RequestModuleInterface<IUserManagement>();
+        }
+
+        void HandleOnMakeRootAgent (ScenePresence obj)
+        {
+            if(obj.PresenceType == PresenceType.Npc)
+                return;
+
+            Util.FireAndForget(delegate
+            {
+                GetImageAssets(((IScenePresence)obj).UUID);
+            });
+        }
+
+        /// <summary>
+        /// Removes the region.
+        /// </summary>
+        /// <param name='scene'>
+        /// Scene.
+        /// </param>
+        public void RemoveRegion(Scene scene)
+        {
+            if(!Enabled)
+                return;
+        }
+
+        /// <summary>
+        ///  This will be called once for every scene loaded. In a shared module this will be multiple times in one
+        /// instance, while a nonshared module instance will only be called once. This method is called after AddRegion
+        /// has been called in all modules for that scene, providing an opportunity to request another module's
+        /// interface, or hook an event from another module. 
+        /// </summary>
+        /// <param name='scene'>
+        /// Scene.
+        /// </param>
+        public void RegionLoaded(Scene scene)
+        {
+            if(!Enabled)
+                return;
+        }
+
+        /// <summary>
+        ///  If this returns non-null, it is the type of an interface that this module intends to register. This will
+        /// cause the loader to defer loading of this module until all other modules have been loaded. If no other
+        /// module has registered the interface by then, this module will be activated, else it will remain inactive,
+        /// letting the other module take over. This should return non-null ONLY in modules that are intended to be
+        /// easily replaceable, e.g. stub implementations that the developer expects to be replaced by third party
+        /// provided modules. 
+        /// </summary>
+        /// <value>
+        /// The replaceable interface.
+        /// </value>
+        public Type ReplaceableInterface
+        {
+            get; private set;
+        }
+
+        /// <summary>
+        /// Called as the instance is closed.
+        /// </summary>
+        public void Close()
+        {
+        }
+
+        /// <value>
+        ///  The name of the module 
+        /// </value>
+        /// <summary>
+        /// Gets the module name.
+        /// </summary>
+        public string Name
+        {
+            get { return "UserProfileModule"; }
+        }
+        #endregion IRegionModuleBase implementation
+
+        #region Region Event Handlers
+        /// <summary>
+        /// Raises the new client event.
+        /// </summary>
+        /// <param name='client'>
+        /// Client.
+        /// </param>
+        void OnNewClient(IClientAPI client)
+        {
+            //Profile
+            client.OnRequestAvatarProperties += RequestAvatarProperties;
+            client.OnUpdateAvatarProperties += AvatarPropertiesUpdate;
+            client.OnAvatarInterestUpdate += AvatarInterestsUpdate;
+
+            // Classifieds
+            client.AddGenericPacketHandler("avatarclassifiedsrequest", ClassifiedsRequest);
+            client.OnClassifiedInfoUpdate += ClassifiedInfoUpdate;
+            client.OnClassifiedInfoRequest += ClassifiedInfoRequest;
+            client.OnClassifiedDelete += ClassifiedDelete;
+
+            // Picks
+            client.AddGenericPacketHandler("avatarpicksrequest", PicksRequest);
+            client.AddGenericPacketHandler("pickinforequest", PickInfoRequest);
+            client.OnPickInfoUpdate += PickInfoUpdate;
+            client.OnPickDelete += PickDelete;
+
+            // Notes
+            client.AddGenericPacketHandler("avatarnotesrequest", NotesRequest);
+            client.OnAvatarNotesUpdate += NotesUpdate;
+        }
+        #endregion Region Event Handlers
+
+        #region Classified
+        ///
+        /// <summary>
+        /// Handles the avatar classifieds request.
+        /// </summary>
+        /// <param name='sender'>
+        /// Sender.
+        /// </param>
+        /// <param name='method'>
+        /// Method.
+        /// </param>
+        /// <param name='args'>
+        /// Arguments.
+        /// </param>
+        public void ClassifiedsRequest(Object sender, string method, List<String> args)
+        {
+            if (!(sender is IClientAPI))
+                return;
+
+            IClientAPI remoteClient = (IClientAPI)sender;
+
+            UUID targetID;
+            UUID.TryParse(args[0], out targetID);
+
+            // Can't handle NPC yet...
+            ScenePresence p = FindPresence(targetID);
+
+            if (null != p)
+            {
+                if (p.PresenceType == PresenceType.Npc)
+                    return;
+            }
+
+            string serverURI = string.Empty;
+            GetUserProfileServerURI(targetID, out serverURI);
+            UUID creatorId = UUID.Zero;
+            Dictionary<UUID, string> classifieds = new Dictionary<UUID, string>();
+
+            OSDMap parameters= new OSDMap();
+            UUID.TryParse(args[0], out creatorId);
+            parameters.Add("creatorId", OSD.FromUUID(creatorId));
+            OSD Params = (OSD)parameters;
+            if(!JsonRpcRequest(ref Params, "avatarclassifiedsrequest", serverURI, UUID.Random().ToString()))
+            {
+                remoteClient.SendAvatarClassifiedReply(new UUID(args[0]), classifieds);
+                return;
+            }
+
+            parameters = (OSDMap)Params;
+
+            OSDArray list = (OSDArray)parameters["result"];
+
+
+            foreach(OSD map in list)
+            {
+                OSDMap m = (OSDMap)map;
+                UUID cid = m["classifieduuid"].AsUUID();
+                string name = m["name"].AsString();
+
+                classifieds[cid] = name;
+
+                lock (m_classifiedCache)
+                {
+                    if (!m_classifiedCache.ContainsKey(cid))
+                    {
+                        m_classifiedCache.Add(cid,creatorId);
+                        m_classifiedInterest.Add(cid, 0);
+                    }
+
+                    m_classifiedInterest[cid]++;
+                }
+            }
+
+            remoteClient.SendAvatarClassifiedReply(new UUID(args[0]), classifieds);
+        }
+
+        public void ClassifiedInfoRequest(UUID queryClassifiedID, IClientAPI remoteClient)
+        {    
+            UUID target = remoteClient.AgentId;
+            UserClassifiedAdd ad = new UserClassifiedAdd();
+            ad.ClassifiedId = queryClassifiedID;
+
+            lock (m_classifiedCache)
+            {
+                if (m_classifiedCache.ContainsKey(queryClassifiedID))
+                {   
+                    target = m_classifiedCache[queryClassifiedID];
+
+                    m_classifiedInterest[queryClassifiedID] --;
+
+                    if (m_classifiedInterest[queryClassifiedID] == 0)
+                    {
+                        m_classifiedInterest.Remove(queryClassifiedID);
+                        m_classifiedCache.Remove(queryClassifiedID);
+                    }
+                }
+            }
+            
+            string serverURI = string.Empty;
+            GetUserProfileServerURI(target, out serverURI);
+
+            object Ad = (object)ad;
+            if(!JsonRpcRequest(ref Ad, "classifieds_info_query", serverURI, UUID.Random().ToString()))
+            {
+                remoteClient.SendAgentAlertMessage(
+                        "Error getting classified info", false);
+                return;
+            }
+            ad = (UserClassifiedAdd) Ad;
+
+            if(ad.CreatorId == UUID.Zero)
+                return;
+
+            Vector3 globalPos = new Vector3();
+            Vector3.TryParse(ad.GlobalPos, out globalPos);
+
+            remoteClient.SendClassifiedInfoReply(ad.ClassifiedId, ad.CreatorId, (uint)ad.CreationDate, (uint)ad.ExpirationDate,
+                                                 (uint)ad.Category, ad.Name, ad.Description, ad.ParcelId, (uint)ad.ParentEstate,
+                                                 ad.SnapshotId, ad.SimName, globalPos, ad.ParcelName, ad.Flags, ad.Price);
+
+        }
+
+        /// <summary>
+        /// Classifieds info update.
+        /// </summary>
+        /// <param name='queryclassifiedID'>
+        /// Queryclassified I.
+        /// </param>
+        /// <param name='queryCategory'>
+        /// Query category.
+        /// </param>
+        /// <param name='queryName'>
+        /// Query name.
+        /// </param>
+        /// <param name='queryDescription'>
+        /// Query description.
+        /// </param>
+        /// <param name='queryParcelID'>
+        /// Query parcel I.
+        /// </param>
+        /// <param name='queryParentEstate'>
+        /// Query parent estate.
+        /// </param>
+        /// <param name='querySnapshotID'>
+        /// Query snapshot I.
+        /// </param>
+        /// <param name='queryGlobalPos'>
+        /// Query global position.
+        /// </param>
+        /// <param name='queryclassifiedFlags'>
+        /// Queryclassified flags.
+        /// </param>
+        /// <param name='queryclassifiedPrice'>
+        /// Queryclassified price.
+        /// </param>
+        /// <param name='remoteClient'>
+        /// Remote client.
+        /// </param>
+        public void ClassifiedInfoUpdate(UUID queryclassifiedID, uint queryCategory, string queryName, string queryDescription, UUID queryParcelID,
+                                         uint queryParentEstate, UUID querySnapshotID, Vector3 queryGlobalPos, byte queryclassifiedFlags,
+                                         int queryclassifiedPrice, IClientAPI remoteClient)
+        {
+            UserClassifiedAdd ad = new UserClassifiedAdd();
+
+            Scene s = (Scene) remoteClient.Scene;
+            Vector3 pos = remoteClient.SceneAgent.AbsolutePosition;
+            ILandObject land = s.LandChannel.GetLandObject(pos.X, pos.Y);
+            ScenePresence p = FindPresence(remoteClient.AgentId);
+            
+            string serverURI = string.Empty;
+            GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+
+            if (land == null)
+            {
+                ad.ParcelName = string.Empty;
+            }
+            else
+            {
+                ad.ParcelName = land.LandData.Name;
+            }
+
+            ad.CreatorId = remoteClient.AgentId;
+            ad.ClassifiedId = queryclassifiedID;
+            ad.Category = Convert.ToInt32(queryCategory);
+            ad.Name = queryName;
+            ad.Description = queryDescription;
+            ad.ParentEstate = Convert.ToInt32(queryParentEstate);
+            ad.SnapshotId = querySnapshotID;
+            ad.SimName = remoteClient.Scene.RegionInfo.RegionName;
+            ad.GlobalPos = queryGlobalPos.ToString ();
+            ad.Flags = queryclassifiedFlags;
+            ad.Price = queryclassifiedPrice;
+            ad.ParcelId = p.currentParcelUUID;
+
+            object Ad = ad;
+
+            OSD.SerializeMembers(Ad);
+
+            if(!JsonRpcRequest(ref Ad, "classified_update", serverURI, UUID.Random().ToString()))
+            {
+                remoteClient.SendAgentAlertMessage(
+                        "Error updating classified", false);
+            }
+        }
+
+        /// <summary>
+        /// Classifieds delete.
+        /// </summary>
+        /// <param name='queryClassifiedID'>
+        /// Query classified I.
+        /// </param>
+        /// <param name='remoteClient'>
+        /// Remote client.
+        /// </param>
+        public void ClassifiedDelete(UUID queryClassifiedID, IClientAPI remoteClient)
+        {
+            string serverURI = string.Empty;
+            GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+
+            UUID classifiedId;
+            OSDMap parameters= new OSDMap();
+            UUID.TryParse(queryClassifiedID.ToString(), out classifiedId);
+            parameters.Add("classifiedId", OSD.FromUUID(classifiedId));
+            OSD Params = (OSD)parameters;
+            if(!JsonRpcRequest(ref Params, "classified_delete", serverURI, UUID.Random().ToString()))
+            {
+                remoteClient.SendAgentAlertMessage(
+                        "Error classified delete", false);
+            }
+
+            parameters = (OSDMap)Params;
+        }
+        #endregion Classified
+
+        #region Picks
+        /// <summary>
+        /// Handles the avatar picks request.
+        /// </summary>
+        /// <param name='sender'>
+        /// Sender.
+        /// </param>
+        /// <param name='method'>
+        /// Method.
+        /// </param>
+        /// <param name='args'>
+        /// Arguments.
+        /// </param>
+        public void PicksRequest(Object sender, string method, List<String> args)
+        {
+            if (!(sender is IClientAPI))
+                return;
+
+            IClientAPI remoteClient = (IClientAPI)sender;
+
+            UUID targetId;
+            UUID.TryParse(args[0], out targetId);
+
+            // Can't handle NPC yet...
+            ScenePresence p = FindPresence(targetId);
+
+            if (null != p)
+            {
+                if (p.PresenceType == PresenceType.Npc)
+                    return;
+            }
+
+            string serverURI = string.Empty;
+            GetUserProfileServerURI(targetId, out serverURI);
+            
+            Dictionary<UUID, string> picks = new Dictionary<UUID, string>();
+
+            OSDMap parameters= new OSDMap();
+            parameters.Add("creatorId", OSD.FromUUID(targetId));
+            OSD Params = (OSD)parameters;
+            if(!JsonRpcRequest(ref Params, "avatarpicksrequest", serverURI, UUID.Random().ToString()))
+            {
+                remoteClient.SendAvatarPicksReply(new UUID(args[0]), picks);
+                return;
+            }
+
+            parameters = (OSDMap)Params;
+
+            OSDArray list = (OSDArray)parameters["result"];
+
+            foreach(OSD map in list)
+            {
+                OSDMap m = (OSDMap)map;
+                UUID cid = m["pickuuid"].AsUUID();
+                string name = m["name"].AsString();
+                
+                m_log.DebugFormat("[PROFILES]: PicksRequest {0}", name);
+
+                picks[cid] = name;
+            }
+            remoteClient.SendAvatarPicksReply(new UUID(args[0]), picks);
+        }
+
+        /// <summary>
+        /// Handles the pick info request.
+        /// </summary>
+        /// <param name='sender'>
+        /// Sender.
+        /// </param>
+        /// <param name='method'>
+        /// Method.
+        /// </param>
+        /// <param name='args'>
+        /// Arguments.
+        /// </param>
+        public void PickInfoRequest(Object sender, string method, List<String> args)
+        {
+            if (!(sender is IClientAPI))
+                return;
+
+            UUID targetID;
+            UUID.TryParse(args[0], out targetID);
+            string serverURI = string.Empty;
+            GetUserProfileServerURI(targetID, out serverURI);
+            IClientAPI remoteClient = (IClientAPI)sender;
+
+            UserProfilePick pick = new UserProfilePick();
+            UUID.TryParse(args[0], out pick.CreatorId);
+            UUID.TryParse(args[1], out pick.PickId);
+
+                
+            object Pick = (object)pick;
+            if(!JsonRpcRequest(ref Pick, "pickinforequest", serverURI, UUID.Random().ToString()))
+            {
+                remoteClient.SendAgentAlertMessage(
+                        "Error selecting pick", false);
+            }
+            pick = (UserProfilePick) Pick;
+            if(pick.SnapshotId == UUID.Zero)
+            {
+                // In case of a new UserPick, the data may not be ready and we would send wrong data, skip it...
+                m_log.DebugFormat("[PROFILES]: PickInfoRequest: SnapshotID is {0}", UUID.Zero.ToString());
+                return;
+            }
+             
+            Vector3 globalPos;
+            Vector3.TryParse(pick.GlobalPos,out globalPos);
+
+            m_log.DebugFormat("[PROFILES]: PickInfoRequest: {0} : {1}", pick.Name.ToString(), pick.SnapshotId.ToString());
+
+            remoteClient.SendPickInfoReply(pick.PickId,pick.CreatorId,pick.TopPick,pick.ParcelId,pick.Name,
+                                           pick.Desc,pick.SnapshotId,pick.User,pick.OriginalName,pick.SimName,
+                                           globalPos,pick.SortOrder,pick.Enabled);
+        }
+
+        /// <summary>
+        /// Updates the userpicks
+        /// </summary>
+        /// <param name='remoteClient'>
+        /// Remote client.
+        /// </param>
+        /// <param name='pickID'>
+        /// Pick I.
+        /// </param>
+        /// <param name='creatorID'>
+        /// the creator of the pick
+        /// </param>
+        /// <param name='topPick'>
+        /// Top pick.
+        /// </param>
+        /// <param name='name'>
+        /// Name.
+        /// </param>
+        /// <param name='desc'>
+        /// Desc.
+        /// </param>
+        /// <param name='snapshotID'>
+        /// Snapshot I.
+        /// </param>
+        /// <param name='sortOrder'>
+        /// Sort order.
+        /// </param>
+        /// <param name='enabled'>
+        /// Enabled.
+        /// </param>
+        public void PickInfoUpdate(IClientAPI remoteClient, UUID pickID, UUID creatorID, bool topPick, string name, string desc, UUID snapshotID, int sortOrder, bool enabled)
+        {
+            
+            m_log.DebugFormat("[PROFILES]: Start PickInfoUpdate Name: {0} PickId: {1} SnapshotId: {2}", name, pickID.ToString(), snapshotID.ToString());
+            UserProfilePick pick = new UserProfilePick();
+            string serverURI = string.Empty;
+            GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+            ScenePresence p = FindPresence(remoteClient.AgentId);
+
+            Vector3 avaPos = p.AbsolutePosition;
+            // Getting the global position for the Avatar
+            Vector3 posGlobal = new Vector3(remoteClient.Scene.RegionInfo.RegionLocX*Constants.RegionSize + avaPos.X,
+                                            remoteClient.Scene.RegionInfo.RegionLocY*Constants.RegionSize + avaPos.Y,
+                                            avaPos.Z);
+
+            string landOwnerName = string.Empty;
+            ILandObject land =  p.Scene.LandChannel.GetLandObject(avaPos.X, avaPos.Y);
+            if(land.LandData.IsGroupOwned)
+            {
+                IGroupsModule groupMod = p.Scene.RequestModuleInterface<IGroupsModule>();
+                UUID groupId = land.LandData.GroupID;
+                GroupRecord groupRecord = groupMod.GetGroupRecord(groupId);
+                landOwnerName = groupRecord.GroupName;
+            }
+            else
+            {
+                IUserAccountService accounts = p.Scene.RequestModuleInterface<IUserAccountService>();
+                UserAccount user = accounts.GetUserAccount(p.Scene.RegionInfo.ScopeID, land.LandData.OwnerID);
+                landOwnerName = user.Name;
+            }
+
+            pick.PickId = pickID;
+            pick.CreatorId = creatorID;
+            pick.TopPick = topPick;
+            pick.Name = name;
+            pick.Desc = desc;
+            pick.ParcelId = p.currentParcelUUID;
+            pick.SnapshotId = snapshotID;
+            pick.User = landOwnerName;
+            pick.SimName = remoteClient.Scene.RegionInfo.RegionName;
+            pick.GlobalPos = posGlobal.ToString();
+            pick.SortOrder = sortOrder;
+            pick.Enabled = enabled;
+
+            object Pick = (object)pick;
+            if(!JsonRpcRequest(ref Pick, "picks_update", serverURI, UUID.Random().ToString()))
+            {
+                remoteClient.SendAgentAlertMessage(
+                        "Error updating pick", false);
+            }
+
+            m_log.DebugFormat("[PROFILES]: Finish PickInfoUpdate {0} {1}", pick.Name, pick.PickId.ToString());
+        }
+
+        /// <summary>
+        /// Delete a Pick
+        /// </summary>
+        /// <param name='remoteClient'>
+        /// Remote client.
+        /// </param>
+        /// <param name='queryPickID'>
+        /// Query pick I.
+        /// </param>
+        public void PickDelete(IClientAPI remoteClient, UUID queryPickID)
+        {
+            string serverURI = string.Empty;
+            GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+
+            OSDMap parameters= new OSDMap();
+            parameters.Add("pickId", OSD.FromUUID(queryPickID));
+            OSD Params = (OSD)parameters;
+            if(!JsonRpcRequest(ref Params, "picks_delete", serverURI, UUID.Random().ToString()))
+            {
+                remoteClient.SendAgentAlertMessage(
+                        "Error picks delete", false);
+            }
+        }
+        #endregion Picks
+
+        #region Notes
+        /// <summary>
+        /// Handles the avatar notes request.
+        /// </summary>
+        /// <param name='sender'>
+        /// Sender.
+        /// </param>
+        /// <param name='method'>
+        /// Method.
+        /// </param>
+        /// <param name='args'>
+        /// Arguments.
+        /// </param>
+        public void NotesRequest(Object sender, string method, List<String> args)
+        {
+            UserProfileNotes note = new UserProfileNotes();
+
+            if (!(sender is IClientAPI))
+                return;
+
+            IClientAPI remoteClient = (IClientAPI)sender;
+            string serverURI = string.Empty;
+            GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+            note.TargetId = remoteClient.AgentId;
+            UUID.TryParse(args[0], out note.UserId);
+
+            object Note = (object)note;
+            if(!JsonRpcRequest(ref Note, "avatarnotesrequest", serverURI, UUID.Random().ToString()))
+            {
+                remoteClient.SendAvatarNotesReply(note.TargetId, note.Notes);
+                return;
+            }
+            note = (UserProfileNotes) Note;
+                
+            remoteClient.SendAvatarNotesReply(note.TargetId, note.Notes);
+        }
+
+        /// <summary>
+        /// Avatars the notes update.
+        /// </summary>
+        /// <param name='remoteClient'>
+        /// Remote client.
+        /// </param>
+        /// <param name='queryTargetID'>
+        /// Query target I.
+        /// </param>
+        /// <param name='queryNotes'>
+        /// Query notes.
+        /// </param>
+        public void NotesUpdate(IClientAPI remoteClient, UUID queryTargetID, string queryNotes)
+        {
+            UserProfileNotes note = new UserProfileNotes();
+
+            note.UserId = remoteClient.AgentId;
+            note.TargetId = queryTargetID;
+            note.Notes = queryNotes;
+
+            string serverURI = string.Empty;
+            GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+
+            object Note = note;
+            if(!JsonRpcRequest(ref Note, "avatar_notes_update", serverURI, UUID.Random().ToString()))
+            {
+                return;
+            }
+        }
+        #endregion Notes
+
+        #region Avatar Properties
+        /// <summary>
+        /// Update the avatars interests .
+        /// </summary>
+        /// <param name='remoteClient'>
+        /// Remote client.
+        /// </param>
+        /// <param name='wantmask'>
+        /// Wantmask.
+        /// </param>
+        /// <param name='wanttext'>
+        /// Wanttext.
+        /// </param>
+        /// <param name='skillsmask'>
+        /// Skillsmask.
+        /// </param>
+        /// <param name='skillstext'>
+        /// Skillstext.
+        /// </param>
+        /// <param name='languages'>
+        /// Languages.
+        /// </param>
+        public void AvatarInterestsUpdate(IClientAPI remoteClient, uint wantmask, string wanttext, uint skillsmask, string skillstext, string languages)
+        {
+            UserProfileProperties prop = new UserProfileProperties();
+
+            prop.UserId = remoteClient.AgentId;
+            prop.WantToMask = (int)wantmask;
+            prop.WantToText = wanttext;
+            prop.SkillsMask = (int)skillsmask;
+            prop.SkillsText = skillstext;
+            prop.Language = languages;
+
+            string serverURI = string.Empty;
+            GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+
+            object Param = prop;
+            if(!JsonRpcRequest(ref Param, "avatar_interests_update", serverURI, UUID.Random().ToString()))
+            {
+                remoteClient.SendAgentAlertMessage(
+                        "Error updating interests", false);
+            }
+        }
+
+        public void RequestAvatarProperties(IClientAPI remoteClient, UUID avatarID)
+        {
+            if ( String.IsNullOrEmpty(avatarID.ToString()) || String.IsNullOrEmpty(remoteClient.AgentId.ToString()))
+            {
+                // Looking for a reason that some viewers are sending null Id's
+                m_log.DebugFormat("[PROFILES]: This should not happen remoteClient.AgentId {0} - avatarID {1}", remoteClient.AgentId, avatarID);
+                return;
+            }
+
+            // Can't handle NPC yet...
+            ScenePresence p = FindPresence(avatarID);
+
+            if (null != p)
+            {
+                if (p.PresenceType == PresenceType.Npc)
+                    return;
+            }
+
+            string serverURI = string.Empty;
+            bool foreign = GetUserProfileServerURI(avatarID, out serverURI);
+
+            UserAccount account = null;
+            Dictionary<string,object> userInfo;
+
+            if (!foreign)
+            {
+                account = Scene.UserAccountService.GetUserAccount(Scene.RegionInfo.ScopeID, avatarID);
+            }
+            else
+            {
+                userInfo = new Dictionary<string, object>();
+            }
+
+            Byte[] charterMember = new Byte[1];
+            string born = String.Empty;
+            uint flags = 0x00;
+
+            if (null != account)
+            {
+                if (account.UserTitle == "")
+                {
+                    charterMember[0] = (Byte)((account.UserFlags & 0xf00) >> 8);
+                }
+                else
+                {
+                    charterMember = Utils.StringToBytes(account.UserTitle);
+                }
+
+                born = Util.ToDateTime(account.Created).ToString(
+                                  "M/d/yyyy", CultureInfo.InvariantCulture);
+                flags = (uint)(account.UserFlags & 0xff);
+            }
+            else
+            {
+                if (GetUserAccountData(avatarID, out userInfo) == true)
+                {
+                    if ((string)userInfo["user_title"] == "")
+                    {
+                        charterMember[0] = (Byte)(((Byte)userInfo["user_flags"] & 0xf00) >> 8);
+                    }
+                    else
+                    {
+                        charterMember = Utils.StringToBytes((string)userInfo["user_title"]);
+                    }
+
+                    int val_born = (int)userInfo["user_created"];
+                    born = Util.ToDateTime(val_born).ToString(
+                                  "M/d/yyyy", CultureInfo.InvariantCulture);
+
+                    // picky, picky
+                    int val_flags = (int)userInfo["user_flags"];
+                    flags = (uint)(val_flags & 0xff);
+                }
+            }
+
+            UserProfileProperties props = new UserProfileProperties();
+            string result = string.Empty;
+
+            props.UserId = avatarID;
+            GetProfileData(ref props, out result);
+
+            remoteClient.SendAvatarProperties(props.UserId, props.AboutText, born, charterMember , props.FirstLifeText, flags,
+                                              props.FirstLifeImageId, props.ImageId, props.WebUrl, props.PartnerId);
+
+
+            remoteClient.SendAvatarInterestsReply(props.UserId, (uint)props.WantToMask, props.WantToText, (uint)props.SkillsMask,
+                                                  props.SkillsText, props.Language);
+        }
+
+        /// <summary>
+        /// Updates the avatar properties.
+        /// </summary>
+        /// <param name='remoteClient'>
+        /// Remote client.
+        /// </param>
+        /// <param name='newProfile'>
+        /// New profile.
+        /// </param>
+        public void AvatarPropertiesUpdate(IClientAPI remoteClient, UserProfileData newProfile)
+        {
+            if (remoteClient.AgentId == newProfile.ID)
+            {
+                UserProfileProperties prop = new UserProfileProperties();
+
+                prop.UserId = remoteClient.AgentId;
+                prop.WebUrl = newProfile.ProfileUrl;
+                prop.ImageId = newProfile.Image;
+                prop.AboutText = newProfile.AboutText;
+                prop.FirstLifeImageId = newProfile.FirstLifeImage;
+                prop.FirstLifeText = newProfile.FirstLifeAboutText;
+
+                string serverURI = string.Empty;
+                GetUserProfileServerURI(remoteClient.AgentId, out serverURI);
+
+                object Prop = prop;
+
+                if(!JsonRpcRequest(ref Prop, "avatar_properties_update", serverURI, UUID.Random().ToString()))
+                {
+                    remoteClient.SendAgentAlertMessage(
+                            "Error updating properties", false);
+                }
+
+                RequestAvatarProperties(remoteClient, newProfile.ID);
+            }
+        }
+
+        /// <summary>
+        /// Gets the profile data.
+        /// </summary>
+        /// <returns>
+        /// The profile data.
+        /// </returns>
+        /// <param name='userID'>
+        /// User I.
+        /// </param>
+        bool GetProfileData(ref UserProfileProperties properties, out string message)
+        {
+            // Can't handle NPC yet...
+            ScenePresence p = FindPresence(properties.UserId);
+
+            if (null != p)
+            {
+                if (p.PresenceType == PresenceType.Npc)
+                {
+                    message = "Id points to NPC";
+                    return false;
+                }
+            }
+
+            string serverURI = string.Empty;
+            GetUserProfileServerURI(properties.UserId, out serverURI);
+
+            // This is checking a friend on the home grid
+            // Not HG friend
+            if ( String.IsNullOrEmpty(serverURI))
+            {
+                message = "No Presence - foreign friend";
+                return false;
+            }
+
+            object Prop = (object)properties;
+            JsonRpcRequest(ref Prop, "avatar_properties_request", serverURI, UUID.Random().ToString());
+            properties = (UserProfileProperties)Prop;
+
+            message = "Success";
+            return true;
+        }
+        #endregion Avatar Properties
+
+        #region Utils
+        bool GetImageAssets(UUID avatarId)
+        {
+            string profileServerURI = string.Empty;
+            string assetServerURI = string.Empty;
+
+            bool foreign = GetUserProfileServerURI(avatarId, out profileServerURI);
+
+            if(!foreign)
+                return true;
+
+            assetServerURI = UserManagementModule.GetUserServerURL(avatarId, "AssetServerURI");
+
+            OSDMap parameters= new OSDMap();
+            parameters.Add("avatarId", OSD.FromUUID(avatarId));
+            OSD Params = (OSD)parameters;
+            if(!JsonRpcRequest(ref Params, "image_assets_request", profileServerURI, UUID.Random().ToString()))
+            {
+                return false;
+            }
+            
+            parameters = (OSDMap)Params;
+            
+            OSDArray list = (OSDArray)parameters["result"];
+            
+            foreach(OSD asset in list)
+            {
+                OSDString assetId = (OSDString)asset;
+
+                Scene.AssetService.Get(string.Format("{0}/{1}",assetServerURI, assetId.AsString()));
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// Gets the user account data.
+        /// </summary>
+        /// <returns>
+        /// The user profile data.
+        /// </returns>
+        /// <param name='userID'>
+        /// If set to <c>true</c> user I.
+        /// </param>
+        /// <param name='userInfo'>
+        /// If set to <c>true</c> user info.
+        /// </param>
+        bool GetUserAccountData(UUID userID, out Dictionary<string, object> userInfo)
+        {
+            Dictionary<string,object> info = new Dictionary<string, object>();
+
+            if (UserManagementModule.IsLocalGridUser(userID))
+            {
+                // Is local
+                IUserAccountService uas = Scene.UserAccountService;
+                UserAccount account = uas.GetUserAccount(Scene.RegionInfo.ScopeID, userID);
+
+                info["user_flags"] = account.UserFlags;
+                info["user_created"] = account.Created;
+
+                if (!String.IsNullOrEmpty(account.UserTitle))
+                    info["user_title"] = account.UserTitle;
+                else
+                    info["user_title"] = "";
+
+                userInfo = info;
+
+                return false;
+            }
+            else
+            {
+                // Is Foreign
+                string home_url = UserManagementModule.GetUserServerURL(userID, "HomeURI");
+
+                if (String.IsNullOrEmpty(home_url))
+                {
+                    info["user_flags"] = 0;
+                    info["user_created"] = 0;
+                    info["user_title"] = "Unavailable";
+
+                    userInfo = info;
+                    return true;
+                }
+
+                UserAgentServiceConnector uConn = new UserAgentServiceConnector(home_url);
+
+                Dictionary<string, object> account = uConn.GetUserInfo(userID);
+
+                if (account.Count > 0)
+                {
+                    if (account.ContainsKey("user_flags"))
+                        info["user_flags"] = account["user_flags"];
+                    else
+                        info["user_flags"] = "";
+
+                    if (account.ContainsKey("user_created"))
+                        info["user_created"] = account["user_created"];
+                    else
+                        info["user_created"] = "";
+
+                    info["user_title"] = "HG Visitor";
+                }
+                else
+                {
+                   info["user_flags"] = 0;
+                   info["user_created"] = 0;
+                   info["user_title"] = "HG Visitor";
+                }
+                userInfo = info;
+                return true;
+            }
+        }
+
+        /// <summary>
+        /// Gets the user profile server UR.
+        /// </summary>
+        /// <returns>
+        /// The user profile server UR.
+        /// </returns>
+        /// <param name='userID'>
+        /// If set to <c>true</c> user I.
+        /// </param>
+        /// <param name='serverURI'>
+        /// If set to <c>true</c> server UR.
+        /// </param>
+        bool GetUserProfileServerURI(UUID userID, out string serverURI)
+        {
+            bool local;
+            local = UserManagementModule.IsLocalGridUser(userID);
+
+            if (!local)
+            {
+                serverURI = UserManagementModule.GetUserServerURL(userID, "ProfileServerURI");
+                // Is Foreign
+                return true;
+            }
+            else
+            {
+                serverURI = ProfileServerUri;
+                // Is local
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Finds the presence.
+        /// </summary>
+        /// <returns>
+        /// The presence.
+        /// </returns>
+        /// <param name='clientID'>
+        /// Client I.
+        /// </param>
+        ScenePresence FindPresence(UUID clientID)
+        {
+            ScenePresence p;
+
+            p = Scene.GetScenePresence(clientID);
+            if (p != null && !p.IsChildAgent)
+                return p;
+
+            return null;
+        }
+        #endregion Util
+
+        #region Web Util
+        /// <summary>
+        /// Sends json-rpc request with a serializable type.
+        /// </summary>
+        /// <returns>
+        /// OSD Map.
+        /// </returns>
+        /// <param name='parameters'>
+        /// Serializable type .
+        /// </param>
+        /// <param name='method'>
+        /// Json-rpc method to call.
+        /// </param>
+        /// <param name='uri'>
+        /// URI of json-rpc service.
+        /// </param>
+        /// <param name='jsonId'>
+        /// Id for our call.
+        /// </param>
+        bool JsonRpcRequest(ref object parameters, string method, string uri, string jsonId)
+        {
+            if (jsonId == null)
+                throw new ArgumentNullException ("jsonId");
+            if (uri == null)
+                throw new ArgumentNullException ("uri");
+            if (method == null)
+                throw new ArgumentNullException ("method");
+            if (parameters == null)
+                throw new ArgumentNullException ("parameters");
+
+            // Prep our payload
+            OSDMap json = new OSDMap();
+
+            json.Add("jsonrpc", OSD.FromString("2.0"));
+            json.Add("id", OSD.FromString(jsonId));
+            json.Add("method", OSD.FromString(method));
+
+            json.Add("params", OSD.SerializeMembers(parameters));
+
+            string jsonRequestData = OSDParser.SerializeJsonString(json);
+            byte[] content = Encoding.UTF8.GetBytes(jsonRequestData);
+
+            HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create(uri);
+
+            webRequest.ContentType = "application/json-rpc";
+            webRequest.Method = "POST";
+
+            Stream dataStream = webRequest.GetRequestStream();
+            dataStream.Write(content, 0, content.Length);
+            dataStream.Close();
+
+            WebResponse webResponse = null;
+            try
+            {
+                webResponse = webRequest.GetResponse();
+            }
+            catch (WebException e)
+            {
+                Console.WriteLine("Web Error" + e.Message);
+                Console.WriteLine ("Please check input");
+                return false;
+            }
+
+            Stream rstream = webResponse.GetResponseStream();
+              
+            OSDMap mret = new OSDMap();
+            try
+            {
+                mret = (OSDMap)OSDParser.DeserializeJson(rstream);
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES]: JsonRpcRequest Error {0} - remote user with legacy profiles?", e.Message);
+                return false;
+            }
+
+
+            if (mret.ContainsKey("error"))
+                return false;
+            
+            // get params...
+            OSD.DeserializeMembers(ref parameters, (OSDMap) mret["result"]);
+            return true;
+        }
+
+        /// <summary>
+        /// Sends json-rpc request with OSD parameter.
+        /// </summary>
+        /// <returns>
+        /// The rpc request.
+        /// </returns>
+        /// <param name='data'>
+        /// data - incoming as parameters, outgong as result/error
+        /// </param>
+        /// <param name='method'>
+        /// Json-rpc method to call.
+        /// </param>
+        /// <param name='uri'>
+        /// URI of json-rpc service.
+        /// </param>
+        /// <param name='jsonId'>
+        /// If set to <c>true</c> json identifier.
+        /// </param>
+        bool JsonRpcRequest(ref OSD data, string method, string uri, string jsonId)
+        {
+            OSDMap map = new OSDMap();
+
+            map["jsonrpc"] = "2.0";
+            if(string.IsNullOrEmpty(jsonId))
+                map["id"] = UUID.Random().ToString();
+            else
+                map["id"] = jsonId;
+
+            map["method"] = method;
+            map["params"] = data;
+
+            string jsonRequestData = OSDParser.SerializeJsonString(map);
+            byte[] content = Encoding.UTF8.GetBytes(jsonRequestData);
+
+            HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create(uri);
+            webRequest.ContentType = "application/json-rpc";
+            webRequest.Method = "POST";
+
+            Stream dataStream = webRequest.GetRequestStream();
+            dataStream.Write(content, 0, content.Length);
+            dataStream.Close();
+
+            WebResponse webResponse = null;
+            try
+            {
+                webResponse = webRequest.GetResponse();
+            }
+            catch (WebException e)
+            {
+                Console.WriteLine("Web Error" + e.Message);
+                Console.WriteLine ("Please check input");
+                return false;
+            }
+
+            Stream rstream = webResponse.GetResponseStream();
+
+            OSDMap response = new OSDMap();
+            try
+            {
+                response = (OSDMap)OSDParser.DeserializeJson(rstream);
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[PROFILES]: JsonRpcRequest Error {0} - remote user with legacy profiles?", e.Message);
+                return false;
+            }
+
+            if(response.ContainsKey("error"))
+            {
+                data = response["error"];
+                return false;
+            }
+
+            data = response;
+
+            return true;
+        }
+        #endregion Web Util
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
index fff86d5..de8925d 100644
--- a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
@@ -28,6 +28,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
 using System.Text;
 using log4net;
@@ -37,6 +38,7 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using Caps=OpenSim.Framework.Capabilities.Caps;
@@ -57,8 +59,9 @@ namespace OpenSim.Region.CoreModules.Framework
         /// </summary>
         protected Dictionary<uint, Caps> m_capsObjects = new Dictionary<uint, Caps>();
         
-        protected Dictionary<UUID, string> capsPaths = new Dictionary<UUID, string>();
-        protected Dictionary<UUID, Dictionary<ulong, string>> childrenSeeds 
+        protected Dictionary<UUID, string> m_capsPaths = new Dictionary<UUID, string>();
+
+        protected Dictionary<UUID, Dictionary<ulong, string>> m_childrenSeeds 
             = new Dictionary<UUID, Dictionary<ulong, string>>();
         
         public void Initialise(IConfigSource source)
@@ -70,9 +73,24 @@ namespace OpenSim.Region.CoreModules.Framework
             m_scene = scene;
             m_scene.RegisterModuleInterface<ICapabilitiesModule>(this);
 
-            MainConsole.Instance.Commands.AddCommand("Comms", false, "show caps",
-                "show caps",
-                "Shows all registered capabilities for users", HandleShowCapsCommand);
+            MainConsole.Instance.Commands.AddCommand(
+                "Comms", false, "show caps list",
+                "show caps list",
+                "Shows list of registered capabilities for users.", HandleShowCapsListCommand);
+
+            MainConsole.Instance.Commands.AddCommand(
+                "Comms", false, "show caps stats by user",
+                "show caps stats by user [<first-name> <last-name>]",
+                "Shows statistics on capabilities use by user.",
+                "If a user name is given, then prints a detailed breakdown of caps use ordered by number of requests received.",
+                HandleShowCapsStatsByUserCommand);
+
+            MainConsole.Instance.Commands.AddCommand(
+                "Comms", false, "show caps stats by cap",
+                "show caps stats by cap [<cap-name>]",
+                "Shows statistics on capabilities use by capability.",
+                "If a capability name is given, then prints a detailed breakdown of use by each user.",
+                HandleShowCapsStatsByCapCommand);
         }
 
         public void RegionLoaded(Scene scene)
@@ -106,35 +124,38 @@ namespace OpenSim.Region.CoreModules.Framework
             if (m_scene.RegionInfo.EstateSettings.IsBanned(agentId, flags))
                 return;
 
+            Caps caps;
             String capsObjectPath = GetCapsPath(agentId);
 
-            if (m_capsObjects.ContainsKey(circuitCode))
+            lock (m_capsObjects)
             {
-                Caps oldCaps = m_capsObjects[circuitCode];
-                
-                m_log.DebugFormat(
-                    "[CAPS]: Recreating caps for agent {0}.  Old caps path {1}, new caps path {2}. ", 
-                    agentId, oldCaps.CapsObjectPath, capsObjectPath);
-                // This should not happen. The caller code is confused. We need to fix that.
-                // CAPs can never be reregistered, or the client will be confused.
-                // Hence this return here.
-                //return;
-            }
-
-            Caps caps = new Caps(MainServer.Instance, m_scene.RegionInfo.ExternalHostName,
-                    (MainServer.Instance == null) ? 0: MainServer.Instance.Port,
-                    capsObjectPath, agentId, m_scene.RegionInfo.RegionName);
+                if (m_capsObjects.ContainsKey(circuitCode))
+                {
+                    Caps oldCaps = m_capsObjects[circuitCode];
+                    
+                    //m_log.WarnFormat(
+                    //    "[CAPS]: Recreating caps for agent {0} in region {1}.  Old caps path {2}, new caps path {3}. ", 
+                    //    agentId, m_scene.RegionInfo.RegionName, oldCaps.CapsObjectPath, capsObjectPath);
+                }
 
-            m_capsObjects[circuitCode] = caps;
+                caps = new Caps(MainServer.Instance, m_scene.RegionInfo.ExternalHostName,
+                        (MainServer.Instance == null) ? 0: MainServer.Instance.Port,
+                        capsObjectPath, agentId, m_scene.RegionInfo.RegionName);
 
+                m_capsObjects[circuitCode] = caps;
+            }
             m_scene.EventManager.TriggerOnRegisterCaps(agentId, caps);
         }
 
         public void RemoveCaps(UUID agentId, uint circuitCode)
         {
-            if (childrenSeeds.ContainsKey(agentId))
+            m_log.DebugFormat("[CAPS]: Remove caps for agent {0} in region {1}", agentId, m_scene.RegionInfo.RegionName);
+            lock (m_childrenSeeds)
             {
-                childrenSeeds.Remove(agentId);
+                if (m_childrenSeeds.ContainsKey(agentId))
+                {
+                    m_childrenSeeds.Remove(agentId);
+                }
             }
 
             lock (m_capsObjects)
@@ -180,16 +201,22 @@ namespace OpenSim.Region.CoreModules.Framework
 
         public void SetAgentCapsSeeds(AgentCircuitData agent)
         {
-            capsPaths[agent.AgentID] = agent.CapsPath;
-            childrenSeeds[agent.AgentID] 
-                = ((agent.ChildrenCapSeeds == null) ? new Dictionary<ulong, string>() : agent.ChildrenCapSeeds);
+            lock (m_capsPaths)
+                m_capsPaths[agent.AgentID] = agent.CapsPath;
+
+            lock (m_childrenSeeds)
+                m_childrenSeeds[agent.AgentID] 
+                    = ((agent.ChildrenCapSeeds == null) ? new Dictionary<ulong, string>() : agent.ChildrenCapSeeds);
         }
         
         public string GetCapsPath(UUID agentId)
         {
-            if (capsPaths.ContainsKey(agentId))
+            lock (m_capsPaths)
             {
-                return capsPaths[agentId];
+                if (m_capsPaths.ContainsKey(agentId))
+                {
+                    return m_capsPaths[agentId];
+                }
             }
 
             return null;
@@ -198,17 +225,24 @@ namespace OpenSim.Region.CoreModules.Framework
         public Dictionary<ulong, string> GetChildrenSeeds(UUID agentID)
         {
             Dictionary<ulong, string> seeds = null;
-            if (childrenSeeds.TryGetValue(agentID, out seeds))
-                return seeds;
+
+            lock (m_childrenSeeds)
+                if (m_childrenSeeds.TryGetValue(agentID, out seeds))
+                    return seeds;
+
             return new Dictionary<ulong, string>();
         }
 
         public void DropChildSeed(UUID agentID, ulong handle)
         {
             Dictionary<ulong, string> seeds;
-            if (childrenSeeds.TryGetValue(agentID, out seeds))
+
+            lock (m_childrenSeeds)
             {
-                seeds.Remove(handle);
+                if (m_childrenSeeds.TryGetValue(agentID, out seeds))
+                {
+                    seeds.Remove(handle);
+                }
             }
         }
 
@@ -216,53 +250,339 @@ namespace OpenSim.Region.CoreModules.Framework
         {
             Dictionary<ulong, string> seeds;
             string returnval;
-            if (childrenSeeds.TryGetValue(agentID, out seeds))
+
+            lock (m_childrenSeeds)
             {
-                if (seeds.TryGetValue(handle, out returnval))
-                    return returnval;
+                if (m_childrenSeeds.TryGetValue(agentID, out seeds))
+                {
+                    if (seeds.TryGetValue(handle, out returnval))
+                        return returnval;
+                }
             }
+
             return null;
         }
 
         public void SetChildrenSeed(UUID agentID, Dictionary<ulong, string> seeds)
         {
             //m_log.DebugFormat(" !!! Setting child seeds in {0} to {1}", m_scene.RegionInfo.RegionName, seeds.Count);
-            childrenSeeds[agentID] = seeds;
+
+            lock (m_childrenSeeds)
+                m_childrenSeeds[agentID] = seeds;
         }
 
         public void DumpChildrenSeeds(UUID agentID)
         {
             m_log.Info("================ ChildrenSeed "+m_scene.RegionInfo.RegionName+" ================");
-            foreach (KeyValuePair<ulong, string> kvp in childrenSeeds[agentID])
+
+            lock (m_childrenSeeds)
+            {
+                foreach (KeyValuePair<ulong, string> kvp in m_childrenSeeds[agentID])
+                {
+                    uint x, y;
+                    Utils.LongToUInts(kvp.Key, out x, out y);
+                    x = x / Constants.RegionSize;
+                    y = y / Constants.RegionSize;
+                    m_log.Info(" >> "+x+", "+y+": "+kvp.Value);
+                }
+            }
+        }
+
+        private void HandleShowCapsListCommand(string module, string[] cmdParams)
+        {
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_scene)
+                return;
+
+            StringBuilder capsReport = new StringBuilder();
+            capsReport.AppendFormat("Region {0}:\n", m_scene.RegionInfo.RegionName);
+
+            lock (m_capsObjects)
             {
-                uint x, y;
-                Utils.LongToUInts(kvp.Key, out x, out y);
-                x = x / Constants.RegionSize;
-                y = y / Constants.RegionSize;
-                m_log.Info(" >> "+x+", "+y+": "+kvp.Value);
+                foreach (KeyValuePair<uint, Caps> kvp in m_capsObjects)
+                {
+                    capsReport.AppendFormat("** Circuit {0}:\n", kvp.Key);
+                    Caps caps = kvp.Value;
+
+                    for (IDictionaryEnumerator kvp2 = caps.CapsHandlers.GetCapsDetails(false, null).GetEnumerator(); kvp2.MoveNext(); )
+                    {
+                        Uri uri = new Uri(kvp2.Value.ToString());
+                        capsReport.AppendFormat(m_showCapsCommandFormat, kvp2.Key, uri.PathAndQuery);
+                    }
+
+                    foreach (KeyValuePair<string, PollServiceEventArgs> kvp2 in caps.GetPollHandlers())
+                        capsReport.AppendFormat(m_showCapsCommandFormat, kvp2.Key, kvp2.Value.Url);
+
+                    foreach (KeyValuePair<string, string> kvp3 in caps.ExternalCapsHandlers)
+                        capsReport.AppendFormat(m_showCapsCommandFormat, kvp3.Key, kvp3.Value);
+                }
             }
+
+            MainConsole.Instance.Output(capsReport.ToString());
         }
 
-        private void HandleShowCapsCommand(string module, string[] cmdparams)
+        private void HandleShowCapsStatsByCapCommand(string module, string[] cmdParams)
         {
-            StringBuilder caps = new StringBuilder();
-            caps.AppendFormat("Region {0}:\n", m_scene.RegionInfo.RegionName);
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_scene)
+                return;
+
+            if (cmdParams.Length != 5 && cmdParams.Length != 6)
+            {
+                MainConsole.Instance.Output("Usage: show caps stats by cap [<cap-name>]");
+                return;
+            }
+
+            StringBuilder sb = new StringBuilder();
+            sb.AppendFormat("Region {0}:\n", m_scene.Name);
+
+            if (cmdParams.Length == 5)
+            {
+                BuildSummaryStatsByCapReport(sb);
+            }
+            else if (cmdParams.Length == 6)
+            {
+                BuildDetailedStatsByCapReport(sb, cmdParams[5]);
+            }
+
+            MainConsole.Instance.Output(sb.ToString());
+        }
+
+        private void BuildDetailedStatsByCapReport(StringBuilder sb, string capName)
+        {
+            /*
+            sb.AppendFormat("Capability name {0}\n", capName);
+
+            ConsoleDisplayTable cdt = new ConsoleDisplayTable();
+            cdt.AddColumn("User Name", 34);
+            cdt.AddColumn("Req Received", 12);
+            cdt.AddColumn("Req Handled", 12);
+            cdt.Indent = 2;
+
+            Dictionary<string, int> receivedStats = new Dictionary<string, int>();
+            Dictionary<string, int> handledStats = new Dictionary<string, int>();
+
+            m_scene.ForEachScenePresence(
+                sp =>
+                {
+                    Caps caps = m_scene.CapsModule.GetCapsForUser(sp.UUID);
 
-            foreach (KeyValuePair<uint, Caps> kvp in m_capsObjects)
+                    if (caps == null)
+                        return;
+
+                    Dictionary<string, IRequestHandler> capsHandlers = caps.CapsHandlers.GetCapsHandlers();
+
+                    IRequestHandler reqHandler;
+                    if (capsHandlers.TryGetValue(capName, out reqHandler))
+                    {
+                        receivedStats[sp.Name] = reqHandler.RequestsReceived;
+                        handledStats[sp.Name] = reqHandler.RequestsHandled;
+                    }        
+                    else 
+                    {
+                        PollServiceEventArgs pollHandler = null;
+                        if (caps.TryGetPollHandler(capName, out pollHandler))
+                        {
+                            receivedStats[sp.Name] = pollHandler.RequestsReceived;
+                            handledStats[sp.Name] = pollHandler.RequestsHandled;
+                        }
+                    }
+                }
+            );
+
+            foreach (KeyValuePair<string, int> kvp in receivedStats.OrderByDescending(kp => kp.Value))
             {
-                caps.AppendFormat("** Circuit {0}:\n", kvp.Key);
+                cdt.AddRow(kvp.Key, kvp.Value, handledStats[kvp.Key]);
+            }
+
+            sb.Append(cdt.ToString());
+            */
+        }
+
+        private void BuildSummaryStatsByCapReport(StringBuilder sb)
+        {
+            /*
+            ConsoleDisplayTable cdt = new ConsoleDisplayTable();
+            cdt.AddColumn("Name", 34);
+            cdt.AddColumn("Req Received", 12);
+            cdt.AddColumn("Req Handled", 12);
+            cdt.Indent = 2;
+
+            Dictionary<string, int> receivedStats = new Dictionary<string, int>();
+            Dictionary<string, int> handledStats = new Dictionary<string, int>();
 
-                for (IDictionaryEnumerator kvp2 = kvp.Value.CapsHandlers.GetCapsDetails(false, null).GetEnumerator(); kvp2.MoveNext(); )
+            m_scene.ForEachScenePresence(
+                sp =>
                 {
-                    Uri uri = new Uri(kvp2.Value.ToString());
-                    caps.AppendFormat(m_showCapsCommandFormat, kvp2.Key, uri.PathAndQuery);
+                    Caps caps = m_scene.CapsModule.GetCapsForUser(sp.UUID);
+
+                    if (caps == null)
+                        return;            
+
+                    foreach (IRequestHandler reqHandler in caps.CapsHandlers.GetCapsHandlers().Values)
+                    {
+                        string reqName = reqHandler.Name ?? "";
+
+                        if (!receivedStats.ContainsKey(reqName))
+                        {
+                            receivedStats[reqName] = reqHandler.RequestsReceived;
+                            handledStats[reqName] = reqHandler.RequestsHandled;
+                        }
+                        else
+                        {
+                            receivedStats[reqName] += reqHandler.RequestsReceived;
+                            handledStats[reqName] += reqHandler.RequestsHandled;
+                        }
+                    }
+
+                    foreach (KeyValuePair<string, PollServiceEventArgs> kvp in caps.GetPollHandlers())
+                    {
+                        string name = kvp.Key;
+                        PollServiceEventArgs pollHandler = kvp.Value;
+
+                        if (!receivedStats.ContainsKey(name))
+                        {
+                            receivedStats[name] = pollHandler.RequestsReceived;
+                            handledStats[name] = pollHandler.RequestsHandled;
+                        }
+                            else
+                        {
+                            receivedStats[name] += pollHandler.RequestsReceived;
+                            handledStats[name] += pollHandler.RequestsHandled;
+                        }
+                    }
                 }
+            );
+                    
+            foreach (KeyValuePair<string, int> kvp in receivedStats.OrderByDescending(kp => kp.Value))
+                cdt.AddRow(kvp.Key, kvp.Value, handledStats[kvp.Key]);
+
+            sb.Append(cdt.ToString());
+            */
+        }
+
+        private void HandleShowCapsStatsByUserCommand(string module, string[] cmdParams)
+        {
+            /*
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_scene)
+                return;
+
+            if (cmdParams.Length != 5 && cmdParams.Length != 7)
+            {
+                MainConsole.Instance.Output("Usage: show caps stats by user [<first-name> <last-name>]");
+                return;
+            }
+
+            StringBuilder sb = new StringBuilder();
+            sb.AppendFormat("Region {0}:\n", m_scene.Name);
+
+            if (cmdParams.Length == 5)
+            {
+                BuildSummaryStatsByUserReport(sb);
+            }
+            else if (cmdParams.Length == 7)
+            {
+                string firstName = cmdParams[5];
+                string lastName = cmdParams[6];
+
+                ScenePresence sp = m_scene.GetScenePresence(firstName, lastName);
+
+                if (sp == null)
+                    return;
 
-                foreach (KeyValuePair<string, string> kvp3 in kvp.Value.ExternalCapsHandlers)
-                    caps.AppendFormat(m_showCapsCommandFormat, kvp3.Key, kvp3.Value);
+                BuildDetailedStatsByUserReport(sb, sp);
             }
 
-            MainConsole.Instance.Output(caps.ToString());
+            MainConsole.Instance.Output(sb.ToString());
+            */
+        }
+
+        private void BuildDetailedStatsByUserReport(StringBuilder sb, ScenePresence sp)
+        {
+            /*
+            sb.AppendFormat("Avatar name {0}, type {1}\n", sp.Name, sp.IsChildAgent ? "child" : "root");
+
+            ConsoleDisplayTable cdt = new ConsoleDisplayTable();
+            cdt.AddColumn("Cap Name", 34);
+            cdt.AddColumn("Req Received", 12);
+            cdt.AddColumn("Req Handled", 12);
+            cdt.Indent = 2;
+
+            Caps caps = m_scene.CapsModule.GetCapsForUser(sp.UUID);
+
+            if (caps == null)
+                return;
+
+            List<CapTableRow> capRows = new List<CapTableRow>();
+
+            foreach (IRequestHandler reqHandler in caps.CapsHandlers.GetCapsHandlers().Values)
+                capRows.Add(new CapTableRow(reqHandler.Name, reqHandler.RequestsReceived, reqHandler.RequestsHandled));
+
+            foreach (KeyValuePair<string, PollServiceEventArgs> kvp in caps.GetPollHandlers())
+                capRows.Add(new CapTableRow(kvp.Key, kvp.Value.RequestsReceived, kvp.Value.RequestsHandled));
+
+            foreach (CapTableRow ctr in capRows.OrderByDescending(ctr => ctr.RequestsReceived))
+                cdt.AddRow(ctr.Name, ctr.RequestsReceived, ctr.RequestsHandled);            
+
+            sb.Append(cdt.ToString());
+            */
+        }
+
+        private void BuildSummaryStatsByUserReport(StringBuilder sb)
+        {
+            /*
+            ConsoleDisplayTable cdt = new ConsoleDisplayTable();
+            cdt.AddColumn("Name", 32);
+            cdt.AddColumn("Type", 5);
+            cdt.AddColumn("Req Received", 12);
+            cdt.AddColumn("Req Handled", 12);
+            cdt.Indent = 2;
+
+            m_scene.ForEachScenePresence(
+                sp =>
+                {
+                    Caps caps = m_scene.CapsModule.GetCapsForUser(sp.UUID);
+
+                    if (caps == null)
+                        return;
+
+                    Dictionary<string, IRequestHandler> capsHandlers = caps.CapsHandlers.GetCapsHandlers();
+
+                    int totalRequestsReceived = 0;
+                    int totalRequestsHandled = 0;
+
+                    foreach (IRequestHandler reqHandler in capsHandlers.Values)
+                    {
+                        totalRequestsReceived += reqHandler.RequestsReceived;
+                        totalRequestsHandled += reqHandler.RequestsHandled;
+                    }
+
+                    Dictionary<string, PollServiceEventArgs> capsPollHandlers = caps.GetPollHandlers();
+
+                    foreach (PollServiceEventArgs handler in capsPollHandlers.Values)
+                    {
+                        totalRequestsReceived += handler.RequestsReceived;
+                        totalRequestsHandled += handler.RequestsHandled;
+                    }
+                    
+                    cdt.AddRow(sp.Name, sp.IsChildAgent ? "child" : "root", totalRequestsReceived, totalRequestsHandled);
+                }
+            );
+
+            sb.Append(cdt.ToString());
+            */
+        }
+
+        private class CapTableRow
+        {
+            public string Name { get; set; }
+            public int RequestsReceived { get; set; }
+            public int RequestsHandled { get; set; }
+
+            public CapTableRow(string name, int requestsReceived, int requestsHandled)
+            {
+                Name = name;
+                RequestsReceived = requestsReceived;
+                RequestsHandled = requestsHandled;
+            }
         }
     }
 }
diff --git a/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs b/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs
index 1f1568f..0c632b1 100644
--- a/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs
@@ -44,11 +44,12 @@ namespace OpenSim.Region.CoreModules.Framework.DynamicAttributes.DAExampleModule
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "DAExampleModule")]
     public class DAExampleModule : INonSharedRegionModule
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private static readonly bool ENABLED = false;   // enable for testing
+        private readonly bool ENABLED = false;   // enable for testing
 
-        public const string DANamespace = "DAExample Module";
+        public const string Namespace = "Example";
+        public const string StoreName = "DA";
 
         protected Scene m_scene;
         protected IDialogModule m_dialogMod;
@@ -65,6 +66,8 @@ namespace OpenSim.Region.CoreModules.Framework.DynamicAttributes.DAExampleModule
                 m_scene = scene;
                 m_scene.EventManager.OnSceneGroupMove += OnSceneGroupMove;
                 m_dialogMod = m_scene.RequestModuleInterface<IDialogModule>();
+
+                m_log.DebugFormat("[DA EXAMPLE MODULE]: Added region {0}", m_scene.Name);
             }
         }
         
@@ -91,7 +94,7 @@ namespace OpenSim.Region.CoreModules.Framework.DynamicAttributes.DAExampleModule
             if (sop == null)
                 return true;
 
-            if (!sop.DynAttrs.TryGetValue(DANamespace, out attrs))
+            if (!sop.DynAttrs.TryGetStore(Namespace, StoreName, out attrs))
                 attrs = new OSDMap();
             
             OSDInteger newValue;
@@ -106,12 +109,14 @@ namespace OpenSim.Region.CoreModules.Framework.DynamicAttributes.DAExampleModule
                         
                 attrs["moves"] = newValue;
 
-                sop.DynAttrs[DANamespace] = attrs;
+                sop.DynAttrs.SetStore(Namespace, StoreName, attrs);
             }
 
             sop.ParentGroup.HasGroupChanged = true;
     
-            m_dialogMod.SendGeneralAlert(string.Format("{0} {1} moved {2} times", sop.Name, sop.UUID, newValue));
+            string msg = string.Format("{0} {1} moved {2} times", sop.Name, sop.UUID, newValue);
+            m_log.DebugFormat("[DA EXAMPLE MODULE]: {0}", msg);
+            m_dialogMod.SendGeneralAlert(msg);
             
             return true;
         }
diff --git a/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DOExampleModule.cs b/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DOExampleModule.cs
index 650aa35..166a994 100644
--- a/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DOExampleModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DOExampleModule.cs
@@ -64,8 +64,8 @@ namespace OpenSim.Region.Framework.DynamicAttributes.DOExampleModule
 
         private Scene m_scene;
         private IDialogModule m_dialogMod;
-        
-        public string Name { get { return "DOExample Module"; } }        
+
+        public string Name { get { return "DO"; } }        
         public Type ReplaceableInterface { get { return null; } }        
 
         public void Initialise(IConfigSource source) {}
@@ -106,7 +106,7 @@ namespace OpenSim.Region.Framework.DynamicAttributes.DOExampleModule
 
 //            Console.WriteLine("Here for {0}", so.Name);
 
-            if (rootPart.DynAttrs.TryGetValue(DAExampleModule.DANamespace, out attrs))
+            if (rootPart.DynAttrs.TryGetStore(DAExampleModule.Namespace, DAExampleModule.StoreName, out attrs))
             {
                 movesSoFar = attrs["moves"].AsInteger();
 
@@ -114,7 +114,7 @@ namespace OpenSim.Region.Framework.DynamicAttributes.DOExampleModule
                     "[DO EXAMPLE MODULE]: Found saved moves {0} for {1} in {2}", movesSoFar, so.Name, m_scene.Name);
             }
 
-            rootPart.DynObjs.Add(Name, new MyObject(movesSoFar));
+            rootPart.DynObjs.Add(DAExampleModule.Namespace, Name, new MyObject(movesSoFar));
         }
         
         private bool OnSceneGroupMove(UUID groupId, Vector3 delta)
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index ed867b8..ed14c12 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -280,10 +280,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         private void OnConnectionClosed(IClientAPI client)
         {
-            if (client.IsLoggingOut)
+            if (client.IsLoggingOut && m_entityTransferStateMachine.UpdateInTransit(client.AgentId, AgentTransferState.Aborting))
             {
-                m_entityTransferStateMachine.UpdateInTransit(client.AgentId, AgentTransferState.Aborting);
-
                 m_log.DebugFormat(
                     "[ENTITY TRANSFER MODULE]: Aborted teleport request from {0} in {1} due to simultaneous logout", 
                     client.Name, Scene.Name);
@@ -318,7 +316,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 m_log.DebugFormat(
                     "[ENTITY TRANSFER MODULE]: Ignoring teleport request of {0} {1} to {2}@{3} - agent is already in transit.",
                     sp.Name, sp.UUID, position, regionHandle);
-                
+
+                sp.ControllingClient.SendTeleportFailed("Previous teleport process incomplete.  Please retry shortly.");
+
                 return;
             }
 
@@ -691,6 +691,22 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 agentCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath();
             }
 
+            if (version.Equals("SIMULATION/0.2"))
+                TransferAgent_V2(sp, agentCircuit, reg, finalDestination, endPoint, teleportFlags, oldRegionX, newRegionX, oldRegionY, newRegionY, version, out reason);
+            else
+                TransferAgent_V1(sp, agentCircuit, reg, finalDestination, endPoint, teleportFlags, oldRegionX, newRegionX, oldRegionY, newRegionY, version, out reason);           
+        }
+
+        private void TransferAgent_V1(ScenePresence sp, AgentCircuitData agentCircuit, GridRegion reg, GridRegion finalDestination,
+            IPEndPoint endPoint, uint teleportFlags, uint oldRegionX, uint newRegionX, uint oldRegionY, uint newRegionY, string version, out string reason)
+        {
+            ulong destinationHandle = finalDestination.RegionHandle;
+            AgentCircuitData currentAgentCircuit = sp.Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
+
+            m_log.DebugFormat(
+                "[ENTITY TRANSFER MODULE]: Using TP V1 for {0} going from {1} to {2}", 
+                sp.Name, Scene.Name, finalDestination.RegionName);
+
             // Let's create an agent there if one doesn't exist yet. 
             // NOTE: logout will always be false for a non-HG teleport.
             bool logout = false;
@@ -712,7 +728,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 m_interRegionTeleportCancels.Value++;
 
                 m_log.DebugFormat(
-                    "[ENTITY TRANSFER MODULE]: Cancelled teleport of {0} to {1} from {2} after CreateAgent on client request", 
+                    "[ENTITY TRANSFER MODULE]: Cancelled teleport of {0} to {1} from {2} after CreateAgent on client request",
                     sp.Name, finalDestination.RegionName, sp.Scene.Name);
 
                 return;
@@ -734,11 +750,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // OK, it got this agent. Let's close some child agents
             sp.CloseChildAgents(newRegionX, newRegionY);
 
-            IClientIPEndpoint ipepClient;  
+            IClientIPEndpoint ipepClient;
+            string capsPath = String.Empty;
             if (NeedsNewAgent(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY))
             {
                 m_log.DebugFormat(
-                    "[ENTITY TRANSFER MODULE]: Determined that region {0} at {1},{2} needs new child agent for incoming agent {3} from {4}", 
+                    "[ENTITY TRANSFER MODULE]: Determined that region {0} at {1},{2} needs new child agent for incoming agent {3} from {4}",
                     finalDestination.RegionName, newRegionX, newRegionY, sp.Name, Scene.Name);
 
                 //sp.ControllingClient.SendTeleportProgress(teleportFlags, "Creating agent...");
@@ -785,10 +802,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // Let's send a full update of the agent. This is a synchronous call.
             AgentData agent = new AgentData();
             sp.CopyTo(agent);
-            agent.Position = position;
+            agent.Position = agentCircuit.startpos;
             SetCallbackURL(agent, sp.Scene.RegionInfo);
 
-            //sp.ControllingClient.SendTeleportProgress(teleportFlags, "Updating agent...");
 
             // We will check for an abort before UpdateAgent since UpdateAgent will require an active viewer to 
             // establish th econnection to the destination which makes it return true.
@@ -821,10 +837,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 }
 
                 m_log.WarnFormat(
-                    "[ENTITY TRANSFER MODULE]: UpdateAgent failed on teleport of {0} to {1} from {2}.  Keeping avatar in source region.",
-                    sp.Name, finalDestination.RegionName, sp.Scene.RegionInfo.RegionName);
-                
-                Fail(sp, finalDestination, logout, "Connection between viewer and destination region could not be established.");
+                    "[ENTITY TRANSFER MODULE]: UpdateAgent failed on teleport of {0} to {1}.  Keeping avatar in {2}",
+                    sp.Name, finalDestination.RegionName, sp.Scene.Name);
+
+                Fail(sp, finalDestination, logout, currentAgentCircuit.SessionID.ToString(), "Connection between viewer and destination region could not be established.");
                 return;
             }
 
@@ -833,10 +849,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 m_interRegionTeleportCancels.Value++;
 
                 m_log.DebugFormat(
-                    "[ENTITY TRANSFER MODULE]: Cancelled teleport of {0} to {1} from {2} after UpdateAgent on client request", 
+                    "[ENTITY TRANSFER MODULE]: Cancelled teleport of {0} to {1} from {2} after UpdateAgent on client request",
                     sp.Name, finalDestination.RegionName, sp.Scene.Name);
 
-                CleanupFailedInterRegionTeleport(sp, finalDestination);
+                CleanupFailedInterRegionTeleport(sp, currentAgentCircuit.SessionID.ToString(), finalDestination);
 
                 return;
             }
@@ -850,6 +866,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             // closes our existing agent which is still signalled as root.
             sp.IsChildAgent = true;
 
+            // OK, send TPFinish to the client, so that it starts the process of contacting the destination region
             if (m_eqModule != null)
             {
                 m_eqModule.TeleportFinishEvent(destinationHandle, 13, endPoint, 0, teleportFlags, capsPath, sp.UUID);
@@ -879,8 +896,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 m_log.WarnFormat(
                     "[ENTITY TRANSFER MODULE]: Teleport of {0} to {1} from {2} failed due to no callback from destination region.  Returning avatar to source region.",
                     sp.Name, finalDestination.RegionName, sp.Scene.RegionInfo.RegionName);
-                
-                Fail(sp, finalDestination, logout, "Destination region did not signal teleport completion.");
+
+                Fail(sp, finalDestination, logout, currentAgentCircuit.SessionID.ToString(), "Destination region did not signal teleport completion.");
 
                 return;
             }
@@ -908,13 +925,187 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             if (NeedsClosing(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY, reg))
             {
+                if (!sp.Scene.IncomingPreCloseAgent(sp))
+                    return;
+
                 // We need to delay here because Imprudence viewers, unlike v1 or v3, have a short (<200ms, <500ms) delay before
                 // they regard the new region as the current region after receiving the AgentMovementComplete
                 // response.  If close is sent before then, it will cause the viewer to quit instead.
                 //
                 // 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(3000);
+                Thread.Sleep(2000);
+
+                sp.Scene.IncomingCloseAgent(sp.UUID, false);
+            }
+            else
+            {
+                // now we have a child agent in this region. 
+                sp.Reset();
+            }
+        }
+
+        private void TransferAgent_V2(ScenePresence sp, AgentCircuitData agentCircuit, GridRegion reg, GridRegion finalDestination,
+            IPEndPoint endPoint, uint teleportFlags, uint oldRegionX, uint newRegionX, uint oldRegionY, uint newRegionY, string version, out string reason)
+        {
+            ulong destinationHandle = finalDestination.RegionHandle;
+            AgentCircuitData currentAgentCircuit = sp.Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
+
+            // Let's create an agent there if one doesn't exist yet. 
+            // NOTE: logout will always be false for a non-HG teleport.
+            bool logout = false;
+            if (!CreateAgent(sp, reg, finalDestination, agentCircuit, teleportFlags, out reason, out logout))
+            {
+                m_interRegionTeleportFailures.Value++;
+
+                sp.ControllingClient.SendTeleportFailed(String.Format("Teleport refused: {0}", reason));
+
+                m_log.DebugFormat(
+                    "[ENTITY TRANSFER MODULE]: Teleport of {0} from {1} to {2} was refused because {3}",
+                    sp.Name, sp.Scene.RegionInfo.RegionName, finalDestination.RegionName, reason);
+
+                return;
+            }
+
+            if (m_entityTransferStateMachine.GetAgentTransferState(sp.UUID) == AgentTransferState.Cancelling)
+            {
+                m_interRegionTeleportCancels.Value++;
+
+                m_log.DebugFormat(
+                    "[ENTITY TRANSFER MODULE]: Cancelled teleport of {0} to {1} from {2} after CreateAgent on client request",
+                    sp.Name, finalDestination.RegionName, sp.Scene.Name);
+
+                return;
+            }
+            else if (m_entityTransferStateMachine.GetAgentTransferState(sp.UUID) == AgentTransferState.Aborting)
+            {
+                m_interRegionTeleportAborts.Value++;
+
+                m_log.DebugFormat(
+                    "[ENTITY TRANSFER MODULE]: Aborted teleport of {0} to {1} from {2} after CreateAgent due to previous client close.",
+                    sp.Name, finalDestination.RegionName, sp.Scene.Name);
+
+                return;
+            }
+
+            // Past this point we have to attempt clean up if the teleport fails, so update transfer state.
+            m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.Transferring);
+
+            IClientIPEndpoint ipepClient;
+            string capsPath = String.Empty;
+            if (NeedsNewAgent(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY))
+            {
+                m_log.DebugFormat(
+                    "[ENTITY TRANSFER MODULE]: Determined that region {0} at {1},{2} needs new child agent for agent {3} from {4}",
+                    finalDestination.RegionName, newRegionX, newRegionY, sp.Name, Scene.Name);
+
+                //sp.ControllingClient.SendTeleportProgress(teleportFlags, "Creating agent...");
+                #region IP Translation for NAT
+                // Uses ipepClient above
+                if (sp.ClientView.TryGet(out ipepClient))
+                {
+                    endPoint.Address = NetworkUtil.GetIPFor(ipepClient.EndPoint, endPoint.Address);
+                }
+                #endregion
+                capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);
+            }
+            else
+            {
+                agentCircuit.CapsPath = sp.Scene.CapsModule.GetChildSeed(sp.UUID, reg.RegionHandle);
+                capsPath = finalDestination.ServerURI + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);
+            }
+
+            // We need to set this here to avoid an unlikely race condition when teleporting to a neighbour simulator,
+            // where that neighbour simulator could otherwise request a child agent create on the source which then 
+            // closes our existing agent which is still signalled as root.
+            //sp.IsChildAgent = true;
+
+            // New protocol: send TP Finish directly, without prior ES or EAC. That's what happens in the Linden grid
+            if (m_eqModule != null)
+                m_eqModule.TeleportFinishEvent(destinationHandle, 13, endPoint, 0, teleportFlags, capsPath, sp.UUID);
+            else
+                sp.ControllingClient.SendRegionTeleport(destinationHandle, 13, endPoint, 4,
+                                                            teleportFlags, capsPath);
+
+            m_log.DebugFormat(
+                "[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} from {1} to {2}",
+                capsPath, sp.Scene.RegionInfo.RegionName, sp.Name);
+
+            // Let's send a full update of the agent. 
+            AgentData agent = new AgentData();
+            sp.CopyTo(agent);
+            agent.Position = agentCircuit.startpos;
+            agent.SenderWantsToWaitForRoot = true;
+            //SetCallbackURL(agent, sp.Scene.RegionInfo);
+
+            // Reset the do not close flag.  This must be done before the destination opens child connections (here
+            // triggered by UpdateAgent) to avoid race conditions.  However, we also want to reset it as late as possible
+            // to avoid a situation where an unexpectedly early call to Scene.NewUserConnection() wrongly results
+            // in no close.
+            sp.DoNotCloseAfterTeleport = false;
+
+            // Send the Update. If this returns true, we know the client has contacted the destination
+            // via CompleteMovementIntoRegion, so we can let go.
+            // If it returns false, something went wrong, and we need to abort.
+            if (!UpdateAgent(reg, finalDestination, agent, sp))
+            {
+                if (m_entityTransferStateMachine.GetAgentTransferState(sp.UUID) == AgentTransferState.Aborting)
+                {
+                    m_interRegionTeleportAborts.Value++;
+
+                    m_log.DebugFormat(
+                        "[ENTITY TRANSFER MODULE]: Aborted teleport of {0} to {1} from {2} after UpdateAgent due to previous client close.",
+                        sp.Name, finalDestination.RegionName, sp.Scene.Name);
+
+                    return;
+                }
+
+                m_log.WarnFormat(
+                    "[ENTITY TRANSFER MODULE]: UpdateAgent failed on teleport of {0} to {1}.  Keeping avatar in {2}",
+                    sp.Name, finalDestination.RegionName, sp.Scene.Name);
+
+                Fail(sp, finalDestination, logout, currentAgentCircuit.SessionID.ToString(), "Connection between viewer and destination region could not be established.");
+                return;
+            }
+            
+            m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.CleaningUp);
+
+            // Need to signal neighbours whether child agents may need closing irrespective of whether this
+            // one needed closing.  We also need to close child agents as quickly as possible to avoid complicated
+            // race conditions with rapid agent releporting (e.g. from A1 to a non-neighbour B, back
+            // to a neighbour A2 then off to a non-neighbour C).  Closing child agents any later requires complex
+            // distributed checks to avoid problems in rapid reteleporting scenarios and where child agents are
+            // abandoned without proper close by viewer but then re-used by an incoming connection.
+            sp.CloseChildAgents(newRegionX, newRegionY);
+
+            // May need to logout or other cleanup
+            AgentHasMovedAway(sp, logout);
+
+            // Well, this is it. The agent is over there.
+            KillEntity(sp.Scene, sp.LocalId);
+
+            // Now let's make it officially a child agent
+            sp.MakeChildAgent();
+
+            // Finally, let's close this previously-known-as-root agent, when the jump is outside the view zone
+            if (NeedsClosing(sp.DrawDistance, oldRegionX, newRegionX, oldRegionY, newRegionY, reg))
+            {
+                if (!sp.Scene.IncomingPreCloseAgent(sp))
+                    return;
+
+                // RED ALERT!!!!
+                // PLEASE DO NOT DECREASE THIS WAIT TIME UNDER ANY CIRCUMSTANCES.
+                // THE VIEWERS SEEM TO NEED SOME TIME AFTER RECEIVING MoveAgentIntoRegion
+                // BEFORE THEY SETTLE IN THE NEW REGION.
+                // DECREASING THE WAIT TIME HERE WILL EITHER RESULT IN A VIEWER CRASH OR
+                // IN THE AVIE BEING PLACED IN INFINITY FOR A COUPLE OF SECONDS.
+                Thread.Sleep(15000);
+            
+                // OK, it got this agent. Let's close everything
+                // If we shouldn't close the agent due to some other region renewing the connection 
+                // then this will be handled in IncomingCloseAgent under lock conditions
+                m_log.DebugFormat(
+                    "[ENTITY TRANSFER MODULE]: Closing agent {0} in {1} after teleport", sp.Name, Scene.Name);
 
                 sp.Scene.IncomingCloseAgent(sp.UUID, false);
             }
@@ -934,17 +1125,20 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         /// <remarks>
         /// <param name='sp'> </param>
         /// <param name='finalDestination'></param>
-        protected virtual void CleanupFailedInterRegionTeleport(ScenePresence sp, GridRegion finalDestination)
+        protected virtual void CleanupFailedInterRegionTeleport(ScenePresence sp, string auth_token, GridRegion finalDestination)
         {
             m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.CleaningUp);
 
-            sp.IsChildAgent = false;
-            ReInstantiateScripts(sp);
-
-            EnableChildAgents(sp);
+            if (sp.IsChildAgent) // We had set it to child before attempted TP (V1)
+            {
+                sp.IsChildAgent = false;
+                ReInstantiateScripts(sp);
 
+                EnableChildAgents(sp);
+            }
             // Finally, kill the agent we just created at the destination.
-            Scene.SimulationService.CloseAgent(finalDestination, sp.UUID);
+            // XXX: Possibly this should be done asynchronously.
+            Scene.SimulationService.CloseAgent(finalDestination, sp.UUID, auth_token);
         }
 
         /// <summary>
@@ -954,9 +1148,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         /// <param name='finalDestination'></param>
         /// <param name='logout'></param>
         /// <param name='reason'>Human readable reason for teleport failure.  Will be sent to client.</param>
-        protected virtual void Fail(ScenePresence sp, GridRegion finalDestination, bool logout, string reason)
+        protected virtual void Fail(ScenePresence sp, GridRegion finalDestination, bool logout, string auth_code, string reason)
         {
-            CleanupFailedInterRegionTeleport(sp, finalDestination);
+            CleanupFailedInterRegionTeleport(sp, auth_code, finalDestination);
 
             m_interRegionTeleportFailures.Value++;
 
@@ -1654,10 +1848,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             List<ulong> newRegions = NewNeighbours(neighbourHandles, previousRegionNeighbourHandles);
             List<ulong> oldRegions = OldNeighbours(neighbourHandles, previousRegionNeighbourHandles);
 
-            //Dump("Current Neighbors", neighbourHandles);
-            //Dump("Previous Neighbours", previousRegionNeighbourHandles);
-            //Dump("New Neighbours", newRegions);
-            //Dump("Old Neighbours", oldRegions);
+//            Dump("Current Neighbors", neighbourHandles);
+//            Dump("Previous Neighbours", previousRegionNeighbourHandles);
+//            Dump("New Neighbours", newRegions);
+//            Dump("Old Neighbours", oldRegions);
 
             /// Update the scene presence's known regions here on this region
             sp.DropOldNeighbours(oldRegions);
@@ -1665,8 +1859,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             /// Collect as many seeds as possible
             Dictionary<ulong, string> seeds;
             if (sp.Scene.CapsModule != null)
-                seeds
-                    = new Dictionary<ulong, string>(sp.Scene.CapsModule.GetChildrenSeeds(sp.UUID));
+                seeds = new Dictionary<ulong, string>(sp.Scene.CapsModule.GetChildrenSeeds(sp.UUID));
             else
                 seeds = new Dictionary<ulong, string>();
 
@@ -1736,6 +1929,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     newAgent = true;
                 else
                     newAgent = false;
+//                    continue;
 
                 if (neighbour.RegionHandle != sp.Scene.RegionInfo.RegionHandle)
                 {
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index d372c0e..1cf1884 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -53,8 +53,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private int m_levelHGTeleport = 0;
+        private string m_ThisHomeURI;
 
         private GatekeeperServiceConnector m_GatekeeperConnector;
+        private IUserAgentService m_UAS;
 
         protected bool m_RestrictAppearanceAbroad;
         protected string m_AccountName;
@@ -143,6 +145,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: {0} enabled.", Name);
                 }
             }
+
+            moduleConfig = source.Configs["Hypergrid"];
+            if (moduleConfig != null)
+            {
+                m_ThisHomeURI = moduleConfig.GetString("HomeURI", string.Empty);
+                if (m_ThisHomeURI != string.Empty && !m_ThisHomeURI.EndsWith("/"))
+                    m_ThisHomeURI += '/';
+            }
         }
 
         public override void AddRegion(Scene scene)
@@ -161,11 +171,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             if (!so.IsAttachment)
                 return;
 
-            if (so.Scene.UserManagementModule.IsLocalGridUser(so.AttachedAvatar))
+            if (so.AttachedAvatar == UUID.Zero || Scene.UserManagementModule.IsLocalGridUser(so.AttachedAvatar))
                 return;
 
             // foreign user
-            AgentCircuitData aCircuit = so.Scene.AuthenticateHandler.GetAgentCircuitData(so.AttachedAvatar);
+            AgentCircuitData aCircuit = Scene.AuthenticateHandler.GetAgentCircuitData(so.AttachedAvatar);
             if (aCircuit != null && (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0)
             {
                 if (aCircuit.ServiceURLs != null && aCircuit.ServiceURLs.ContainsKey("AssetServerURI"))
@@ -173,7 +183,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     string url = aCircuit.ServiceURLs["AssetServerURI"].ToString();
                     m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Incoming attachement {0} for HG user {1} with asset server {2}", so.Name, so.AttachedAvatar, url);
                     Dictionary<UUID, AssetType> ids = new Dictionary<UUID, AssetType>();
-                    HGUuidGatherer uuidGatherer = new HGUuidGatherer(so.Scene.AssetService, url);
+                    HGUuidGatherer uuidGatherer = new HGUuidGatherer(Scene.AssetService, url);
                     uuidGatherer.GatherAssetUuids(so, ids);
 
                     foreach (KeyValuePair<UUID, AssetType> kvp in ids)
@@ -194,7 +204,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             base.RegionLoaded(scene);
 
             if (m_Enabled)
+            {
                 m_GatekeeperConnector = new GatekeeperServiceConnector(scene.AssetService);
+                m_UAS = scene.RequestModuleInterface<IUserAgentService>();
+                if (m_UAS == null)
+                    m_UAS = new UserAgentServiceConnector(m_ThisHomeURI);
+
+            }
         }
 
         public override void RemoveRegion(Scene scene)
@@ -272,8 +288,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 if (agentCircuit.ServiceURLs.ContainsKey("HomeURI"))
                 {
                     string userAgentDriver = agentCircuit.ServiceURLs["HomeURI"].ToString();
-                    IUserAgentService connector = new UserAgentServiceConnector(userAgentDriver);
-                    bool success = connector.LoginAgentToGrid(agentCircuit, reg, finalDestination, out reason);
+                    IUserAgentService connector;
+
+                    if (userAgentDriver.Equals(m_ThisHomeURI) && m_UAS != null)
+                        connector = m_UAS;
+                    else
+                        connector = new UserAgentServiceConnector(userAgentDriver);
+
+                    bool success = connector.LoginAgentToGrid(agentCircuit, reg, finalDestination, false, out reason);
                     logout = success; // flag for later logout from this grid; this is an HG TP
 
                     if (success)
@@ -552,12 +574,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             if (uMan != null && uMan.IsLocalGridUser(obj.AgentId))
             {
                 // local grid user
+                m_UAS.LogoutAgent(obj.AgentId, obj.SessionId);
                 return;
             }
 
             AgentCircuitData aCircuit = ((Scene)(obj.Scene)).AuthenticateHandler.GetAgentCircuitData(obj.CircuitCode);
-
-            if (aCircuit.ServiceURLs.ContainsKey("HomeURI"))
+            if (aCircuit != null && aCircuit.ServiceURLs != null && aCircuit.ServiceURLs.ContainsKey("HomeURI"))
             {
                 string url = aCircuit.ServiceURLs["HomeURI"].ToString();
                 IUserAgentService security = new UserAgentServiceConnector(url);
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
index 7871eda..144895c 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
@@ -73,6 +73,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
         private AssetMetadata FetchMetadata(string url, UUID assetID)
         {
+            if (string.IsNullOrEmpty(url))
+                return null;
+
             if (!url.EndsWith("/") && !url.EndsWith("="))
                 url = url + "/";
 
@@ -92,6 +95,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             AssetBase asset = m_scene.AssetService.Get(assetID.ToString());
             if (asset == null)
             {
+                if (string.IsNullOrEmpty(url))
+                    return null;
+
                 if (!url.EndsWith("/") && !url.EndsWith("="))
                     url = url + "/";
 
@@ -109,6 +115,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
         public bool PostAsset(string url, AssetBase asset)
         {
+            if (string.IsNullOrEmpty(url))
+                return false;
+
             if (asset != null)
             {
                 if (!url.EndsWith("/") && !url.EndsWith("="))
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index b2b628d..ce7ed26 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -62,6 +62,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         private string m_ThisGatekeeper;
         private bool m_RestrictInventoryAccessAbroad;
 
+        private bool m_bypassPermissions = true;
+
 //        private bool m_Initialized = false;
 
         #region INonSharedRegionModule
@@ -100,6 +102,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     }
                     else
                         m_log.Warn("[HG INVENTORY ACCESS MODULE]: HGInventoryAccessModule configs not found. ProfileServerURI not set!");
+
+                    m_bypassPermissions = !Util.GetConfigVarFromSections<bool>(source, "serverside_object_permissions",
+                                            new string[] { "Startup", "Permissions" }, true); 
+
                 }
             }
         }
@@ -114,6 +120,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             scene.EventManager.OnNewInventoryItemUploadComplete += UploadInventoryItem;
             scene.EventManager.OnTeleportStart += TeleportStart;
             scene.EventManager.OnTeleportFail += TeleportFail;
+
+            // We're fgoing to enforce some stricter permissions if Outbound is false
+            scene.Permissions.OnTakeObject += CanTakeObject;
+            scene.Permissions.OnTakeCopyObject += CanTakeObject;
+            scene.Permissions.OnTransferUserInventory += OnTransferUserInventory;
         }
 
         #endregion
@@ -135,7 +146,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 if (sp is ScenePresence)
                 {
                     AgentCircuitData aCircuit = ((ScenePresence)sp).Scene.AuthenticateHandler.GetAgentCircuitData(client.AgentId);
-                    if ((aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0)
+                    if (aCircuit != null &&  (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0)
                     {
                         if (m_RestrictInventoryAccessAbroad)
                         {
@@ -185,8 +196,11 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             }
         }
 
-        public void UploadInventoryItem(UUID avatarID, UUID assetID, string name, int userlevel)
+        public void UploadInventoryItem(UUID avatarID, AssetType type, UUID assetID, string name, int userlevel)
         {
+            if (type == AssetType.Link)
+                return;
+
             string userAssetServer = string.Empty;
             if (IsForeignUser(avatarID, out userAssetServer) && userAssetServer != string.Empty && m_OutboundPermission)
             {
@@ -221,7 +235,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         {
             UUID newAssetID = base.CapsUpdateInventoryItemAsset(remoteClient, itemID, data);
 
-            UploadInventoryItem(remoteClient.AgentId, newAssetID, "", 0);
+            UploadInventoryItem(remoteClient.AgentId, AssetType.Unknown, newAssetID, "", 0);
 
             return newAssetID;
         }
@@ -232,7 +246,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         protected override void ExportAsset(UUID agentID, UUID assetID)
         {
             if (!assetID.Equals(UUID.Zero))
-                UploadInventoryItem(agentID, assetID, "", 0);
+                UploadInventoryItem(agentID, AssetType.Unknown, assetID, "", 0);
             else
                 m_log.Debug("[HGScene]: Scene.Inventory did not create asset");
         }
@@ -244,7 +258,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                                                    UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
                                                    bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment)
         {
-            m_log.DebugFormat("[HGScene] RezObject itemID={0} fromTaskID={1}", itemID, fromTaskID);
+            m_log.DebugFormat("[HGScene]: RezObject itemID={0} fromTaskID={1}", itemID, fromTaskID);
 
             //if (fromTaskID.Equals(UUID.Zero))
             //{
@@ -297,7 +311,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 if (m_Scene.TryGetScenePresence(userID, out sp))
                 {
                     AgentCircuitData aCircuit = m_Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
-                    if (aCircuit.ServiceURLs.ContainsKey("AssetServerURI"))
+                    if (aCircuit != null && aCircuit.ServiceURLs != null && aCircuit.ServiceURLs.ContainsKey("AssetServerURI"))
                     {
                         assetServerURL = aCircuit.ServiceURLs["AssetServerURI"].ToString();
                         assetServerURL = assetServerURL.Trim(new char[] { '/' }); 
@@ -348,7 +362,15 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                     InventoryFolderBase root = m_Scene.InventoryService.GetRootFolder(client.AgentId);
                     InventoryCollection content = m_Scene.InventoryService.GetFolderContent(client.AgentId, root.ID);
 
-                    inv.SendBulkUpdateInventory(content.Folders.ToArray(), content.Items.ToArray());
+                    List<InventoryFolderBase> keep = new List<InventoryFolderBase>();
+
+                    foreach (InventoryFolderBase f in content.Folders)
+                    {
+                        if (f.Name != "My Suitcase" && f.Name != "Current Outfit")
+                            keep.Add(f);
+                    }
+
+                    inv.SendBulkUpdateInventory(keep.ToArray(), content.Items.ToArray());
                 }
             }
         }
@@ -381,7 +403,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
 
                         foreach (InventoryFolderBase f in content.Folders)
                         {
-                            if (f.Name != "My Suitcase")
+                            if (f.Name != "My Suitcase" && f.Name != "Current Outfit")
                             {
                                 f.Name = f.Name + " (Unavailable)";
                                 keep.Add(f);
@@ -406,5 +428,36 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         }
 
         #endregion
+
+        #region Permissions
+
+        private bool CanTakeObject(UUID objectID, UUID stealer, Scene scene)
+        {
+            if (m_bypassPermissions) return true;
+
+            if (!m_OutboundPermission && !UserManagementModule.IsLocalGridUser(stealer))
+            {
+                SceneObjectGroup sog = null;
+                if (m_Scene.TryGetSceneObjectGroup(objectID, out sog) && sog.OwnerID == stealer)
+                    return true;
+
+                return false;
+            }
+
+            return true;
+        }
+
+        private bool OnTransferUserInventory(UUID itemID, UUID userID, UUID recipientID)
+        {
+            if (m_bypassPermissions) return true;
+
+            if (!m_OutboundPermission && !UserManagementModule.IsLocalGridUser(recipientID))
+                return false;
+
+            return true;
+        }
+
+
+        #endregion
     }
 }
\ 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 d09ea3e..89bb037 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -358,7 +358,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             bool asAttachment)
         {
             CoalescedSceneObjects coa = new CoalescedSceneObjects(UUID.Zero);                
-            Dictionary<UUID, Vector3> originalPositions = new Dictionary<UUID, Vector3>();
+//            Dictionary<UUID, Vector3> originalPositions = new Dictionary<UUID, Vector3>();
 
             foreach (SceneObjectGroup objectGroup in objlist)
             {
@@ -379,7 +379,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                              objectGroup.AbsolutePosition.Z);
 
                 Quaternion inventoryStoredRotation = objectGroup.GroupRotation;
-                originalPositions[objectGroup.UUID] = objectGroup.AbsolutePosition;
+                //originalPositions[objectGroup.UUID] = objectGroup.AbsolutePosition;
 
                 // Restore attachment data after trip through the sim
                 if (objectGroup.RootPart.AttachPoint > 0)
@@ -423,9 +423,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             else
                 itemXml = SceneObjectSerializer.ToOriginalXmlFormat(objlist[0], !asAttachment);
             
-            // Restore the position of each group now that it has been stored to inventory.
-            foreach (SceneObjectGroup objectGroup in objlist)
-                objectGroup.AbsolutePosition = originalPositions[objectGroup.UUID];
+//            // Restore the position of each group now that it has been stored to inventory.
+//            foreach (SceneObjectGroup objectGroup in objlist)
+//                objectGroup.AbsolutePosition = originalPositions[objectGroup.UUID];
 
             InventoryItemBase item = CreateItemForObject(action, remoteClient, objlist[0], folderID);
 
@@ -707,6 +707,12 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                         InventoryFolderBase f = new InventoryFolderBase(so.FromFolderID, userID);
                         if (f != null)
                             folder = m_Scene.InventoryService.GetFolder(f);
+
+                        if(folder.Type == 14 || folder.Type == 16)
+                        {
+                            // folder.Type = 6;
+                            folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.Object);
+                        }
                     }
                 }
 
@@ -803,7 +809,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 }
 
                 objlist.Add(g);
-                veclist.Add(new Vector3(0, 0, 0));
+                veclist.Add(Vector3.Zero);
 
                 float offsetHeight = 0;
                 pos = m_Scene.GetNewRezLocation(
@@ -880,7 +886,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 return null;
             }
 
-            if (item != null && !DoPreRezWhenFromItem(remoteClient, item, objlist, rez_pos, attachment))
+            if (item != null && !DoPreRezWhenFromItem(remoteClient, item, objlist, rez_pos, veclist, attachment))
                 return null;
 
             for (int i = 0; i < objlist.Count; i++)
@@ -979,10 +985,15 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
         /// <param name="item"></param>
         /// <param name="objlist"></param>
         /// <param name="pos"></param>
+        /// <param name="veclist">
+        /// List of vector position adjustments for a coalesced objects.  For ordinary objects
+        /// this list will contain just Vector3.Zero.  The order of adjustments must match the order of objlist
+        /// </param>
         /// <param name="isAttachment"></param>
         /// <returns>true if we can processed with rezzing, false if we need to abort</returns>
         private bool DoPreRezWhenFromItem(
-            IClientAPI remoteClient, InventoryItemBase item, List<SceneObjectGroup> objlist, Vector3 pos, bool isAttachment)
+            IClientAPI remoteClient, InventoryItemBase item, List<SceneObjectGroup> objlist, 
+            Vector3 pos, List<Vector3> veclist, bool isAttachment)
         {
             UUID fromUserInventoryItemId = UUID.Zero;
 
@@ -1005,28 +1016,29 @@ 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)
-                && !isAttachment)
+            for (int i = 0; i < objlist.Count; i++)
             {
-                // 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.CurrentPermissions & (uint)PermissionMask.Copy) == 0) && (!isAttachment))
-                    remoteClient.SendBulkUpdateInventory(item);
+                SceneObjectGroup g = objlist[i];
 
-                ILandObject land = m_Scene.LandChannel.GetLandObject(pos.X, pos.Y);
-                remoteClient.SendAlertMessage(string.Format(
-                    "Can't rez object '{0}' at <{1:F3}, {2:F3}, {3:F3}> on parcel '{4}' in region {5}.",
-                    item.Name, pos.X, pos.Y, pos.Z, land != null ? land.LandData.Name : "Unknown", m_Scene.RegionInfo.RegionName));
+                if (!m_Scene.Permissions.CanRezObject(
+                    g.PrimCount, remoteClient.AgentId, pos + veclist[i])
+                    && !isAttachment)
+                {
+                    // 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.CurrentPermissions & (uint)PermissionMask.Copy) == 0) && (!isAttachment))
+                        remoteClient.SendBulkUpdateInventory(item);
 
-                return false;
+                    ILandObject land = m_Scene.LandChannel.GetLandObject(pos.X, pos.Y);
+                    remoteClient.SendAlertMessage(string.Format(
+                        "Can't rez object '{0}' at <{1:F3}, {2:F3}, {3:F3}> on parcel '{4}' in region {5}.",
+                        item.Name, pos.X, pos.Y, pos.Z, land != null ? land.LandData.Name : "Unknown", m_Scene.Name));
+
+                    return false;
+                }
             }
 
             for (int i = 0; i < objlist.Count; i++)
diff --git a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
index d07cff4..69d7e16 100644
--- a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
@@ -176,7 +176,7 @@ namespace OpenSim.Region.CoreModules.Framework.Library
                 m_log.InfoFormat("[LIBRARY MODULE]: Loading library archive {0} ({1})...", iarFileName, simpleName);
                 simpleName = GetInventoryPathFromName(simpleName);
 
-                InventoryArchiveReadRequest archread = new InventoryArchiveReadRequest(m_MockScene, uinfo, simpleName, iarFileName, false);
+                InventoryArchiveReadRequest archread = new InventoryArchiveReadRequest(m_MockScene.InventoryService, m_MockScene.AssetService, m_MockScene.UserAccountService, uinfo, simpleName, iarFileName, false);
                 try
                 {
                     HashSet<InventoryNodeBase> nodes = archread.Execute();
@@ -185,7 +185,7 @@ namespace OpenSim.Region.CoreModules.Framework.Library
                         // didn't find the subfolder with the given name; place it on the top
                         m_log.InfoFormat("[LIBRARY MODULE]: Didn't find {0} in library. Placing archive on the top level", simpleName);
                         archread.Close();
-                        archread = new InventoryArchiveReadRequest(m_MockScene, uinfo, "/", iarFileName, false);
+                        archread = new InventoryArchiveReadRequest(m_MockScene.InventoryService, m_MockScene.AssetService, m_MockScene.UserAccountService, uinfo, "/", iarFileName, false);
                         archread.Execute();
                     }
 
diff --git a/OpenSim/Region/CoreModules/Framework/Search/BasicSearchModule.cs b/OpenSim/Region/CoreModules/Framework/Search/BasicSearchModule.cs
new file mode 100644
index 0000000..8838612
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Framework/Search/BasicSearchModule.cs
@@ -0,0 +1,197 @@
+/*
+ * 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.Reflection;
+using System.Threading;
+
+using OpenSim.Framework;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Monitoring;
+using OpenSim.Region.ClientStack.LindenUDP;
+using OpenSim.Region.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using OpenSim.Services.Connectors.Hypergrid;
+
+using OpenMetaverse;
+using OpenMetaverse.Packets;
+using log4net;
+using Nini.Config;
+using Mono.Addins;
+
+using DirFindFlags = OpenMetaverse.DirectoryManager.DirFindFlags;
+
+namespace OpenSim.Region.CoreModules.Framework.Search
+{
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "BasicSearchModule")]
+    public class BasicSearchModule : ISharedRegionModule
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        protected bool m_Enabled;
+        protected List<Scene> m_Scenes = new List<Scene>();
+
+        private IGroupsModule m_GroupsService = null;
+
+        #region ISharedRegionModule
+
+        public void Initialise(IConfigSource config)
+        {
+            string umanmod = config.Configs["Modules"].GetString("SearchModule", Name);
+            if (umanmod == Name)
+            {
+                m_Enabled = true;
+                m_log.DebugFormat("[BASIC SEARCH MODULE]: {0} is enabled", Name);
+            }
+        }
+
+        public bool IsSharedModule
+        {
+            get { return true; }
+        }
+
+        public virtual string Name
+        {
+            get { return "BasicSearchModule"; }
+        }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            if (m_Enabled)
+            {
+                m_Scenes.Add(scene);
+
+                scene.EventManager.OnMakeRootAgent += new Action<ScenePresence>(EventManager_OnMakeRootAgent);
+                scene.EventManager.OnMakeChildAgent += new EventManager.OnMakeChildAgentDelegate(EventManager_OnMakeChildAgent);
+            }
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            if (m_Enabled)
+            {
+                m_Scenes.Remove(scene);
+
+                scene.EventManager.OnMakeRootAgent -= new Action<ScenePresence>(EventManager_OnMakeRootAgent);
+                scene.EventManager.OnMakeChildAgent -= new EventManager.OnMakeChildAgentDelegate(EventManager_OnMakeChildAgent);
+            }
+        }
+
+        public void RegionLoaded(Scene s)
+        {
+            if (!m_Enabled)
+                return;
+
+            if (m_GroupsService == null)
+            {
+                m_GroupsService = s.RequestModuleInterface<IGroupsModule>();
+
+                // No Groups Service Connector, then group search won't work...
+                if (m_GroupsService == null)
+                    m_log.Warn("[BASIC SEARCH MODULE]: Could not get IGroupsModule");
+            }
+        }
+
+        public void PostInitialise()
+        {
+        }
+
+        public void Close()
+        {
+            m_Scenes.Clear();
+        }
+
+        #endregion ISharedRegionModule
+
+ 
+        #region Event Handlers
+
+        void EventManager_OnMakeRootAgent(ScenePresence sp)
+        {
+            sp.ControllingClient.OnDirFindQuery += OnDirFindQuery;
+        }
+
+        void EventManager_OnMakeChildAgent(ScenePresence sp)
+        {
+            sp.ControllingClient.OnDirFindQuery -= OnDirFindQuery;
+        }
+
+        void OnDirFindQuery(IClientAPI remoteClient, UUID queryID, string queryText, uint queryFlags, int queryStart)
+        {
+            if (((DirFindFlags)queryFlags & DirFindFlags.People) == DirFindFlags.People)
+            {
+                if (string.IsNullOrEmpty(queryText))
+                    remoteClient.SendDirPeopleReply(queryID, new DirPeopleReplyData[0]);
+
+                List<UserAccount> accounts = m_Scenes[0].UserAccountService.GetUserAccounts(m_Scenes[0].RegionInfo.ScopeID, queryText);
+                DirPeopleReplyData[] hits = new DirPeopleReplyData[accounts.Count];
+                int i = 0;
+                foreach (UserAccount acc in accounts)
+                {
+                    DirPeopleReplyData d = new DirPeopleReplyData();
+                    d.agentID = acc.PrincipalID;
+                    d.firstName = acc.FirstName;
+                    d.lastName = acc.LastName;
+                    d.online = false;
+
+                    hits[i++] = d;
+                }
+
+                // TODO: This currently ignores pretty much all the query flags including Mature and sort order
+                remoteClient.SendDirPeopleReply(queryID, hits);
+            }
+            else if (((DirFindFlags)queryFlags & DirFindFlags.Groups) == DirFindFlags.Groups)
+            {
+                if (m_GroupsService == null)
+                {
+                    m_log.Warn("[BASIC SEARCH MODULE]: Groups service is not available. Unable to search groups.");
+                    remoteClient.SendAlertMessage("Groups search is not enabled");
+                    return;
+                }
+
+                if (string.IsNullOrEmpty(queryText))
+                    remoteClient.SendDirGroupsReply(queryID, new DirGroupsReplyData[0]);
+
+                // TODO: This currently ignores pretty much all the query flags including Mature and sort order
+                remoteClient.SendDirGroupsReply(queryID, m_GroupsService.FindGroups(remoteClient, queryText).ToArray());
+            }
+
+        }
+
+        #endregion Event Handlers
+
+    }
+
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs b/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
new file mode 100644
index 0000000..a70261e
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Framework/ServiceThrottle/ServiceThrottleModule.cs
@@ -0,0 +1,256 @@
+/*
+ * 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.Threading;
+using log4net;
+using Mono.Addins;
+using Nini.Config;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Framework.Monitoring;
+using OpenSim.Region.Framework.Scenes;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+
+namespace OpenSim.Region.CoreModules.Framework
+{
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GridServiceThrottleModule")]
+    public class ServiceThrottleModule : ISharedRegionModule, IServiceThrottleModule
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private readonly List<Scene> m_scenes = new List<Scene>();
+        private System.Timers.Timer m_timer = new System.Timers.Timer();
+
+        private Queue<Action> m_RequestQueue = new Queue<Action>();
+        private Dictionary<string, List<string>> m_Pending = new Dictionary<string, List<string>>();
+        private int m_Interval;
+
+        #region ISharedRegionModule
+
+        public void Initialise(IConfigSource config)
+        {
+            m_Interval = Util.GetConfigVarFromSections<int>(config, "Interval", new string[] { "ServiceThrottle" }, 5000);
+
+            m_timer = new System.Timers.Timer();
+            m_timer.AutoReset = false;
+            m_timer.Enabled = true;
+            m_timer.Interval = 15000; // 15 secs at first
+            m_timer.Elapsed += ProcessQueue;
+            m_timer.Start();
+
+            //Watchdog.StartThread(
+            //    ProcessQueue,
+            //    "GridServiceRequestThread",
+            //    ThreadPriority.BelowNormal,
+            //    true,
+            //    false);
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            lock (m_scenes)
+            {
+                m_scenes.Add(scene);
+                scene.RegisterModuleInterface<IServiceThrottleModule>(this);
+                scene.EventManager.OnNewClient += OnNewClient;
+                scene.EventManager.OnMakeRootAgent += OnMakeRootAgent;
+            }
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            lock (m_scenes)
+            {
+                m_scenes.Remove(scene);
+                scene.EventManager.OnNewClient -= OnNewClient;
+            }
+        }
+
+        public void PostInitialise()
+        {
+        }
+
+        public void Close()
+        {
+        }
+
+        public string Name
+        {
+            get { return "ServiceThrottleModule"; }
+        }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        #endregion ISharedRegionMOdule
+
+        #region Events
+
+        void OnNewClient(IClientAPI client)
+        {
+            client.OnRegionHandleRequest += OnRegionHandleRequest;
+        }
+
+        void OnMakeRootAgent(ScenePresence obj)
+        {
+            lock (m_timer)
+            {
+                if (!m_timer.Enabled)
+                {
+                    m_timer.Interval = m_Interval;
+                    m_timer.Enabled = true;
+                    m_timer.Start();
+                }
+            }
+        }
+
+        public void OnRegionHandleRequest(IClientAPI client, UUID regionID)
+        {
+            //m_log.DebugFormat("[SERVICE THROTTLE]: RegionHandleRequest {0}", regionID);
+            ulong handle = 0;
+            if (IsLocalRegionHandle(regionID, out handle))
+            {
+                client.SendRegionHandle(regionID, handle);
+                return;
+            }
+
+            Action action = delegate
+            {
+                GridRegion r = m_scenes[0].GridService.GetRegionByUUID(UUID.Zero, regionID);
+
+                if (r != null && r.RegionHandle != 0)
+                    client.SendRegionHandle(regionID, r.RegionHandle);
+            };
+
+            Enqueue("region", regionID.ToString(), action);
+        }
+
+        #endregion Events
+
+        #region IServiceThrottleModule
+
+        public void Enqueue(string category, string itemid, Action continuation)
+        {
+            lock (m_RequestQueue)
+            {
+                if (m_Pending.ContainsKey(category))
+                {
+                    if (m_Pending[category].Contains(itemid))
+                        // Don't enqueue, it's already pending
+                        return;
+                }
+                else
+                    m_Pending.Add(category, new List<string>());
+
+                m_Pending[category].Add(itemid);
+
+                m_RequestQueue.Enqueue(delegate
+                {
+                    lock (m_RequestQueue)
+                        m_Pending[category].Remove(itemid);
+
+                    continuation();
+                });
+            }
+        }
+
+        #endregion IServiceThrottleModule
+
+        #region Process Continuation Queue
+
+        private void ProcessQueue(object sender, System.Timers.ElapsedEventArgs e)
+        {
+            //m_log.DebugFormat("[YYY]: Process queue with {0} continuations", m_RequestQueue.Count);
+
+            while (m_RequestQueue.Count > 0)
+            {
+                Action continuation = null;
+                lock (m_RequestQueue)
+                    continuation = m_RequestQueue.Dequeue();
+
+                if (continuation != null)
+                    continuation();
+            }
+
+            if (AreThereRootAgents())
+            {
+                lock (m_timer)
+                {
+                    m_timer.Interval = 1000; // 1 sec
+                    m_timer.Enabled = true;
+                    m_timer.Start();
+                }
+            }
+            else
+                lock (m_timer)
+                    m_timer.Enabled = false;
+
+        }
+
+        #endregion Process Continuation Queue
+
+        #region Misc
+
+        private bool IsLocalRegionHandle(UUID regionID, out ulong regionHandle)
+        {
+            regionHandle = 0;
+            foreach (Scene s in m_scenes)
+                if (s.RegionInfo.RegionID == regionID)
+                {
+                    regionHandle = s.RegionInfo.RegionHandle;
+                    return true;
+                }
+            return false;
+        }
+
+        private bool AreThereRootAgents()
+        {
+            foreach (Scene s in m_scenes)
+            {
+                foreach (ScenePresence sp in s.GetScenePresences())
+                    if (!sp.IsChildAgent)
+                        return true;
+            }
+
+            return false;
+        }
+
+        #endregion Misc
+    }
+
+}
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
index 4ef57fe..245c808 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs
@@ -50,16 +50,15 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-
         #region ISharedRegionModule
 
         public new void Initialise(IConfigSource config)
         {
-            string umanmod = config.Configs["Modules"].GetString("UserManagementModule", base.Name);
+            string umanmod = config.Configs["Modules"].GetString("UserManagementModule", null);
             if (umanmod == Name)
             {
                 m_Enabled = true;
-                RegisterConsoleCmds();
+                Init();
                 m_log.DebugFormat("[USER MANAGEMENT MODULE]: {0} is enabled", Name);
             }
         }
@@ -71,7 +70,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
         #endregion ISharedRegionModule
 
-        protected override void AddAdditionalUsers(UUID avatarID, string query, List<UserData> users)
+        protected override void AddAdditionalUsers(string query, List<UserData> users)
         {
             if (query.Contains("@"))  // First.Last@foo.com, maybe?
             {
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/Tests/HGUserManagementModuleTests.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/Tests/HGUserManagementModuleTests.cs
new file mode 100644
index 0000000..9d36aa5
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/Tests/HGUserManagementModuleTests.cs
@@ -0,0 +1,76 @@
+/*
+ * 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.CoreModules.Framework.UserManagement;
+using OpenSim.Tests.Common;
+using OpenSim.Tests.Common.Mock;
+
+namespace OpenSim.Region.CoreModules.Framework.UserManagement.Tests
+{
+    [TestFixture]
+    public class HGUserManagementModuleTests : OpenSimTestCase
+    {    
+        /// <summary>
+        /// Test that a new HG agent (i.e. one without a user account) has their name cached in the UMM upon creation.
+        /// </summary>
+        [Test]
+        public void TestCachedUserNameForNewAgent()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            HGUserManagementModule hgumm = new HGUserManagementModule();
+            UUID userId = TestHelpers.ParseStem("11");
+            string firstName = "Fred";
+            string lastName = "Astaire";
+            string homeUri = "example.com";
+
+            IConfigSource config = new IniConfigSource();
+            config.AddConfig("Modules");
+            config.Configs["Modules"].Set("UserManagementModule", hgumm.Name);
+
+            SceneHelpers sceneHelpers = new SceneHelpers();
+            TestScene scene = sceneHelpers.SetupScene();
+            SceneHelpers.SetupSceneModules(scene, config, hgumm);
+
+            AgentCircuitData acd = SceneHelpers.GenerateAgentData(userId);
+            acd.firstname = firstName;
+            acd.lastname = lastName;
+            acd.ServiceURLs["HomeURI"] = "http://" + homeUri;
+
+            SceneHelpers.AddScenePresence(scene, acd);
+
+            string name = hgumm.GetUserName(userId);
+            Assert.That(name, Is.EqualTo(string.Format("{0}.{1} @{2}", firstName, lastName, homeUri)));
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 77e8b00..8c983e6 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -28,9 +28,11 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
+using System.Threading;
 
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
+using OpenSim.Framework.Monitoring;
 using OpenSim.Region.ClientStack.LindenUDP;
 using OpenSim.Region.Framework;
 using OpenSim.Region.Framework.Interfaces;
@@ -44,25 +46,19 @@ using log4net;
 using Nini.Config;
 using Mono.Addins;
 
+using DirFindFlags = OpenMetaverse.DirectoryManager.DirFindFlags;
+
 namespace OpenSim.Region.CoreModules.Framework.UserManagement
 {
-    public class UserData
-    {
-        public UUID Id { get; set; }
-        public string FirstName { get; set; }
-        public string LastName { get; set; }
-        public string HomeURL { get; set; }
-        public Dictionary<string, object> ServerURLs { get; set; }
-    }
-
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "UserManagementModule")]
-    public class UserManagementModule : ISharedRegionModule, IUserManagement
+    public class UserManagementModule : ISharedRegionModule, IUserManagement, IPeople
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         protected bool m_Enabled;
         protected List<Scene> m_Scenes = new List<Scene>();
 
+        protected IServiceThrottleModule m_ServiceThrottle;
         // The cache
         protected Dictionary<UUID, UserData> m_UserCache = new Dictionary<UUID, UserData>();
 
@@ -74,7 +70,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             if (umanmod == Name)
             {
                 m_Enabled = true;
-                RegisterConsoleCmds();
+                Init();
                 m_log.DebugFormat("[USER MANAGEMENT MODULE]: {0} is enabled", Name);
             }
         }
@@ -101,6 +97,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 m_Scenes.Add(scene);
 
                 scene.RegisterModuleInterface<IUserManagement>(this);
+                scene.RegisterModuleInterface<IPeople>(this);
                 scene.EventManager.OnNewClient += new EventManager.OnNewClientDelegate(EventManager_OnNewClient);
                 scene.EventManager.OnPrimsLoaded += new EventManager.PrimsLoaded(EventManager_OnPrimsLoaded);
             }
@@ -117,6 +114,8 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
         public void RegionLoaded(Scene s)
         {
+            if (m_Enabled && m_ServiceThrottle == null)
+                m_ServiceThrottle = s.RequestModuleInterface<IServiceThrottleModule>();
         }
 
         public void PostInitialise()
@@ -143,7 +142,6 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             s.ForEachSOG(delegate(SceneObjectGroup sog) { CacheCreators(sog); });
         }
 
-
         void EventManager_OnNewClient(IClientAPI client)
         {
             client.OnConnectionClosed += new Action<IClientAPI>(HandleConnectionClosed);
@@ -157,21 +155,40 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             client.OnAvatarPickerRequest -= new AvatarPickerRequest(HandleAvatarPickerRequest);
         }
 
-        void HandleUUIDNameRequest(UUID uuid, IClientAPI remote_client)
+        void HandleUUIDNameRequest(UUID uuid, IClientAPI client)
         {
+//            m_log.DebugFormat(
+//                "[USER MANAGEMENT MODULE]: Handling request for name binding of UUID {0} from {1}", 
+//                uuid, remote_client.Name);
+
             if (m_Scenes[0].LibraryService != null && (m_Scenes[0].LibraryService.LibraryRootFolder.Owner == uuid))
             {
-                remote_client.SendNameReply(uuid, "Mr", "OpenSim");
+                client.SendNameReply(uuid, "Mr", "OpenSim");
             }
             else
             {
-                string[] names = GetUserNames(uuid);
-                if (names.Length == 2)
+                string[] names = new string[2];
+                if (TryGetUserNamesFromCache(uuid, names))
                 {
-                    //m_log.DebugFormat("[XXX] HandleUUIDNameRequest {0} is {1} {2}", uuid, names[0], names[1]);
-                    remote_client.SendNameReply(uuid, names[0], names[1]);
+                    client.SendNameReply(uuid, names[0], names[1]);
+                    return;
                 }
 
+                // Not found in cache, queue continuation
+                m_ServiceThrottle.Enqueue("name", uuid.ToString(),  delegate
+                {
+                    //m_log.DebugFormat("[YYY]: Name request {0}", uuid);
+                    bool foundRealName = TryGetUserNames(uuid, names);
+
+                    if (names.Length == 2)
+                    {
+                        if (!foundRealName)
+                            m_log.DebugFormat("[USER MANAGEMENT MODULE]: Sending {0} {1} for {2} to {3} since no bound name found", names[0], names[1], uuid, client.Name);
+
+                        client.SendNameReply(uuid, names[0], names[1]);
+                    }
+                });
+
             }
         }
 
@@ -181,29 +198,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
             m_log.DebugFormat("[USER MANAGEMENT MODULE]: HandleAvatarPickerRequest for {0}", query);
 
-            // searhc the user accounts service
-            List<UserAccount> accs = m_Scenes[0].UserAccountService.GetUserAccounts(m_Scenes[0].RegionInfo.ScopeID, query);
-
-            List<UserData> users = new List<UserData>();
-            if (accs != null)
-            {
-                foreach (UserAccount acc in accs)
-                {
-                    UserData ud = new UserData();
-                    ud.FirstName = acc.FirstName;
-                    ud.LastName = acc.LastName;
-                    ud.Id = acc.PrincipalID;
-                    users.Add(ud);
-                }
-            }
-
-            // search the local cache
-            foreach (UserData data in m_UserCache.Values)
-                if (users.Find(delegate(UserData d) { return d.Id == data.Id; }) == null &&
-                    (data.FirstName.StartsWith(query) || data.LastName.StartsWith(query)))
-                    users.Add(data);
-
-            AddAdditionalUsers(avatarID, query, users);
+            List<UserData> users = GetUserData(query, 500, 1);
 
             AvatarPickerReplyPacket replyPacket = (AvatarPickerReplyPacket)PacketPool.Instance.GetPacket(PacketType.AvatarPickerReply);
             // TODO: don't create new blocks if recycling an old packet
@@ -249,12 +244,51 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             client.SendAvatarPickerReply(agent_data, data_args);
         }
 
-        protected virtual void AddAdditionalUsers(UUID avatarID, string query, List<UserData> users)
+        protected virtual void AddAdditionalUsers(string query, List<UserData> users)
         {
         }
 
         #endregion Event Handlers
 
+        #region IPeople
+
+        public List<UserData> GetUserData(string query, int page_size, int page_number)
+        {
+            // search the user accounts service
+            List<UserAccount> accs = m_Scenes[0].UserAccountService.GetUserAccounts(m_Scenes[0].RegionInfo.ScopeID, query);
+
+            List<UserData> users = new List<UserData>();
+            if (accs != null)
+            {
+                foreach (UserAccount acc in accs)
+                {
+                    UserData ud = new UserData();
+                    ud.FirstName = acc.FirstName;
+                    ud.LastName = acc.LastName;
+                    ud.Id = acc.PrincipalID;
+                    users.Add(ud);
+                }
+            }
+
+            // search the local cache
+            lock (m_UserCache)
+            {
+                foreach (UserData data in m_UserCache.Values)
+                {
+                    if (users.Find(delegate(UserData d) { return d.Id == data.Id; }) == null &&
+                        (data.FirstName.ToLower().StartsWith(query.ToLower()) || data.LastName.ToLower().StartsWith(query.ToLower())))
+                        users.Add(data);
+                }
+            }
+
+            AddAdditionalUsers(query, users);
+
+            return users;
+
+        }
+
+        #endregion IPeople
+
         private void CacheCreators(SceneObjectGroup sog)
         {
             //m_log.DebugFormat("[USER MANAGEMENT MODULE]: processing {0} {1}; {2}", sog.RootPart.Name, sog.RootPart.CreatorData, sog.RootPart.CreatorIdentification);
@@ -268,26 +302,56 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             }
         }
 
-        private string[] GetUserNames(UUID uuid)
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="uuid"></param>
+        /// <param name="names">Caller please provide a properly instantiated array for names, string[2]</param>
+        /// <returns></returns>
+        private bool TryGetUserNames(UUID uuid, string[] names)
         {
-            string[] returnstring = new string[2];
+            if (names == null)
+                names = new string[2];
+
+            if (TryGetUserNamesFromCache(uuid, names))
+                return true;
 
+            if (TryGetUserNamesFromServices(uuid, names))
+                return true;
+
+            return false;
+        }
+
+        private bool TryGetUserNamesFromCache(UUID uuid, string[] names)
+        {
             lock (m_UserCache)
             {
                 if (m_UserCache.ContainsKey(uuid))
                 {
-                    returnstring[0] = m_UserCache[uuid].FirstName;
-                    returnstring[1] = m_UserCache[uuid].LastName;
-                    return returnstring;
+                    names[0] = m_UserCache[uuid].FirstName;
+                    names[1] = m_UserCache[uuid].LastName;
+
+                    return true;
                 }
             }
 
+            return false;
+        }
+
+        /// <summary>
+        /// Try to get the names bound to the given uuid, from the services.
+        /// </summary>
+        /// <returns>True if the name was found, false if not.</returns>
+        /// <param name='uuid'></param>
+        /// <param name='names'>The array of names if found.  If not found, then names[0] = "Unknown" and names[1] = "User"</param>
+        private bool TryGetUserNamesFromServices(UUID uuid, string[] names)
+        {
             UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(UUID.Zero, uuid);
 
             if (account != null)
             {
-                returnstring[0] = account.FirstName;
-                returnstring[1] = account.LastName;
+                names[0] = account.FirstName;
+                names[1] = account.LastName;
 
                 UserData user = new UserData();
                 user.FirstName = account.FirstName;
@@ -295,14 +359,42 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
                 lock (m_UserCache)
                     m_UserCache[uuid] = user;
+
+                return true;
             }
             else
             {
-                returnstring[0] = "Unknown";
-                returnstring[1] = "User";
-            }
+                // Let's try the GridUser service
+                GridUserInfo uInfo = m_Scenes[0].GridUserService.GetGridUserInfo(uuid.ToString());
+                if (uInfo != null)
+                {
+                    string url, first, last, tmp;
+                    UUID u;
+                    if (Util.ParseUniversalUserIdentifier(uInfo.UserID, out u, out url, out first, out last, out tmp))
+                    {
+                        AddUser(uuid, first, last, url);
+
+                        if (m_UserCache.ContainsKey(uuid))
+                        {
+                            names[0] = m_UserCache[uuid].FirstName;
+                            names[1] = m_UserCache[uuid].LastName;
+
+                            return true;
+                        }
+                    }
+                    else
+                        m_log.DebugFormat("[USER MANAGEMENT MODULE]: Unable to parse UUI {0}", uInfo.UserID);
+                }
+                else
+                {
+                    m_log.DebugFormat("[USER MANAGEMENT MODULE]: No grid user found for {0}", uuid);
+                }
+
+                names[0] = "Unknown";
+                names[1] = "UserUMMTGUN8";
 
-            return returnstring;
+                return false;
+            }
         }
 
         #region IUserManagement
@@ -338,16 +430,11 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
         public string GetUserName(UUID uuid)
         {
-            string[] names = GetUserNames(uuid);
-            if (names.Length == 2)
-            {
-                string firstname = names[0];
-                string lastname = names[1];
+            string[] names = new string[2];
+            TryGetUserNames(uuid, names);
 
-                return firstname + " " + lastname;
+            return names[0] + " " + names[1];
 
-            }
-            return "(hippos)";
         }
 
         public string GetUserHomeURL(UUID userID)
@@ -394,14 +481,20 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
         public string GetUserUUI(UUID userID)
         {
-            UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, userID);
-            if (account != null)
-                return userID.ToString();
-
             UserData ud;
             lock (m_UserCache)
                 m_UserCache.TryGetValue(userID, out ud);
 
+            if (ud == null) // It's not in the cache
+            {
+                string[] names = new string[2];
+                // This will pull the data from either UserAccounts or GridUser
+                // and stick it into the cache
+                TryGetUserNamesFromServices(userID, names);
+                lock (m_UserCache)
+                    m_UserCache.TryGetValue(userID, out ud);
+            }
+
             if (ud != null)
             {
                 string homeURL = ud.HomeURL;
@@ -451,72 +544,75 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
             //m_log.DebugFormat("[USER MANAGEMENT MODULE]: Adding user with id {0}, creatorData {1}", id, creatorData);
 
             UserData oldUser;
-            //lock the whole block - prevent concurrent update
             lock (m_UserCache)
+                m_UserCache.TryGetValue(id, out oldUser);
+
+            if (oldUser != null)
             {
-                m_UserCache.TryGetValue (id, out oldUser);
-                if (oldUser != null)
+                if (creatorData == null || creatorData == String.Empty)
                 {
-                    if (creatorData == null || creatorData == String.Empty)
-                    {
-                        //ignore updates without creator data
-                        return;
-                    }
-                    //try update unknown users
-                    //and creator's home URL's
-                    if ((oldUser.FirstName == "Unknown" && !creatorData.Contains ("Unknown")) || (oldUser.HomeURL != null && !creatorData.StartsWith (oldUser.HomeURL)))
-                    {
-                        m_UserCache.Remove (id);
-//                      m_log.DebugFormat("[USER MANAGEMENT MODULE]: Re-adding user with id {0}, creatorData [{1}] and old HomeURL {2}", id, creatorData,oldUser.HomeURL);
-                    }
-                    else
-                    {
-                        //we have already a valid user within the cache
-                        return;
-                    }
+                    //ignore updates without creator data
+                    return;
                 }
 
-                UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount (m_Scenes [0].RegionInfo.ScopeID, id);
-
-                if (account != null)
+                //try update unknown users, but don't update anyone else
+                if (oldUser.FirstName == "Unknown" && !creatorData.Contains("Unknown")) 
                 {
-                    AddUser (id, account.FirstName, account.LastName);
+                    lock (m_UserCache)
+                        m_UserCache.Remove(id);
+                    m_log.DebugFormat("[USER MANAGEMENT MODULE]: Re-adding user with id {0}, creatorData [{1}] and old HomeURL {2}", id, creatorData, oldUser.HomeURL);
                 }
                 else
                 {
-                    UserData user = new UserData ();
-                    user.Id = id;
+                    //we have already a valid user within the cache
+                    return;
+                }
+            }
 
-                    if (creatorData != null && creatorData != string.Empty)
-                    {
-                        //creatorData = <endpoint>;<name>
+            UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, id);
+
+            if (account != null)
+            {
+                AddUser(id, account.FirstName, account.LastName);
+            }
+            else
+            {
+                UserData user = new UserData();
+                user.Id = id;
+
+                if (!string.IsNullOrEmpty(creatorData))
+                {
+                    //creatorData = <endpoint>;<name>
 
-                        string[] parts = creatorData.Split (';');
-                        if (parts.Length >= 1)
+                    string[] parts = creatorData.Split(';');
+                    if (parts.Length >= 1)
+                    {
+                        user.HomeURL = parts[0];
+                        try
                         {
-                            user.HomeURL = parts [0];
-                            try
-                            {
-                                Uri uri = new Uri (parts [0]);
-                                user.LastName = "@" + uri.Authority;
-                            }
-                            catch (UriFormatException)
-                            {
-                                m_log.DebugFormat ("[SCENE]: Unable to parse Uri {0}", parts [0]);
-                                user.LastName = "@unknown";
-                            }
+                            Uri uri = new Uri(parts[0]);
+                            user.LastName = "@" + uri.Authority;
+                        }
+                        catch (UriFormatException)
+                        {
+                            m_log.DebugFormat("[SCENE]: Unable to parse Uri {0}", parts[0]);
+                            user.LastName = "@unknown";
                         }
-                        if (parts.Length >= 2)
-                            user.FirstName = parts [1].Replace (' ', '.');
-                    }
-                    else
-                    {
-                        user.FirstName = "Unknown";
-                        user.LastName = "User";
                     }
-
-                    AddUserInternal (user);
+                    if (parts.Length >= 2)
+                        user.FirstName = parts[1].Replace(' ', '.');
+                }
+                else
+                {
+                    // Temporarily add unknown user entries of this type into the cache so that we can distinguish
+                    // this source from other recent (hopefully resolved) bugs that fail to retrieve a user name binding
+                    // TODO: Can be removed when GUN* unknown users have definitely dropped significantly or
+                    // disappeared.
+                    user.FirstName = "Unknown";
+                    user.LastName = "UserUMMAU4";
                 }
+
+                AddUserInternal(user);
             }
         }
 
@@ -541,9 +637,21 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
 
         #endregion IUserManagement
 
+        protected void Init()
+        {
+            RegisterConsoleCmds();
+        }
+
         protected void RegisterConsoleCmds()
         {
             MainConsole.Instance.Commands.AddCommand("Users", true,
+                "show name",
+                "show name <uuid>",
+                "Show the bindings between a single user UUID and a user name",
+                String.Empty,
+                HandleShowUser);
+
+            MainConsole.Instance.Commands.AddCommand("Users", true,
                 "show names",
                 "show names",
                 "Show the bindings between user UUIDs and user names",
@@ -551,26 +659,56 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
                 HandleShowUsers);
         }
 
-        private void HandleShowUsers(string module, string[] cmd)
+        private void HandleShowUser(string module, string[] cmd)
         {
+            if (cmd.Length < 3)
+            {
+                MainConsole.Instance.OutputFormat("Usage: show name <uuid>");
+                return;
+            }
+
+            UUID userId;
+            if (!ConsoleUtil.TryParseConsoleUuid(MainConsole.Instance, cmd[2], out userId))
+                return;
+
+            string[] names;
+
+            UserData ud;
+
             lock (m_UserCache)
             {
-                if (m_UserCache.Count == 0)
+                if (!m_UserCache.TryGetValue(userId, out ud))
                 {
-                    MainConsole.Instance.Output("No users found");
+                    MainConsole.Instance.OutputFormat("No name known for user with id {0}", userId);
                     return;
                 }
-    
-                MainConsole.Instance.Output("UUID                                 User Name");
-                MainConsole.Instance.Output("-----------------------------------------------------------------------------");
+            }
+
+            ConsoleDisplayTable cdt = new ConsoleDisplayTable();
+            cdt.AddColumn("UUID", 36);
+            cdt.AddColumn("Name", 30);
+            cdt.AddColumn("HomeURL", 40);
+            cdt.AddRow(userId, string.Format("{0} {1}", ud.FirstName, ud.LastName), ud.HomeURL);
+
+            MainConsole.Instance.Output(cdt.ToString());
+        }
+
+        private void HandleShowUsers(string module, string[] cmd)
+        {
+            ConsoleDisplayTable cdt = new ConsoleDisplayTable();
+            cdt.AddColumn("UUID", 36);
+            cdt.AddColumn("Name", 30);
+            cdt.AddColumn("HomeURL", 40);
+
+            lock (m_UserCache)
+            {
                 foreach (KeyValuePair<UUID, UserData> kvp in m_UserCache)
-                {
-                    MainConsole.Instance.Output(String.Format("{0} {1} {2} ({3})",
-                           kvp.Key, kvp.Value.FirstName, kvp.Value.LastName, kvp.Value.HomeURL));
-                }
-    
-                return;
+                    cdt.AddRow(kvp.Key, string.Format("{0} {1}", kvp.Value.FirstName, kvp.Value.LastName), kvp.Value.HomeURL);
             }
+
+            MainConsole.Instance.Output(cdt.ToString());
         }
+
     }
+
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
index 7b11658..f196973 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
@@ -31,6 +31,7 @@ using System.Reflection;
 using log4net;
 using Nini.Config;
 using OpenMetaverse;
+using OpenMetaverse.StructuredData;
 using Mono.Addins;
 using OpenSim.Framework;
 using OpenSim.Region.CoreModules.World.WorldMap;
@@ -48,20 +49,63 @@ namespace OpenSim.Region.CoreModules.Hypergrid
         // Remember the map area that each client has been exposed to in this region
         private Dictionary<UUID, List<MapBlockData>> m_SeenMapBlocks = new Dictionary<UUID, List<MapBlockData>>();
 
+        private string m_MapImageServerURL = string.Empty;
+
+        private IUserManagement m_UserManagement;
+
         #region INonSharedRegionModule Members
 
-        public override void Initialise(IConfigSource config)
+        public override void Initialise(IConfigSource source)
         {
             if (Util.GetConfigVarFromSections<string>(
-                config, "WorldMapModule", new string[] { "Map", "Startup" }, "WorldMap") == "HGWorldMap")
+                source, "WorldMapModule", new string[] { "Map", "Startup" }, "WorldMap") == "HGWorldMap")
+            {
                 m_Enabled = true;
+
+                m_MapImageServerURL = Util.GetConfigVarFromSections<string>(source, "MapTileURL", new string[] {"LoginService", "HGWorldMap", "SimulatorFeatures"});
+
+                if (!string.IsNullOrEmpty(m_MapImageServerURL))
+                {
+                    m_MapImageServerURL = m_MapImageServerURL.Trim();
+                    if (!m_MapImageServerURL.EndsWith("/"))
+                        m_MapImageServerURL = m_MapImageServerURL + "/";
+                }
+
+
+            }
         }
 
         public override void AddRegion(Scene scene)
         {
+            if (!m_Enabled)
+                return;
+
             base.AddRegion(scene);
 
-            scene.EventManager.OnClientClosed += new EventManager.ClientClosed(EventManager_OnClientClosed);
+            scene.EventManager.OnClientClosed += EventManager_OnClientClosed;
+        }
+
+        public override void RegionLoaded(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+
+            base.RegionLoaded(scene);
+            ISimulatorFeaturesModule featuresModule = m_scene.RequestModuleInterface<ISimulatorFeaturesModule>();
+
+            if (featuresModule != null)
+                featuresModule.OnSimulatorFeaturesRequest += OnSimulatorFeaturesRequest;
+
+            m_UserManagement = m_scene.RequestModuleInterface<IUserManagement>();
+
+        }
+
+        public override void RemoveRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+
+            scene.EventManager.OnClientClosed -= EventManager_OnClientClosed;
         }
 
         public override string Name
@@ -115,6 +159,20 @@ namespace OpenSim.Region.CoreModules.Hypergrid
             return mapBlocks;
         }
 
+        private void OnSimulatorFeaturesRequest(UUID agentID, ref OSDMap features)
+        {
+            if (m_UserManagement != null && !string.IsNullOrEmpty(m_MapImageServerURL) && !m_UserManagement.IsLocalGridUser(agentID))
+            {
+                OSD extras = new OSDMap();
+                if (features.ContainsKey("OpenSimExtras"))
+                    extras = features["OpenSimExtras"];
+                else
+                    features["OpenSimExtras"] = extras;
+
+                ((OSDMap)extras)["map-server-url"] = m_MapImageServerURL;
+
+            }
+        }
     }
 
     class MapArea
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index 2b13a8b..6eb25ef 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -412,7 +412,6 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
         //public bool HttpVerboseThrottle = true; // not implemented
         public List<string> HttpCustomHeaders = null;
         public bool HttpPragmaNoCache = true;
-        private Thread httpThread;
 
         // Request info
         private UUID _itemID;
@@ -622,7 +621,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
             {
                 if (!WorkItem.Cancel())
                 {
-                    WorkItem.Abort();
+                    WorkItem.Cancel(true);
                 }
             }
             catch (Exception)
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs
new file mode 100644
index 0000000..e812d81
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs
@@ -0,0 +1,198 @@
+/*
+ * 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.Net;
+using System.Reflection;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading;
+using log4net.Config;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenMetaverse.Assets;
+using OpenSim.Framework;
+using OpenSim.Region.CoreModules.Scripting.HttpRequest;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Tests.Common;
+using OpenSim.Tests.Common.Mock;
+
+namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests
+{
+    class TestWebRequestCreate : IWebRequestCreate
+    {       
+        public TestWebRequest NextRequest { get; set; }
+
+        public WebRequest Create(Uri uri)
+        {
+//            NextRequest.RequestUri = uri;
+
+            return NextRequest;
+
+//            return new TestWebRequest(new SerializationInfo(typeof(TestWebRequest), new FormatterConverter()), new StreamingContext());
+        }
+    }
+
+    class TestWebRequest : WebRequest
+    {
+        public override string ContentType { get; set; }
+        public override string Method { get; set; }
+
+        public Func<IAsyncResult, WebResponse> OnEndGetResponse { get; set; }
+
+        public TestWebRequest() : base() 
+        {
+//            Console.WriteLine("created");
+        }
+
+//        public TestWebRequest(SerializationInfo serializationInfo, StreamingContext streamingContext) 
+//            : base(serializationInfo, streamingContext) 
+//        {
+//            Console.WriteLine("created");
+//        }
+
+        public override IAsyncResult BeginGetResponse(AsyncCallback callback, object state)
+        {
+//            Console.WriteLine("bish");
+            TestAsyncResult tasr = new TestAsyncResult();
+            callback(tasr);
+
+            return tasr;
+        }
+
+        public override WebResponse EndGetResponse(IAsyncResult asyncResult)
+        {
+//            Console.WriteLine("bosh");
+            return OnEndGetResponse(asyncResult);
+        }
+    }
+
+    class TestHttpWebResponse : HttpWebResponse
+    {
+        public string Response { get; set; }
+
+        public TestHttpWebResponse(SerializationInfo serializationInfo, StreamingContext streamingContext) 
+            : base(serializationInfo, streamingContext) {}
+
+        public override Stream GetResponseStream()
+        {
+            return new MemoryStream(Encoding.UTF8.GetBytes(Response));
+        }
+    }
+
+    class TestAsyncResult : IAsyncResult
+    {
+        WaitHandle m_wh = new ManualResetEvent(true);
+
+        object IAsyncResult.AsyncState 
+        {
+            get {
+                throw new System.NotImplementedException ();
+            }
+        }
+
+        WaitHandle IAsyncResult.AsyncWaitHandle 
+        {
+            get { return m_wh; }
+        }
+
+        bool IAsyncResult.CompletedSynchronously 
+        {
+            get { return false; }
+        }
+
+        bool IAsyncResult.IsCompleted 
+        {
+            get { return true; }
+        }
+    }
+
+    /// <summary>
+    /// Test script http request code.
+    /// </summary>
+    /// <remarks>
+    /// This class uses some very hacky workarounds in order to mock HttpWebResponse which are Mono dependent (though
+    /// alternative code can be written to make this work for Windows).  However, the value of being able to
+    /// regression test this kind of code is very high.
+    /// </remarks>
+    [TestFixture]
+    public class ScriptsHttpRequestsTests : OpenSimTestCase
+    {
+        /// <summary>
+        /// Test what happens when we get a 404 response from a call.
+        /// </summary>
+        [Test]
+        public void Test404Response()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            if (!Util.IsPlatformMono)
+                Assert.Ignore("Ignoring test since can only currently run on Mono");           
+
+            string rawResponse = "boom";
+
+            TestWebRequestCreate twrc = new TestWebRequestCreate();
+
+            TestWebRequest twr = new TestWebRequest();
+            //twr.OnEndGetResponse += ar => new TestHttpWebResponse(null, new StreamingContext());
+            twr.OnEndGetResponse += ar => 
+            {
+                SerializationInfo si = new SerializationInfo(typeof(HttpWebResponse), new FormatterConverter());
+                StreamingContext sc = new StreamingContext();
+//                WebHeaderCollection headers = new WebHeaderCollection();
+//                si.AddValue("m_HttpResponseHeaders", headers);
+                si.AddValue("uri", new Uri("test://arrg"));
+//                si.AddValue("m_Certificate", null);
+                si.AddValue("version", HttpVersion.Version11);
+                si.AddValue("statusCode", HttpStatusCode.NotFound);
+                si.AddValue("contentLength", 0);
+                si.AddValue("method", "GET");
+                si.AddValue("statusDescription", "Not Found");
+                si.AddValue("contentType", null);
+                si.AddValue("cookieCollection", new CookieCollection());
+
+                TestHttpWebResponse thwr = new TestHttpWebResponse(si, sc);
+                thwr.Response = rawResponse;
+
+                throw new WebException("no message", null, WebExceptionStatus.ProtocolError, thwr);
+            };
+
+            twrc.NextRequest = twr;
+
+            WebRequest.RegisterPrefix("test", twrc);
+            HttpRequestClass hr = new HttpRequestClass();
+            hr.Url = "test://something";
+            hr.SendRequest();
+
+            Assert.That(hr.Status, Is.EqualTo((int)HttpStatusCode.NotFound));
+            Assert.That(hr.ResponseBody, Is.EqualTo(rawResponse));
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index 2a4d440..1983fed 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -219,7 +219,8 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                 
                 string uri = "/lslhttp/" + urlcode.ToString();
                
-                PollServiceEventArgs args = new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode, 25000);
+                PollServiceEventArgs args 
+                    = new PollServiceEventArgs(HttpRequestHandler, uri, HasEvents, GetEvents, NoEvents, urlcode, 25000);
                 args.Type = PollServiceEventArgs.EventType.LslHttp;
                 m_HttpServer.AddPollServiceHTTPHandler(uri, args);
 
@@ -266,7 +267,8 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                 
                 string uri = "/lslhttps/" + urlcode.ToString();
                
-                PollServiceEventArgs args = new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode, 25000);
+                PollServiceEventArgs args 
+                    = new PollServiceEventArgs(HttpRequestHandler, uri, HasEvents, GetEvents, NoEvents, urlcode, 25000);
                 args.Type = PollServiceEventArgs.EventType.LslHttp;
                 m_HttpsServer.AddPollServiceHTTPHandler(uri, args);
 
diff --git a/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs b/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
index fccf053..ad33f23 100644
--- a/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
@@ -45,6 +45,7 @@ namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms
     {
         private static readonly ILog m_log =
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static string LogHeader = "[MODULE COMMS]";
 
         private Dictionary<string,object> m_constants = new Dictionary<string,object>();
 
@@ -148,7 +149,7 @@ namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms
             MethodInfo mi = GetMethodInfoFromType(target.GetType(), meth, true);
             if (mi == null)
             {
-                m_log.WarnFormat("[MODULE COMMANDS] Failed to register method {0}", meth);
+                m_log.WarnFormat("{0} Failed to register method {1}", LogHeader, meth);
                 return;
             }
 
@@ -163,9 +164,9 @@ namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms
 
         public void RegisterScriptInvocation(object target, MethodInfo mi)
         {
-            m_log.DebugFormat("[MODULE COMMANDS] Register method {0} from type {1}", mi.Name, (target is Type) ? ((Type)target).Name : target.GetType().Name);
+//            m_log.DebugFormat("[MODULE COMMANDS] Register method {0} from type {1}", mi.Name, (target is Type) ? ((Type)target).Name : target.GetType().Name);
 
-            Type delegateType;
+            Type delegateType = typeof(void);
             List<Type> typeArgs = mi.GetParameters()
                     .Select(p => p.ParameterType)
                     .ToList();
@@ -176,8 +177,16 @@ namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms
             }
             else
             {
-                typeArgs.Add(mi.ReturnType);
-                delegateType = Expression.GetFuncType(typeArgs.ToArray());
+                try
+                {
+                    typeArgs.Add(mi.ReturnType);
+                    delegateType = Expression.GetFuncType(typeArgs.ToArray());
+                }
+                catch (Exception e)
+                {
+                    m_log.ErrorFormat("{0} Failed to create function signature. Most likely more than 5 parameters. Method={1}. Error={2}",
+                        LogHeader, mi.Name, e);
+                }
             }
 
             Delegate fcall;
@@ -325,7 +334,7 @@ namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms
         /// </summary>
         public void RegisterConstant(string cname, object value)
         {
-            m_log.DebugFormat("[MODULE COMMANDS] register constant <{0}> with value {1}",cname,value.ToString());
+//            m_log.DebugFormat("[MODULE COMMANDS] register constant <{0}> with value {1}",cname,value.ToString());
             lock (m_constants)
             {
                 m_constants.Add(cname,value);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs
new file mode 100644
index 0000000..323535a
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs
@@ -0,0 +1,226 @@
+
+/*
+ * 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 log4net;
+using Mono.Addins;
+using Nini.Config;
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using OpenSim.Framework;
+using OpenSim.Framework.Console;
+using OpenSim.Server.Base;
+using OpenSim.Server.Handlers;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Framework.Servers;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+using OpenMetaverse;
+
+namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile
+{
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LocalUserProfilesServicesConnector")]
+    public class LocalUserProfilesServicesConnector : ISharedRegionModule
+    {
+        private static readonly ILog m_log =
+            LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private Dictionary<UUID, Scene> regions = new Dictionary<UUID, Scene>();
+
+        public IUserProfilesService ServiceModule
+        {
+            get; private set;
+        }
+
+         public bool Enabled
+        {
+            get; private set;
+        }
+
+        public string Name
+        {
+            get
+            {
+                return "LocalUserProfilesServicesConnector";
+            }
+        }
+
+        public string ConfigName
+        {
+            get; private set;
+        }
+        
+        public Type ReplaceableInterface 
+        {
+            get { return null; }
+        }
+
+        public LocalUserProfilesServicesConnector()
+        {
+            m_log.Debug("[LOCAL USERPROFILES SERVICE CONNECTOR]: LocalUserProfileServicesConnector no params");
+        }
+        
+        public LocalUserProfilesServicesConnector(IConfigSource source)
+        {
+            m_log.Debug("[LOCAL USERPROFILES SERVICE CONNECTOR]: LocalUserProfileServicesConnector instantiated directly.");
+            InitialiseService(source);
+        }
+
+        public void InitialiseService(IConfigSource source)
+        {
+            ConfigName = "UserProfilesService";
+            
+            // Instantiate the request handler
+            IHttpServer Server = MainServer.Instance;
+
+            IConfig config = source.Configs[ConfigName];
+            if (config == null)
+            {
+                m_log.Error("[LOCAL USERPROFILES SERVICE CONNECTOR]: UserProfilesService missing from OpenSim.ini");
+                return;
+            }
+            
+            if(!config.GetBoolean("Enabled",false))
+            {
+                Enabled = false;
+                return;
+            }
+            
+            Enabled = true;
+            
+            string serviceDll = config.GetString("LocalServiceModule",
+                                                      String.Empty);
+            
+            if (serviceDll == String.Empty)
+            {
+                m_log.Error("[LOCAL USERPROFILES SERVICE CONNECTOR]: No LocalServiceModule named in section UserProfilesService");
+                return;
+            }
+            
+            Object[] args = new Object[] { source, ConfigName };
+            ServiceModule =
+                ServerUtils.LoadPlugin<IUserProfilesService>(serviceDll,
+                                                     args);
+            
+            if (ServiceModule == null)
+            {
+                m_log.Error("[LOCAL USERPROFILES SERVICE CONNECTOR]: Can't load user profiles service");
+                return;
+            }
+            
+            Enabled = true;
+
+            JsonRpcProfileHandlers handler = new JsonRpcProfileHandlers(ServiceModule);
+
+            Server.AddJsonRPCHandler("avatarclassifiedsrequest", handler.AvatarClassifiedsRequest);
+            Server.AddJsonRPCHandler("classified_update", handler.ClassifiedUpdate);
+            Server.AddJsonRPCHandler("classifieds_info_query", handler.ClassifiedInfoRequest);
+            Server.AddJsonRPCHandler("classified_delete", handler.ClassifiedDelete);
+            Server.AddJsonRPCHandler("avatarpicksrequest", handler.AvatarPicksRequest);
+            Server.AddJsonRPCHandler("pickinforequest", handler.PickInfoRequest);
+            Server.AddJsonRPCHandler("picks_update", handler.PicksUpdate);
+            Server.AddJsonRPCHandler("picks_delete", handler.PicksDelete);
+            Server.AddJsonRPCHandler("avatarnotesrequest", handler.AvatarNotesRequest);
+            Server.AddJsonRPCHandler("avatar_notes_update", handler.NotesUpdate);
+            Server.AddJsonRPCHandler("avatar_properties_request", handler.AvatarPropertiesRequest);
+            Server.AddJsonRPCHandler("avatar_properties_update", handler.AvatarPropertiesUpdate);
+            Server.AddJsonRPCHandler("avatar_interests_update", handler.AvatarInterestsUpdate);
+            Server.AddJsonRPCHandler("image_assets_request", handler.AvatarImageAssetsRequest);
+            Server.AddJsonRPCHandler("user_data_request", handler.RequestUserAppData);
+            Server.AddJsonRPCHandler("user_data_update", handler.UpdateUserAppData);
+
+        }
+
+        #region ISharedRegionModule implementation
+
+        void ISharedRegionModule.PostInitialise()
+        {
+            if(!Enabled)
+                return;
+        }
+
+        #endregion
+
+        #region IRegionModuleBase implementation
+
+        void IRegionModuleBase.Initialise(IConfigSource source)
+        {
+            IConfig moduleConfig = source.Configs["Modules"];
+            if (moduleConfig != null)
+            {
+                string name = moduleConfig.GetString("UserProfilesServices", "");
+                if (name == Name)
+                {
+                    InitialiseService(source);
+                    m_log.Info("[LOCAL USERPROFILES SERVICE CONNECTOR]: Local user profiles connector enabled");
+                }
+            }
+        }
+
+        void IRegionModuleBase.Close()
+        {
+            return;
+        }
+
+        void IRegionModuleBase.AddRegion(Scene scene)
+        {
+            if (!Enabled)
+                return;
+            
+            lock (regions)
+            {
+                if (regions.ContainsKey(scene.RegionInfo.RegionID))
+                    m_log.ErrorFormat("[LOCAL USERPROFILES SERVICE CONNECTOR]: simulator seems to have more than one region with the same UUID. Please correct this!");
+                else
+                    regions.Add(scene.RegionInfo.RegionID, scene);
+            }
+        }
+
+        void IRegionModuleBase.RemoveRegion(Scene scene)
+        {
+            if (!Enabled)
+                return; 
+
+            lock (regions)
+            {
+                if (regions.ContainsKey(scene.RegionInfo.RegionID))
+                    regions.Remove(scene.RegionInfo.RegionID);
+            }
+        }
+
+        void IRegionModuleBase.RegionLoaded(Scene scene)
+        {
+            if (!Enabled)
+                return; 
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
index d221d68..9f58175 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
@@ -322,7 +322,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
                 // a copy of the local asset.
                 m_Cache.Cache(asset);
 
-            if (asset.Temporary || asset.Local)
+            if (asset.Local)
             {
                 if (m_Cache != null)
                     m_Cache.Cache(asset);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
index 480cd69..52b1039 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
@@ -258,7 +258,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
             if (m_Cache != null)
                 m_Cache.Cache(asset);
             
-            if (asset.Temporary || asset.Local)
+            if (asset.Local)
             {
 //                m_log.DebugFormat(
 //                    "[LOCAL ASSET SERVICE CONNECTOR]: Returning asset {0} {1} without querying database since status Temporary = {2}, Local = {3}",
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/Tests/AssetConnectorTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/Tests/AssetConnectorTests.cs
index 1982473..4f75191 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/Tests/AssetConnectorTests.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/Tests/AssetConnectorTests.cs
@@ -42,7 +42,7 @@ using OpenSim.Tests.Common;
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.Tests
 {
     [TestFixture]
-    public class AssetConnectorsTests : OpenSimTestCase
+    public class AssetConnectorTests : OpenSimTestCase
     {
         [Test]
         public void TestAddAsset()
@@ -77,7 +77,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.Tests
             // TODO: Add cache and check that this does receive a copy of the asset
         }
 
-        [Test]
         public void TestAddTemporaryAsset()
         {
             TestHelpers.InMethod();
@@ -93,8 +92,45 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.Tests
             LocalAssetServicesConnector lasc = new LocalAssetServicesConnector();
             lasc.Initialise(config);
 
+            // If it is remote, it should be stored
+            AssetBase a2 = AssetHelpers.CreateNotecardAsset();
+            a2.Local = false;
+            a2.Temporary = true;
+
+            lasc.Store(a2);
+
+            AssetBase retreivedA2 = lasc.Get(a2.ID);
+            Assert.That(retreivedA2.ID, Is.EqualTo(a2.ID));
+            Assert.That(retreivedA2.Metadata.ID, Is.EqualTo(a2.Metadata.ID));
+            Assert.That(retreivedA2.Data.Length, Is.EqualTo(a2.Data.Length));
+
+            AssetMetadata retrievedA2Metadata = lasc.GetMetadata(a2.ID);
+            Assert.That(retrievedA2Metadata.ID, Is.EqualTo(a2.ID));
+
+            byte[] retrievedA2Data = lasc.GetData(a2.ID);
+            Assert.That(retrievedA2Data.Length, Is.EqualTo(a2.Data.Length));
+
+            // TODO: Add cache and check that this does receive a copy of the asset
+        }
+
+        [Test]
+        public void TestAddLocalAsset()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            IConfigSource config = new IniConfigSource();
+            config.AddConfig("Modules");
+            config.Configs["Modules"].Set("AssetServices", "LocalAssetServicesConnector");
+            config.AddConfig("AssetService");
+            config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Services.AssetService.dll:AssetService");
+            config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Tests.Common.dll");
+
+            LocalAssetServicesConnector lasc = new LocalAssetServicesConnector();
+            lasc.Initialise(config);
+
             AssetBase a1 = AssetHelpers.CreateNotecardAsset();
-            a1.Temporary = true;
+            a1.Local = true;
 
             lasc.Store(a1);
 
@@ -106,7 +142,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.Tests
         }
 
         [Test]
-        public void TestAddLocalAsset()
+        public void TestAddTemporaryLocalAsset()
         {
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
@@ -121,8 +157,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.Tests
             LocalAssetServicesConnector lasc = new LocalAssetServicesConnector();
             lasc.Initialise(config);
 
+            // If it is local, it should not be stored
             AssetBase a1 = AssetHelpers.CreateNotecardAsset();
             a1.Local = true;
+            a1.Temporary = true;
 
             lasc.Store(a1);
 
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
index c0c2ca7..31ef79b 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
@@ -56,6 +56,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
         public LocalGridServicesConnector()
         {
+            m_log.Debug("[LOCAL GRID SERVICE CONNECTOR]: LocalGridServicesConnector no parms.");
         }
 
         public LocalGridServicesConnector(IConfigSource source)
@@ -142,10 +143,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
             scene.RegisterModuleInterface<IGridService>(this);
 
-            if (m_LocalCache.ContainsKey(scene.RegionInfo.RegionID))
-                m_log.ErrorFormat("[LOCAL GRID SERVICE CONNECTOR]: simulator seems to have more than one region with the same UUID. Please correct this!");
-            else
-                m_LocalCache.Add(scene.RegionInfo.RegionID, new RegionCache(scene));
+            lock (m_LocalCache)
+            {
+                if (m_LocalCache.ContainsKey(scene.RegionInfo.RegionID))
+                    m_log.ErrorFormat("[LOCAL GRID SERVICE CONNECTOR]: simulator seems to have more than one region with the same UUID. Please correct this!");
+                else
+                    m_LocalCache.Add(scene.RegionInfo.RegionID, new RegionCache(scene));
+            }
         }
 
         public void RemoveRegion(Scene scene)
@@ -153,8 +157,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             if (!m_Enabled)
                 return;
 
-            m_LocalCache[scene.RegionInfo.RegionID].Clear();
-            m_LocalCache.Remove(scene.RegionInfo.RegionID);
+            lock (m_LocalCache)
+            {
+                m_LocalCache[scene.RegionInfo.RegionID].Clear();
+                m_LocalCache.Remove(scene.RegionInfo.RegionID);
+            }
         }
 
         public void RegionLoaded(Scene scene)
@@ -191,12 +198,16 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
             // First see if it's a neighbour, even if it isn't on this sim.
             // Neighbour data is cached in memory, so this is fast
-            foreach (RegionCache rcache in m_LocalCache.Values)
+
+            lock (m_LocalCache)
             {
-                region = rcache.GetRegionByPosition(x, y);
-                if (region != null)
+                foreach (RegionCache rcache in m_LocalCache.Values)
                 {
-                    return region;
+                    region = rcache.GetRegionByPosition(x, y);
+                    if (region != null)
+                    {
+                        return region;
+                    }
                 }
             }
 
@@ -224,6 +235,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             return m_GridService.GetDefaultRegions(scopeID);
         }
 
+        public List<GridRegion> GetDefaultHypergridRegions(UUID scopeID)
+        {
+            return m_GridService.GetDefaultHypergridRegions(scopeID);
+        }
+
         public List<GridRegion> GetFallbackRegions(UUID scopeID, int x, int y)
         {
             return m_GridService.GetFallbackRegions(scopeID, x, y);
@@ -245,12 +261,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
         {
             System.Text.StringBuilder caps = new System.Text.StringBuilder();
 
-            foreach (KeyValuePair<UUID, RegionCache> kvp in m_LocalCache)
+            lock (m_LocalCache)
             {
-                caps.AppendFormat("*** Neighbours of {0} ({1}) ***\n", kvp.Value.RegionName, kvp.Key);
-                List<GridRegion> regions = kvp.Value.GetNeighbours();
-                foreach (GridRegion r in regions)
-                    caps.AppendFormat("    {0} @ {1}-{2}\n", r.RegionName, r.RegionLocX / Constants.RegionSize, r.RegionLocY / Constants.RegionSize);
+                foreach (KeyValuePair<UUID, RegionCache> kvp in m_LocalCache)
+                {
+                    caps.AppendFormat("*** Neighbours of {0} ({1}) ***\n", kvp.Value.RegionName, kvp.Key);
+                    List<GridRegion> regions = kvp.Value.GetNeighbours();
+                    foreach (GridRegion r in regions)
+                        caps.AppendFormat("    {0} @ {1}-{2}\n", r.RegionName, r.RegionLocX / Constants.RegionSize, r.RegionLocY / Constants.RegionSize);
+                }
             }
 
             MainConsole.Instance.Output(caps.ToString());
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
index b2646ba..6a57d1f 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
@@ -277,6 +277,26 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             return rinfo;
         }
 
+        public List<GridRegion> GetDefaultHypergridRegions(UUID scopeID)
+        {
+            List<GridRegion> rinfo = m_LocalGridService.GetDefaultHypergridRegions(scopeID);
+            //m_log.DebugFormat("[REMOTE GRID CONNECTOR]: Local GetDefaultHypergridRegions {0} found {1} regions", name, rinfo.Count);
+            List<GridRegion> grinfo = m_RemoteGridService.GetDefaultHypergridRegions(scopeID);
+
+            if (grinfo != null)
+            {
+                //m_log.DebugFormat("[REMOTE GRID CONNECTOR]: Remote GetDefaultHypergridRegions {0} found {1} regions", name, grinfo.Count);
+                foreach (GridRegion r in grinfo)
+                {
+                    m_RegionInfoCache.Cache(r);
+                    if (rinfo.Find(delegate(GridRegion gr) { return gr.RegionID == r.RegionID; }) == null)
+                        rinfo.Add(r);
+                }
+            }
+
+            return rinfo;
+        }
+
         public List<GridRegion> GetFallbackRegions(UUID scopeID, int x, int y)
         {
             List<GridRegion> rinfo = m_LocalGridService.GetFallbackRegions(scopeID, x, y);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
index 221f815..e05d186 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/GridUser/ActivityDetector.cs
@@ -81,6 +81,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.GridUser
 
         public void OnConnectionClose(IClientAPI client)
         {
+            if (client == null)
+                return;
+            if (client.SceneAgent == null)
+                return;
+
             if (client.SceneAgent.IsChildAgent)
                 return;
 
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
index e474ef6..58576d1 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
@@ -233,6 +233,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
                     if (sp != null)
                     {
                         AgentCircuitData aCircuit = scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
+                        if (aCircuit == null)
+                            return;
+                        if (aCircuit.ServiceURLs == null)
+                            return;
+
                         if (aCircuit.ServiceURLs.ContainsKey("InventoryServerURI"))
                         {
                             inventoryURL = aCircuit.ServiceURLs["InventoryServerURI"].ToString();
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
index 1e434b9..2fc8ee3 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
@@ -1,11 +1,41 @@
-using System;
-using System.Collections.Generic;
+/*
+ * 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.Threading;
 using OpenSim.Framework;
 using OpenMetaverse;
 
 namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 {
+    /// <summary>
+    /// Cache root and system inventory folders to reduce number of potentially remote inventory calls and associated holdups.
+    /// </summary>
     public class InventoryCache
     {
         private const double CACHE_EXPIRATION_SECONDS = 3600.0; // 1 hour
@@ -16,8 +46,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
         public void Cache(UUID userID, InventoryFolderBase root)
         {
-            lock (m_RootFolders)
-                m_RootFolders.AddOrUpdate(userID, root, CACHE_EXPIRATION_SECONDS);
+            m_RootFolders.AddOrUpdate(userID, root, CACHE_EXPIRATION_SECONDS);
         }
 
         public InventoryFolderBase GetRootFolder(UUID userID)
@@ -31,14 +60,18 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
         public void Cache(UUID userID, AssetType type, InventoryFolderBase folder)
         {
-            lock (m_FolderTypes)
+            Dictionary<AssetType, InventoryFolderBase> ff = null;
+            if (!m_FolderTypes.TryGetValue(userID, out ff))
+            {
+                ff = new Dictionary<AssetType, InventoryFolderBase>();
+                m_FolderTypes.Add(userID, ff, CACHE_EXPIRATION_SECONDS);
+            }
+
+            // We need to lock here since two threads could potentially retrieve the same dictionary
+            // and try to add a folder for that type simultaneously.  Dictionary<>.Add() is not described as thread-safe in the SDK
+            // even if the folders are identical.
+            lock (ff)
             {
-                Dictionary<AssetType, InventoryFolderBase> ff = null;
-                if (!m_FolderTypes.TryGetValue(userID, out ff))
-                {
-                    ff = new Dictionary<AssetType, InventoryFolderBase>();
-                    m_FolderTypes.Add(userID, ff, CACHE_EXPIRATION_SECONDS);
-                }
                 if (!ff.ContainsKey(type))
                     ff.Add(type, folder);
             }
@@ -50,8 +83,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
             if (m_FolderTypes.TryGetValue(userID, out ff))
             {
                 InventoryFolderBase f = null;
-                if (ff.TryGetValue(type, out f))
-                    return f;
+
+                lock (ff)
+                {
+                    if (ff.TryGetValue(type, out f))
+                        return f;
+                }
             }
 
             return null;
@@ -59,8 +96,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
         public void Cache(UUID userID, InventoryCollection inv)
         {
-            lock (m_Inventories)
-                m_Inventories.AddOrUpdate(userID, inv, 120);
+            m_Inventories.AddOrUpdate(userID, inv, 120);
         }
 
         public InventoryCollection GetUserInventory(UUID userID)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
index ec5751d..99913a9 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
@@ -196,7 +196,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
                 Util.FireAndForget(delegate
                 {
                     foreach (InventoryItemBase item in items)
-                        UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData);
+                        if (!string.IsNullOrEmpty(item.CreatorData))
+                            UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData);
                 });
             }
 
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
index 2d3ba82..7f78076 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
@@ -195,18 +195,20 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
         {
             InventoryCollection invCol = m_RemoteConnector.GetFolderContent(userID, folderID);
 
-            if (invCol != null && UserManager != null)
-            {
-                // Protect ourselves against the caller subsequently modifying the items list
-                List<InventoryItemBase> items = new List<InventoryItemBase>(invCol.Items);
-
-                if (items != null && items.Count > 0)
-                    Util.FireAndForget(delegate
-                    {
-                        foreach (InventoryItemBase item in items)
-                            UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData);
-                    });
-            }
+            // Commenting this for now, because it's causing more grief than good
+            //if (invCol != null && UserManager != null)
+            //{
+            //    // Protect ourselves against the caller subsequently modifying the items list
+            //    List<InventoryItemBase> items = new List<InventoryItemBase>(invCol.Items);
+
+            //    if (items != null && items.Count > 0)
+            //        //Util.FireAndForget(delegate
+            //        //{
+            //            foreach (InventoryItemBase item in items)
+            //                if (!string.IsNullOrEmpty(item.CreatorData))
+            //                    UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData);
+            //        //});
+            //}
 
             return invCol;
         }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
index 172bea1..516ad40 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
 
         public void OnConnectionClose(IClientAPI client)
         {
-            if (!client.SceneAgent.IsChildAgent)
+            if (client != null && client.SceneAgent != null && !client.SceneAgent.IsChildAgent)
             {
 //                m_log.DebugFormat("[PRESENCE DETECTOR]: Detected client logout {0} in {1}", client.AgentId, client.Scene.RegionInfo.RegionName);
                 m_PresenceService.LogoutAgent(client.SessionId);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index 8b8bb37..a9aa73c 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -46,9 +46,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         /// <summary>
-        /// Version of this service
+        /// Version of this service.
         /// </summary>
-        private const string m_Version = "SIMULATION/0.1";
+        /// <remarks>
+        /// Currently valid versions are "SIMULATION/0.1" and "SIMULATION/0.2"
+        /// </remarks>
+        public string ServiceVersion { get; set; }
 
         /// <summary>
         /// Map region ID to scene.
@@ -62,28 +65,39 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
 
         #region Region Module interface
 
-        public void Initialise(IConfigSource config)
+        public void Initialise(IConfigSource configSource)
         {
-            IConfig moduleConfig = config.Configs["Modules"];
+            IConfig moduleConfig = configSource.Configs["Modules"];
             if (moduleConfig != null)
             {
                 string name = moduleConfig.GetString("SimulationServices", "");
                 if (name == Name)
                 {
-                    //IConfig userConfig = config.Configs["SimulationService"];
-                    //if (userConfig == null)
-                    //{
-                    //    m_log.Error("[AVATAR CONNECTOR]: SimulationService missing from OpenSim.ini");
-                    //    return;
-                    //}
+                    InitialiseService(configSource);
 
                     m_ModuleEnabled = true;
 
-                    m_log.Info("[SIMULATION CONNECTOR]: Local simulation enabled");
+                    m_log.Info("[LOCAL SIMULATION CONNECTOR]: Local simulation enabled.");
                 }
             }
         }
 
+        public void InitialiseService(IConfigSource configSource)
+        {
+            ServiceVersion = "SIMULATION/0.2";
+            IConfig config = configSource.Configs["SimulationService"];
+            if (config != null)
+            {
+                ServiceVersion = config.GetString("ConnectorProtocolVersion", ServiceVersion);
+
+                if (ServiceVersion != "SIMULATION/0.1" && ServiceVersion != "SIMULATION/0.2")
+                    throw new Exception(string.Format("Invalid ConnectorProtocolVersion {0}", ServiceVersion));
+
+                m_log.InfoFormat(
+                    "[LOCAL SIMULATION CONNECTOR]: Initialzied with connector protocol version {0}", ServiceVersion);
+            }
+        }
+
         public void PostInitialise()
         {
         }
@@ -250,30 +264,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             return true;
         }
 
-        public bool RetrieveAgent(GridRegion destination, UUID id, out IAgentData agent)
-        {
-            agent = null;
-            
-            if (destination == null)
-                return false;
-
-            if (m_scenes.ContainsKey(destination.RegionID))
-            {
-//                    m_log.DebugFormat(
-//                        "[LOCAL SIMULATION CONNECTOR]: Found region {0} {1} to send AgentUpdate",
-//                        s.RegionInfo.RegionName, destination.RegionHandle);
-
-                return m_scenes[destination.RegionID].IncomingRetrieveRootAgent(id, out agent);
-            }
-
-            //m_log.Debug("[LOCAL COMMS]: region not found for ChildAgentUpdate");
-            return false;
-        }
-
         public bool QueryAccess(GridRegion destination, UUID id, Vector3 position, out string version, out string reason)
         {
             reason = "Communications failure";
-            version = m_Version;
+            version = ServiceVersion;
             if (destination == null)
                 return false;
 
@@ -306,12 +300,7 @@ 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)
+        public bool CloseAgent(GridRegion destination, UUID id, string auth_token)
         {
             if (destination == null)
                 return false;
@@ -322,7 +311,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
 //                        "[LOCAL SIMULATION CONNECTOR]: Found region {0} {1} to send AgentUpdate",
 //                        s.RegionInfo.RegionName, destination.RegionHandle);
 
-                Util.FireAndForget(delegate { m_scenes[destination.RegionID].IncomingCloseAgent(id, false); });
+                m_scenes[destination.RegionID].IncomingCloseAgent(id, false, auth_token);
                 return true;
             }
             //m_log.Debug("[LOCAL COMMS]: region not found in SendCloseAgent");
@@ -383,4 +372,4 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
 
         #endregion
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
index c8698ca..8bd1d10 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
@@ -50,9 +50,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RemoteSimulationConnectorModule")]
     public class RemoteSimulationConnectorModule : ISharedRegionModule, ISimulationService
     {
-        private bool initialized = false;
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        private bool initialized = false;
         protected bool m_enabled = false;
         protected Scene m_aScene;
         // RemoteSimulationConnector does not care about local regions; it delegates that to the Local module
@@ -64,27 +64,23 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
 
         #region Region Module interface
 
-        public virtual void Initialise(IConfigSource config)
+        public virtual void Initialise(IConfigSource configSource)
         {
-
-            IConfig moduleConfig = config.Configs["Modules"];
+            IConfig moduleConfig = configSource.Configs["Modules"];
             if (moduleConfig != null)
             {
                 string name = moduleConfig.GetString("SimulationServices", "");
                 if (name == Name)
                 {
-                    //IConfig userConfig = config.Configs["SimulationService"];
-                    //if (userConfig == null)
-                    //{
-                    //    m_log.Error("[AVATAR CONNECTOR]: SimulationService missing from OpenSim.ini");
-                    //    return;
-                    //}
+                    m_localBackend = new LocalSimulationConnectorModule();
+
+                    m_localBackend.InitialiseService(configSource);
 
                     m_remoteConnector = new SimulationServiceConnector();
 
                     m_enabled = true;
 
-                    m_log.Info("[SIMULATION CONNECTOR]: Remote simulation enabled");
+                    m_log.Info("[REMOTE SIMULATION CONNECTOR]: Remote simulation enabled.");
                 }
             }
         }
@@ -142,8 +138,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
         }
 
         protected virtual void InitOnce(Scene scene)
-        {
-            m_localBackend = new LocalSimulationConnectorModule();
+        {            
             m_aScene = scene;
             //m_regionClient = new RegionToRegionClient(m_aScene, m_hyperlinkService);
             m_thisIP = Util.GetHostFromDNS(scene.RegionInfo.ExternalHostName);
@@ -194,7 +189,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
                 return false;
 
             // Try local first
-            if (m_localBackend.IsLocalRegion(destination.RegionHandle))
+            if (m_localBackend.IsLocalRegion(destination.RegionID))
                 return m_localBackend.UpdateAgent(destination, cAgentData);
 
             return m_remoteConnector.UpdateAgent(destination, cAgentData);
@@ -206,30 +201,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
                 return false;
 
             // Try local first
-            if (m_localBackend.IsLocalRegion(destination.RegionHandle))
+            if (m_localBackend.IsLocalRegion(destination.RegionID))
                 return m_localBackend.UpdateAgent(destination, cAgentData);
 
             return m_remoteConnector.UpdateAgent(destination, cAgentData);
         }
 
-        public bool RetrieveAgent(GridRegion destination, UUID id, out IAgentData agent)
-        {
-            agent = null;
-
-            if (destination == null)
-                return false;
-
-            // Try local first
-            if (m_localBackend.RetrieveAgent(destination, id, out agent))
-                return true;
-
-            // else do the remote thing
-            if (!m_localBackend.IsLocalRegion(destination.RegionHandle))
-                return m_remoteConnector.RetrieveAgent(destination, id, out agent);
-
-            return false;
-        }
-
         public bool QueryAccess(GridRegion destination, UUID id, Vector3 position, out string version, out string reason)
         {
             reason = "Communications failure";
@@ -262,34 +239,18 @@ 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)
+        public bool CloseAgent(GridRegion destination, UUID id, string auth_token)
         {
             if (destination == null)
                 return false;
 
             // Try local first
-            if (m_localBackend.CloseAgent(destination, id))
+            if (m_localBackend.CloseAgent(destination, id, auth_token))
                 return true;
 
             // else do the remote thing
-            if (!m_localBackend.IsLocalRegion(destination.RegionHandle))
-                return m_remoteConnector.CloseAgent(destination, id);
+            if (!m_localBackend.IsLocalRegion(destination.RegionID))
+                return m_remoteConnector.CloseAgent(destination, id, auth_token);
             
             return false;
         }
@@ -311,7 +272,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             }
 
             // else do the remote thing
-            if (!m_localBackend.IsLocalRegion(destination.RegionHandle))
+            if (!m_localBackend.IsLocalRegion(destination.RegionID))
                 return m_remoteConnector.CreateObject(destination, newPosition, sog, isLocalCall);
 
             return false;
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs
index 4d49794..173b603 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementCommands.cs
@@ -76,6 +76,13 @@ namespace OpenSim.Region.CoreModules.World.Estate
                                " that coordinate. Corner # SW = 0, NW = 1, SE = 2, NE = 3, all corners = -1.",
                                consoleSetTerrainHeights);
 
+            m_module.Scene.AddCommand("Regions", m_module, "set water height",
+                               "set water height <height> [<x>] [<y>]",
+                               "Sets the water height in meters.  If <x> and <y> are specified, it will only set it on regions with a matching coordinate. " + 
+                               "Specify -1 in <x> or <y> to wildcard that coordinate.",
+                               consoleSetWaterHeight);
+
+
             m_module.Scene.AddCommand(
                 "Estates", m_module, "estate show", "estate show", "Shows all estates on the simulator.", ShowEstatesCommand);
         }       
@@ -121,7 +128,29 @@ namespace OpenSim.Region.CoreModules.World.Estate
                 }
             }
         }
- 
+        protected void consoleSetWaterHeight(string module, string[] args)
+        {
+            string heightstring = args[3];
+           
+            int x = (args.Length > 4 ? int.Parse(args[4]) : -1);
+            int y = (args.Length > 5 ? int.Parse(args[5]) : -1);
+
+            if (x == -1 || m_module.Scene.RegionInfo.RegionLocX == x)
+            {
+                if (y == -1 || m_module.Scene.RegionInfo.RegionLocY == y)
+                {
+                    double selectedheight = double.Parse(heightstring);
+
+                    m_log.Debug("[ESTATEMODULE]: Setting water height in " + m_module.Scene.RegionInfo.RegionName + " to " +
+                                string.Format(" {0}", selectedheight));
+                    m_module.Scene.RegionInfo.RegionSettings.WaterHeight = selectedheight;
+                    
+                    m_module.Scene.RegionInfo.RegionSettings.Save();
+                    m_module.TriggerRegionInfoChange();
+                    m_module.sendRegionHandshakeToAll();
+                }
+            }
+        }     
         protected void consoleSetTerrainHeights(string module, string[] args)
         {
             string num = args[3];
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index a5f5749..1808fdd 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -572,7 +572,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                                 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();
+                                    Scene.IncomingCloseAgent(s.UUID, false);
                                 }
                             }
                         }
@@ -807,7 +807,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                     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();
+                        Scene.IncomingCloseAgent(s.UUID, false);
                     }
                 }
             }
@@ -830,7 +830,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
                         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();
+                            Scene.IncomingCloseAgent(p.UUID, false);
                         }
                     }
                 }
diff --git a/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs b/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs
new file mode 100644
index 0000000..73e706c
--- /dev/null
+++ b/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs
@@ -0,0 +1,218 @@
+/*
+ * 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 OpenSim.Services.Interfaces;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+using OpenSim.Server.Base;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Scenes;
+
+using OpenMetaverse;
+using log4net;
+
+namespace OpenSim.Region.CoreModules.World.Estate
+{
+    public class EstateConnector
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        protected XEstateModule m_EstateModule;
+
+        public EstateConnector(XEstateModule module)
+        {
+            m_EstateModule = module;
+        }
+
+        public void SendTeleportHomeOneUser(uint EstateID, UUID PreyID)
+        {
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+            sendData["METHOD"] = "teleport_home_one_user";
+
+            sendData["EstateID"] = EstateID.ToString();
+            sendData["PreyID"] = PreyID.ToString();
+
+            SendToEstate(EstateID, sendData);
+        }
+
+        public void SendTeleportHomeAllUsers(uint EstateID)
+        {
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+            sendData["METHOD"] = "teleport_home_all_users";
+
+            sendData["EstateID"] = EstateID.ToString();
+
+            SendToEstate(EstateID, sendData);
+        }
+
+        public bool SendUpdateCovenant(uint EstateID, UUID CovenantID)
+        {
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+            sendData["METHOD"] = "update_covenant";
+
+            sendData["CovenantID"] = CovenantID.ToString();
+            sendData["EstateID"] = EstateID.ToString();
+
+            // Handle local regions locally
+            //
+            foreach (Scene s in m_EstateModule.Scenes)
+            {
+                if (s.RegionInfo.EstateSettings.EstateID == EstateID)
+                    s.RegionInfo.RegionSettings.Covenant = CovenantID;
+//                    s.ReloadEstateData();
+            }
+
+            SendToEstate(EstateID, sendData);
+
+            return true;
+        }
+
+        public bool SendUpdateEstate(uint EstateID)
+        {
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+            sendData["METHOD"] = "update_estate";
+
+            sendData["EstateID"] = EstateID.ToString();
+
+            // Handle local regions locally
+            //
+            foreach (Scene s in m_EstateModule.Scenes)
+            {
+                if (s.RegionInfo.EstateSettings.EstateID == EstateID)
+                    s.ReloadEstateData();
+            }
+
+            SendToEstate(EstateID, sendData);
+
+            return true;
+        }
+
+        public void SendEstateMessage(uint EstateID, UUID FromID, string FromName, string Message)
+        {
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+            sendData["METHOD"] = "estate_message";
+
+            sendData["EstateID"] = EstateID.ToString();
+            sendData["FromID"] = FromID.ToString();
+            sendData["FromName"] = FromName;
+            sendData["Message"] = Message;
+
+            SendToEstate(EstateID, sendData);
+        }
+
+        private void SendToEstate(uint EstateID, Dictionary<string, object> sendData)
+        {
+            List<UUID> regions = m_EstateModule.Scenes[0].GetEstateRegions((int)EstateID);
+
+            UUID ScopeID = UUID.Zero;
+
+            // Handle local regions locally
+            //
+            lock (m_EstateModule.Scenes)
+            {
+                foreach (Scene s in m_EstateModule.Scenes)
+                {
+                    if (regions.Contains(s.RegionInfo.RegionID))
+                    {
+                        // All regions in one estate are in the same scope.
+                        // Use that scope.
+                        //
+                        ScopeID = s.RegionInfo.ScopeID;
+                        regions.Remove(s.RegionInfo.RegionID);
+                    }
+                }
+            }
+
+            // Our own region should always be in the above list.
+            // In a standalone this would not be true. But then,
+            // Scope ID is not relevat there. Use first scope.
+            //
+            if (ScopeID == UUID.Zero)
+                ScopeID = m_EstateModule.Scenes[0].RegionInfo.ScopeID;
+
+            // Don't send to the same instance twice
+            //
+            List<string> done = new List<string>();
+
+            // Send to remote regions
+            //
+            foreach (UUID regionID in regions)
+            {
+                GridRegion region = m_EstateModule.Scenes[0].GridService.GetRegionByUUID(ScopeID, regionID);
+                if (region != null)
+                {
+                    string url = "http://" + region.ExternalHostName + ":" + region.HttpPort;
+                    if (done.Contains(url))
+                        continue;
+
+                    Call(region, sendData);
+                    done.Add(url);
+                }
+            }
+        }
+
+        private bool Call(GridRegion region, Dictionary<string, object> sendData)
+        {
+            string reqString = ServerUtils.BuildQueryString(sendData);
+            // m_log.DebugFormat("[XESTATE CONNECTOR]: queryString = {0}", reqString);
+            try
+            {
+                string url = "http://" + region.ExternalHostName + ":" + region.HttpPort;
+                string reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                        url + "/estate",
+                        reqString);
+                if (reply != string.Empty)
+                {
+                    Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+
+                    if (replyData.ContainsKey("RESULT"))
+                    {
+                        if (replyData["RESULT"].ToString().ToLower() == "true")
+                            return true;
+                        else
+                            return false;
+                    }
+                    else
+                        m_log.DebugFormat("[XESTATE CONNECTOR]: reply data does not contain result field");
+
+                }
+                else
+                    m_log.DebugFormat("[XESTATE CONNECTOR]: received empty reply");
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[XESTATE CONNECTOR]: Exception when contacting remote sim: {0}", e.Message);
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/OpenSim/Region/CoreModules/World/Estate/XEstateModule.cs b/OpenSim/Region/CoreModules/World/Estate/XEstateModule.cs
new file mode 100644
index 0000000..f54ab2c
--- /dev/null
+++ b/OpenSim/Region/CoreModules/World/Estate/XEstateModule.cs
@@ -0,0 +1,256 @@
+/*
+ * 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.Generic;
+using System.Reflection;
+using log4net;
+using Nini.Config;
+using Nwc.XmlRpc;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using OpenSim.Server.Base;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using Mono.Addins;
+
+namespace OpenSim.Region.CoreModules.World.Estate
+{
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "XEstate")]
+    public class XEstateModule : ISharedRegionModule
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        protected List<Scene> m_Scenes = new List<Scene>();
+        protected bool m_InInfoUpdate = false;
+
+        public bool InInfoUpdate
+        {
+            get { return m_InInfoUpdate; }
+            set { m_InInfoUpdate = value; }
+        }
+
+        public List<Scene> Scenes
+        {
+            get { return m_Scenes; }
+        }
+
+        protected EstateConnector m_EstateConnector;
+
+        public void Initialise(IConfigSource config)
+        {
+            int port = 0;
+
+            IConfig estateConfig = config.Configs["Estate"];
+            if (estateConfig != null)
+            {
+                port = estateConfig.GetInt("Port", 0);
+            }
+
+            m_EstateConnector = new EstateConnector(this);
+
+            // Instantiate the request handler
+            IHttpServer server = MainServer.GetHttpServer((uint)port);
+            server.AddStreamHandler(new EstateRequestHandler(this));
+        }
+
+        public void PostInitialise()
+        {
+        }
+
+        public void Close()
+        {
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            lock (m_Scenes)
+                m_Scenes.Add(scene);
+
+            scene.EventManager.OnNewClient += OnNewClient;
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+            IEstateModule em = scene.RequestModuleInterface<IEstateModule>();
+
+            em.OnRegionInfoChange += OnRegionInfoChange;
+            em.OnEstateInfoChange += OnEstateInfoChange;
+            em.OnEstateMessage += OnEstateMessage;
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            scene.EventManager.OnNewClient -= OnNewClient;
+
+            lock (m_Scenes)
+                m_Scenes.Remove(scene);
+        }
+
+        public string Name
+        {
+            get { return "EstateModule"; }
+        }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        private Scene FindScene(UUID RegionID)
+        {
+            foreach (Scene s in Scenes)
+            {
+                if (s.RegionInfo.RegionID == RegionID)
+                    return s;
+            }
+
+            return null;
+        }
+
+        private void OnRegionInfoChange(UUID RegionID)
+        {
+            Scene s = FindScene(RegionID);
+            if (s == null)
+                return;
+
+            if (!m_InInfoUpdate)
+                m_EstateConnector.SendUpdateCovenant(s.RegionInfo.EstateSettings.EstateID, s.RegionInfo.RegionSettings.Covenant);
+        }
+
+        private void OnEstateInfoChange(UUID RegionID)
+        {
+            Scene s = FindScene(RegionID);
+            if (s == null)
+                return;
+
+            if (!m_InInfoUpdate)
+                m_EstateConnector.SendUpdateEstate(s.RegionInfo.EstateSettings.EstateID);
+        }
+
+        private void OnEstateMessage(UUID RegionID, UUID FromID, string FromName, string Message)
+        {
+            Scene senderScenes = FindScene(RegionID);
+            if (senderScenes == null)
+                return;
+
+            uint estateID = senderScenes.RegionInfo.EstateSettings.EstateID;
+
+            foreach (Scene s in Scenes)
+            {
+                if (s.RegionInfo.EstateSettings.EstateID == estateID)
+                {
+                    IDialogModule dm = s.RequestModuleInterface<IDialogModule>();
+
+                    if (dm != null)
+                    {
+                        dm.SendNotificationToUsersInRegion(FromID, FromName,
+                                Message);
+                    }
+                }
+            }
+            if (!m_InInfoUpdate)
+                m_EstateConnector.SendEstateMessage(estateID, FromID, FromName, Message);
+        }
+
+        private void OnNewClient(IClientAPI client)
+        {
+            client.OnEstateTeleportOneUserHomeRequest += OnEstateTeleportOneUserHomeRequest;
+            client.OnEstateTeleportAllUsersHomeRequest += OnEstateTeleportAllUsersHomeRequest;
+
+        }
+
+        private void OnEstateTeleportOneUserHomeRequest(IClientAPI client, UUID invoice, UUID senderID, UUID prey)
+        {
+            if (prey == UUID.Zero)
+                return;
+
+            if (!(client.Scene is Scene))
+                return;
+
+            Scene scene = (Scene)client.Scene;
+
+            uint estateID = scene.RegionInfo.EstateSettings.EstateID;
+
+            if (!scene.Permissions.CanIssueEstateCommand(client.AgentId, false))
+                return;
+
+            foreach (Scene s in Scenes)
+            {
+                if (s == scene)
+                    continue; // Already handles by estate module
+                if (s.RegionInfo.EstateSettings.EstateID != estateID)
+                    continue;
+
+                ScenePresence p = scene.GetScenePresence(prey);
+                if (p != null && !p.IsChildAgent)
+                {
+                    p.ControllingClient.SendTeleportStart(16);
+                    scene.TeleportClientHome(prey, p.ControllingClient);
+                }
+            }
+
+            m_EstateConnector.SendTeleportHomeOneUser(estateID, prey);
+        }
+
+        private void OnEstateTeleportAllUsersHomeRequest(IClientAPI client, UUID invoice, UUID senderID)
+        {
+            if (!(client.Scene is Scene))
+                return;
+
+            Scene scene = (Scene)client.Scene;
+
+            uint estateID = scene.RegionInfo.EstateSettings.EstateID;
+
+            if (!scene.Permissions.CanIssueEstateCommand(client.AgentId, false))
+                return;
+
+            foreach (Scene s in Scenes)
+            {
+                if (s == scene)
+                    continue; // Already handles by estate module
+                if (s.RegionInfo.EstateSettings.EstateID != estateID)
+                    continue;
+
+                scene.ForEachScenePresence(delegate(ScenePresence p) {
+                    if (p != null && !p.IsChildAgent)
+                    {
+                        p.ControllingClient.SendTeleportStart(16);
+                        scene.TeleportClientHome(p.ControllingClient.AgentId, p.ControllingClient);
+                    }
+                });
+            }
+
+            m_EstateConnector.SendTeleportHomeAllUsers(estateID);
+        }
+    }
+}
diff --git a/OpenSim/Region/CoreModules/World/Estate/XEstateRequestHandler.cs b/OpenSim/Region/CoreModules/World/Estate/XEstateRequestHandler.cs
new file mode 100644
index 0000000..2366767
--- /dev/null
+++ b/OpenSim/Region/CoreModules/World/Estate/XEstateRequestHandler.cs
@@ -0,0 +1,298 @@
+/*
+ * 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.Reflection;
+using System.Xml;
+
+using OpenSim.Framework;
+using OpenSim.Server.Base;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Interfaces;
+
+using OpenMetaverse;
+using log4net;
+
+namespace OpenSim.Region.CoreModules.World.Estate
+{
+    public class EstateRequestHandler : BaseStreamHandler
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        protected XEstateModule m_EstateModule;
+        protected Object m_RequestLock = new Object();
+
+        public EstateRequestHandler(XEstateModule fmodule)
+                : base("POST", "/estate")
+        {
+            m_EstateModule = fmodule;
+        }
+
+        protected override byte[] ProcessRequest(string path, Stream requestData,
+                IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        {
+            StreamReader sr = new StreamReader(requestData);
+            string body = sr.ReadToEnd();
+            sr.Close();
+            body = body.Trim();
+
+            m_log.DebugFormat("[XESTATE HANDLER]: query String: {0}", body);
+
+            try
+            {
+                lock (m_RequestLock)
+                {
+                    Dictionary<string, object> request =
+                            ServerUtils.ParseQueryString(body);
+
+                    if (!request.ContainsKey("METHOD"))
+                        return FailureResult();
+
+                    string method = request["METHOD"].ToString();
+                    request.Remove("METHOD");
+
+                    try
+                    {
+                        m_EstateModule.InInfoUpdate = false;
+
+                        switch (method)
+                        {
+                            case "update_covenant":
+                                return UpdateCovenant(request);
+                            case "update_estate":
+                                return UpdateEstate(request);
+                            case "estate_message":
+                                return EstateMessage(request);
+                            case "teleport_home_one_user":
+                                return TeleportHomeOneUser(request);
+                            case "teleport_home_all_users":
+                                return TeleportHomeAllUsers(request);
+                        }
+                    }
+                    finally
+                    {
+                        m_EstateModule.InInfoUpdate = false;
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.Debug("[XESTATE]: Exception {0}" + e.ToString());
+            }
+
+            return FailureResult();
+        }
+
+        byte[] TeleportHomeAllUsers(Dictionary<string, object> request)
+        {
+            UUID PreyID = UUID.Zero;
+            int EstateID = 0;
+
+            if (!request.ContainsKey("EstateID"))
+                return FailureResult();
+
+            if (!Int32.TryParse(request["EstateID"].ToString(), out EstateID))
+                return FailureResult();
+
+            foreach (Scene s in m_EstateModule.Scenes)
+            {
+                if (s.RegionInfo.EstateSettings.EstateID == EstateID)
+                {
+                    s.ForEachScenePresence(delegate(ScenePresence p) {
+                        if (p != null && !p.IsChildAgent)
+                        {
+                            p.ControllingClient.SendTeleportStart(16);
+                            s.TeleportClientHome(p.ControllingClient.AgentId, p.ControllingClient);
+                        }
+                    });
+                }
+            }
+
+            return SuccessResult();
+        }
+
+        byte[] TeleportHomeOneUser(Dictionary<string, object> request)
+        {
+            UUID PreyID = UUID.Zero;
+            int EstateID = 0;
+
+            if (!request.ContainsKey("PreyID") ||
+                !request.ContainsKey("EstateID"))
+            {
+                return FailureResult();
+            }
+
+            if (!UUID.TryParse(request["PreyID"].ToString(), out PreyID))
+                return FailureResult();
+
+            if (!Int32.TryParse(request["EstateID"].ToString(), out EstateID))
+                return FailureResult();
+
+            foreach (Scene s in m_EstateModule.Scenes)
+            {
+                if (s.RegionInfo.EstateSettings.EstateID == EstateID)
+                {
+                    ScenePresence p = s.GetScenePresence(PreyID);
+                    if (p != null && !p.IsChildAgent)
+                    {
+                        p.ControllingClient.SendTeleportStart(16);
+                        s.TeleportClientHome(PreyID, p.ControllingClient);
+                    }
+                }
+            }
+
+            return SuccessResult();
+        }
+
+        byte[] EstateMessage(Dictionary<string, object> request)
+        {
+            UUID FromID = UUID.Zero;
+            string FromName = String.Empty;
+            string Message = String.Empty;
+            int EstateID = 0;
+
+            if (!request.ContainsKey("FromID") ||
+                !request.ContainsKey("FromName") ||
+                !request.ContainsKey("Message") ||
+                !request.ContainsKey("EstateID"))
+            {
+                return FailureResult();
+            }
+
+            if (!UUID.TryParse(request["FromID"].ToString(), out FromID))
+                return FailureResult();
+
+            if (!Int32.TryParse(request["EstateID"].ToString(), out EstateID))
+                return FailureResult();
+
+            FromName = request["FromName"].ToString();
+            Message = request["Message"].ToString();
+
+            foreach (Scene s in m_EstateModule.Scenes)
+            {
+                if (s.RegionInfo.EstateSettings.EstateID == EstateID)
+                {
+                    IDialogModule dm = s.RequestModuleInterface<IDialogModule>();
+
+                    if (dm != null)
+                    {
+                        dm.SendNotificationToUsersInRegion(FromID, FromName,
+                                Message);
+                    }
+                }
+            }
+
+            return SuccessResult();
+        }
+
+        byte[] UpdateCovenant(Dictionary<string, object> request)
+        {
+            UUID CovenantID = UUID.Zero;
+            int EstateID = 0;
+
+            if (!request.ContainsKey("CovenantID") || !request.ContainsKey("EstateID"))
+                return FailureResult();
+
+            if (!UUID.TryParse(request["CovenantID"].ToString(), out CovenantID))
+                return FailureResult();
+
+            if (!Int32.TryParse(request["EstateID"].ToString(), out EstateID))
+                return FailureResult();
+
+            foreach (Scene s in m_EstateModule.Scenes)
+            {
+                if (s.RegionInfo.EstateSettings.EstateID == (uint)EstateID)
+                    s.RegionInfo.RegionSettings.Covenant = CovenantID;
+            }
+
+            return SuccessResult();
+        }
+
+        byte[] UpdateEstate(Dictionary<string, object> request)
+        {
+            int EstateID = 0;
+
+            if (!request.ContainsKey("EstateID"))
+                return FailureResult();
+            if (!Int32.TryParse(request["EstateID"].ToString(), out EstateID))
+                return FailureResult();
+
+            foreach (Scene s in m_EstateModule.Scenes)
+            {
+                if (s.RegionInfo.EstateSettings.EstateID == (uint)EstateID)
+                    s.ReloadEstateData();
+            }
+            return SuccessResult();
+        }
+
+        private byte[] FailureResult()
+        {
+            return BoolResult(false);
+        }
+
+        private byte[] SuccessResult()
+        {
+            return BoolResult(true);
+        }
+
+        private byte[] BoolResult(bool value)
+        {
+            XmlDocument doc = new XmlDocument();
+
+            XmlNode xmlnode = doc.CreateNode(XmlNodeType.XmlDeclaration,
+                    "", "");
+
+            doc.AppendChild(xmlnode);
+
+            XmlElement rootElement = doc.CreateElement("", "ServerResponse",
+                    "");
+
+            doc.AppendChild(rootElement);
+
+            XmlElement result = doc.CreateElement("", "RESULT", "");
+            result.AppendChild(doc.CreateTextNode(value.ToString()));
+
+            rootElement.AppendChild(result);
+
+            return DocToBytes(doc);
+        }
+
+        private byte[] DocToBytes(XmlDocument doc)
+        {
+            MemoryStream ms = new MemoryStream();
+            XmlTextWriter xw = new XmlTextWriter(ms, null);
+            xw.Formatting = Formatting.Indented;
+            doc.WriteTo(xw);
+            xw.Flush();
+
+            return ms.ToArray();
+        }
+    }
+}
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index c307998..dbc9296 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -74,6 +74,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         
         protected IUserManagement m_userManager;
         protected IPrimCountModule m_primCountModule;
+        protected IDialogModule m_Dialog;
 
         // Minimum for parcels to work is 64m even if we don't actually use them.
         #pragma warning disable 0429
@@ -161,6 +162,7 @@ namespace OpenSim.Region.CoreModules.World.Land
         {
              m_userManager = m_scene.RequestModuleInterface<IUserManagement>();         
              m_primCountModule = m_scene.RequestModuleInterface<IPrimCountModule>();
+             m_Dialog = m_scene.RequestModuleInterface<IDialogModule>();
         }
 
         public void RemoveRegion(Scene scene)
@@ -213,6 +215,7 @@ namespace OpenSim.Region.CoreModules.World.Land
             client.OnPreAgentUpdate += ClientOnPreAgentUpdate;
             client.OnParcelEjectUser += ClientOnParcelEjectUser;
             client.OnParcelFreezeUser += ClientOnParcelFreezeUser;
+            client.OnSetStartLocationRequest += ClientOnSetHome;
 
             EntityBase presenceEntity;
             if (m_scene.Entities.TryGetValue(client.AgentId, out presenceEntity) && presenceEntity is ScenePresence)
@@ -1896,7 +1899,53 @@ namespace OpenSim.Region.CoreModules.World.Land
                 land.LandData.ParcelAccessList.Add(entry);
             }
         }
-        
+
+        /// <summary>
+        /// Sets the Home Point.   The LoginService uses this to know where to put a user when they log-in
+        /// </summary>
+        /// <param name="remoteClient"></param>
+        /// <param name="regionHandle"></param>
+        /// <param name="position"></param>
+        /// <param name="lookAt"></param>
+        /// <param name="flags"></param>
+        public virtual void ClientOnSetHome(IClientAPI remoteClient, ulong regionHandle, Vector3 position, Vector3 lookAt, uint flags)
+        {
+            // Let's find the parcel in question
+            ILandObject land = landChannel.GetLandObject(position);
+            if (land == null || m_scene.GridUserService == null)
+            {
+                m_Dialog.SendAlertToUser(remoteClient, "Set Home request failed.");
+                return;
+            }
+
+            // Gather some data
+            ulong gpowers = remoteClient.GetGroupPowers(land.LandData.GroupID);
+            SceneObjectGroup telehub = null;
+            if (m_scene.RegionInfo.RegionSettings.TelehubObject != UUID.Zero)
+                // Does the telehub exist in the scene?
+                telehub = m_scene.GetSceneObjectGroup(m_scene.RegionInfo.RegionSettings.TelehubObject);
+
+            // Can the user set home here?
+            if (// (a) gods and land managers can set home
+                m_scene.Permissions.IsAdministrator(remoteClient.AgentId) || 
+                m_scene.Permissions.IsGod(remoteClient.AgentId) ||
+                // (b) land owners can set home
+                remoteClient.AgentId == land.LandData.OwnerID ||
+                // (c) members of the land-associated group in roles that can set home
+                ((gpowers & (ulong)GroupPowers.AllowSetHome) == (ulong)GroupPowers.AllowSetHome) ||
+                // (d) parcels with telehubs can be the home of anyone
+                (telehub != null && land.ContainsPoint((int)telehub.AbsolutePosition.X, (int)telehub.AbsolutePosition.Y)))
+            {
+                if (m_scene.GridUserService.SetHome(remoteClient.AgentId.ToString(), land.RegionUUID, position, lookAt))
+                    // FUBAR ALERT: this needs to be "Home position set." so the viewer saves a home-screenshot.
+                    m_Dialog.SendAlertToUser(remoteClient, "Home position set.");
+                else
+                    m_Dialog.SendAlertToUser(remoteClient, "Set Home request failed.");
+            }
+            else
+                m_Dialog.SendAlertToUser(remoteClient, "You are not allowed to set your home location in this parcel.");
+        }
+
         protected void InstallInterfaces()
         {
             Command clearCommand
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 07d00c0..ce4bd0f 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -82,14 +82,14 @@ namespace OpenSim.Region.CoreModules.World.Land
 
             set { m_landData = value; }
         }
-        
+
         public IPrimCounts PrimCounts { get; set; }
 
         public UUID RegionUUID
         {
             get { return m_scene.RegionInfo.RegionID; }
         }
-        
+
         public Vector3 StartPoint
         {
             get
@@ -102,11 +102,11 @@ namespace OpenSim.Region.CoreModules.World.Land
                             return new Vector3(x * 4, y * 4, 0);
                     }
                 }
-                
+
                 return new Vector3(-1, -1, -1);
             }
-        }        
-        
+        }
+
         public Vector3 EndPoint
         {
             get
@@ -117,15 +117,15 @@ namespace OpenSim.Region.CoreModules.World.Land
                     {
                         if (LandBitmap[x, y])
                         {
-                            return new Vector3(x * 4, y * 4, 0);
-                        }                        
+                            return new Vector3(x * 4 + 4, y * 4 + 4, 0);
+                        }
                     }
-                }   
-                
+                }
+
                 return new Vector3(-1, -1, -1);
             }
         }
-                
+
         #region Constructors
 
         public LandObject(UUID owner_id, bool is_group_owned, Scene scene)
@@ -249,13 +249,6 @@ namespace OpenSim.Region.CoreModules.World.Land
             if (estateModule != null)
                 regionFlags = estateModule.GetRegionFlags();
 
-            // In a perfect world, this would have worked.
-            //
-//            if ((landData.Flags & (uint)ParcelFlags.AllowLandmark) != 0)
-//                regionFlags |=  (uint)RegionFlags.AllowLandmark;
-//            if (landData.OwnerID == remote_client.AgentId)
-//                regionFlags |=  (uint)RegionFlags.AllowSetHome;
-
             int seq_id;
             if (snap_selection && (sequence_id == 0))
             {
diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
index e434b2e..0e79733 100644
--- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
@@ -546,7 +546,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
         {
             ConsoleDisplayList cdl = new ConsoleDisplayList();
             cdl.AddRow("Name", so.Name);
-            cdl.AddRow("Descrition", so.Description);
+            cdl.AddRow("Description", so.Description);
             cdl.AddRow("Local ID", so.LocalId);
             cdl.AddRow("UUID", so.UUID);
             cdl.AddRow("Location", string.Format("{0} @ {1}", so.AbsolutePosition, so.Scene.Name));
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 26e9131..50855fe 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -1453,6 +1453,8 @@ namespace OpenSim.Region.CoreModules.World.Permissions
 
             bool permission = false;
 
+//            m_log.DebugFormat("[PERMISSIONS MODULE]: Checking rez object at {0} in {1}", objectPosition, m_scene.Name);
+
             ILandObject land = m_scene.LandChannel.GetLandObject(objectPosition.X, objectPosition.Y);
             if (land == null) return false;
 
diff --git a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
index 9c441ed..0c74b49 100644
--- a/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
+++ b/OpenSim/Region/CoreModules/World/Region/RestartModule.cs
@@ -48,8 +48,8 @@ namespace OpenSim.Region.CoreModules.World.Region
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RestartModule")]
     public class RestartModule : INonSharedRegionModule, IRestartModule
     {
-//        private static readonly ILog m_log =
-//            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log =
+            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         protected Scene m_Scene;
         protected Timer m_CountdownTimer = null;
@@ -223,11 +223,25 @@ namespace OpenSim.Region.CoreModules.World.Region
 
         public void SetTimer(int intervalSeconds)
         {
-            m_CountdownTimer = new Timer();
-            m_CountdownTimer.AutoReset = false;
-            m_CountdownTimer.Interval = intervalSeconds * 1000;
-            m_CountdownTimer.Elapsed += OnTimer;
-            m_CountdownTimer.Start();
+            if (intervalSeconds > 0)
+            {
+                m_CountdownTimer = new Timer();
+                m_CountdownTimer.AutoReset = false;
+                m_CountdownTimer.Interval = intervalSeconds * 1000;
+                m_CountdownTimer.Elapsed += OnTimer;
+                m_CountdownTimer.Start();
+            }
+            else if (m_CountdownTimer != null)
+            {
+                m_CountdownTimer.Stop();
+                m_CountdownTimer = null;
+            }
+            else
+            {
+                m_log.WarnFormat(
+                    "[RESTART MODULE]: Tried to set restart timer to {0} in {1}, which is not a valid interval", 
+                    intervalSeconds, m_Scene.Name);
+            }
         }
 
         private void OnTimer(object source, ElapsedEventArgs e)
@@ -332,4 +346,4 @@ namespace OpenSim.Region.CoreModules.World.Region
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
index b4348c9..66059fb 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
@@ -144,7 +144,20 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
                     <Flags>None</Flags>
                     <CollisionSound><Guid>00000000-0000-0000-0000-000000000000</Guid></CollisionSound>
                     <CollisionSoundVolume>0</CollisionSoundVolume>
-                    <DynAttrs><llsd><map><key>MyStore</key><map><key>the answer</key><integer>42</integer></map></map></llsd></DynAttrs>
+                    <DynAttrs>
+                        <llsd>
+                            <map>
+                                <key>MyNamespace</key>
+                                <map>                                
+                                    <key>MyStore</key>
+                                    <map>   
+                                        <key>the answer</key>
+                                        <integer>42</integer>
+                                    </map>
+                                </map>
+                            </map>
+                        </llsd>
+                    </DynAttrs>
                 </SceneObjectPart>
             </RootPart>
             <OtherParts />
@@ -333,7 +346,20 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
                 <EveryoneMask>0</EveryoneMask>
                 <NextOwnerMask>2147483647</NextOwnerMask>
                 <Flags>None</Flags>
-                <DynAttrs><llsd><map><key>MyStore</key><map><key>last words</key><string>Rosebud</string></map></map></llsd></DynAttrs>
+                <DynAttrs>
+                    <llsd>
+                        <map>
+                            <key>MyNamespace</key>
+                            <map>                                
+                                <key>MyStore</key>
+                                <map>   
+                                    <key>last words</key>
+                                    <string>Rosebud</string>
+                                </map>
+                            </map>
+                        </map>
+                    </llsd>
+                </DynAttrs>
                 <SitTargetAvatar><UUID>00000000-0000-0000-0000-000000000000</UUID></SitTargetAvatar>
             </SceneObjectPart>
             <OtherParts />
@@ -362,7 +388,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             Assert.That(rootPart.UUID, Is.EqualTo(new UUID("e6a5a05e-e8cc-4816-8701-04165e335790")));
             Assert.That(rootPart.CreatorID, Is.EqualTo(new UUID("a6dacf01-4636-4bb9-8a97-30609438af9d")));
             Assert.That(rootPart.Name, Is.EqualTo("PrimMyRide"));
-            OSDMap store = rootPart.DynAttrs["MyStore"];
+            OSDMap store = rootPart.DynAttrs.GetStore("MyNamespace", "MyStore");
             Assert.AreEqual(42, store["the answer"].AsInteger());
 
             // TODO: Check other properties
@@ -414,13 +440,14 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             rp.CreatorID = rpCreatorId;
             rp.Shape = shape;
 
+            string daNamespace = "MyNamespace";
             string daStoreName = "MyStore";
             string daKey = "foo";
             string daValue = "bar";
             OSDMap myStore = new OSDMap();
             myStore.Add(daKey, daValue);
             rp.DynAttrs = new DAMap();
-            rp.DynAttrs[daStoreName] = myStore;
+            rp.DynAttrs.SetStore(daNamespace, daStoreName, myStore);
 
             SceneObjectGroup so = new SceneObjectGroup(rp);
 
@@ -481,7 +508,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             Assert.That(name, Is.EqualTo(rpName));
             Assert.That(creatorId, Is.EqualTo(rpCreatorId));
             Assert.NotNull(daMap);
-            Assert.AreEqual(daValue, daMap[daStoreName][daKey].AsString());
+            Assert.AreEqual(daValue, daMap.GetStore(daNamespace, daStoreName)[daKey].AsString());
         }
 
         [Test]
@@ -496,7 +523,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             Assert.That(rootPart.UUID, Is.EqualTo(new UUID("9be68fdd-f740-4a0f-9675-dfbbb536b946")));
             Assert.That(rootPart.CreatorID, Is.EqualTo(new UUID("b46ef588-411e-4a8b-a284-d7dcfe8e74ef")));
             Assert.That(rootPart.Name, Is.EqualTo("PrimFun"));
-            OSDMap store = rootPart.DynAttrs["MyStore"];
+            OSDMap store = rootPart.DynAttrs.GetStore("MyNamespace", "MyStore");
             Assert.AreEqual("Rosebud", store["last words"].AsString());
 
             // TODO: Check other properties
@@ -522,13 +549,14 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             rp.CreatorID = rpCreatorId;
             rp.Shape = shape;
 
+            string daNamespace = "MyNamespace";
             string daStoreName = "MyStore";
             string daKey = "foo";
             string daValue = "bar";
             OSDMap myStore = new OSDMap();
             myStore.Add(daKey, daValue);
             rp.DynAttrs = new DAMap();
-            rp.DynAttrs[daStoreName] = myStore;
+            rp.DynAttrs.SetStore(daNamespace, daStoreName, myStore);
 
             SceneObjectGroup so = new SceneObjectGroup(rp);
 
@@ -585,7 +613,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             Assert.That(name, Is.EqualTo(rpName));
             Assert.That(creatorId, Is.EqualTo(rpCreatorId));
             Assert.NotNull(daMap);
-            Assert.AreEqual(daValue, daMap[daStoreName][daKey].AsString());
+            Assert.AreEqual(daValue, daMap.GetStore(daNamespace, daStoreName)[daKey].AsString());
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
index 883045a..d093224 100644
--- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
@@ -369,6 +369,15 @@ namespace OpenSim.Region.CoreModules.World.Sound
             });
         }
 
+        public void SetSoundQueueing(UUID objectID, bool shouldQueue)
+        {
+            SceneObjectPart part;
+            if (!m_scene.TryGetSceneObjectPart(objectID, out part))
+                return;
+
+            part.SoundQueueing = shouldQueue;
+        }
+
         #endregion
     }
 }
diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
index 32e93b4..50276ae 100644
--- a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
+++ b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
@@ -63,7 +63,7 @@ namespace OpenSim.Region.DataSnapshot
 
         public Hashtable OnGetSnapshot(Hashtable keysvals)
         {
-            m_log.Info("[DATASNAPSHOT] Received collection request");
+            m_log.Debug("[DATASNAPSHOT] Received collection request");
             Hashtable reply = new Hashtable();
             int statuscode = 200;
 
@@ -80,7 +80,7 @@ namespace OpenSim.Region.DataSnapshot
 
         public Hashtable OnValidate(Hashtable keysvals)
         {
-            m_log.Info("[DATASNAPSHOT] Received validation request");
+            m_log.Debug("[DATASNAPSHOT] Received validation request");
             Hashtable reply = new Hashtable();
             int statuscode = 200;
 
diff --git a/OpenSim/Region/DataSnapshot/SnapshotStore.cs b/OpenSim/Region/DataSnapshot/SnapshotStore.cs
index aa3d2ff..480aaaf 100644
--- a/OpenSim/Region/DataSnapshot/SnapshotStore.cs
+++ b/OpenSim/Region/DataSnapshot/SnapshotStore.cs
@@ -120,7 +120,7 @@ namespace OpenSim.Region.DataSnapshot
                 provider.Stale = false;
                 m_scenes[provider.GetParentScene] = true;
 
-                m_log.Info("[DATASNAPSHOT]: Generated fragment response for provider type " + provider.Name);
+                m_log.Debug("[DATASNAPSHOT]: Generated fragment response for provider type " + provider.Name);
             }
             else
             {
@@ -134,7 +134,7 @@ namespace OpenSim.Region.DataSnapshot
                     data = factory.ImportNode(node, true);
                 }
 
-                m_log.Info("[DATASNAPSHOT]: Retrieved fragment response for provider type " + provider.Name);
+                m_log.Debug("[DATASNAPSHOT]: Retrieved fragment response for provider type " + provider.Name);
             }
 
             return data;
@@ -154,7 +154,7 @@ namespace OpenSim.Region.DataSnapshot
 
             if (!m_scenes[scene])
             {
-                m_log.Info("[DATASNAPSHOT]: Attempting to retrieve snapshot from cache.");
+                m_log.Debug("[DATASNAPSHOT]: Attempting to retrieve snapshot from cache.");
                 //get snapshot from cache
                 String path = DataFileNameScene(scene);
 
@@ -168,11 +168,11 @@ namespace OpenSim.Region.DataSnapshot
                     regionElement = factory.ImportNode(node, true);
                 }
 
-                m_log.Info("[DATASNAPSHOT]: Obtained snapshot from cache for " + scene.RegionInfo.RegionName);
+                m_log.Debug("[DATASNAPSHOT]: Obtained snapshot from cache for " + scene.RegionInfo.RegionName);
             }
             else
             {
-                m_log.Info("[DATASNAPSHOT]: Attempting to generate snapshot.");
+                m_log.Debug("[DATASNAPSHOT]: Attempting to generate snapshot.");
                 //make snapshot
                 regionElement = MakeRegionNode(scene, factory);
 
@@ -211,7 +211,7 @@ namespace OpenSim.Region.DataSnapshot
 
                 m_scenes[scene] = false;
 
-                m_log.Info("[DATASNAPSHOT]: Generated new snapshot for " + scene.RegionInfo.RegionName);
+                m_log.Debug("[DATASNAPSHOT]: Generated new snapshot for " + scene.RegionInfo.RegionName);
             }
 
             return regionElement;
diff --git a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
index 292efa4..d49b24e 100644
--- a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Region.Framework.Interfaces
 
         uint GetRegionFlags();
         bool IsManager(UUID avatarID);
-        
+
         /// <summary>
         /// Tell all clients about the current state of the region (terrain textures, water height, etc.).
         /// </summary>
diff --git a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
index 5512642..3780ece 100644
--- a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.Framework.Interfaces
                                   UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog,
                                   uint timeStamp, bool offline, int parentEstateID, Vector3 position,
                                   uint ttl, UUID transactionID, bool fromGroup, byte[] binaryBucket);
-        void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID toAgent, bool canVoiceChat, 
+        void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID anotherAgent, bool canVoiceChat, 
                                                bool isModerator, bool textMute);
         void ParcelProperties(ParcelPropertiesMessage parcelPropertiesMessage, UUID avatarID);
         void GroupMembership(AgentGroupDataUpdatePacket groupUpdate, UUID avatarID);
diff --git a/OpenSim/Region/Framework/Interfaces/IExternalCapsModule.cs b/OpenSim/Region/Framework/Interfaces/IExternalCapsModule.cs
new file mode 100644
index 0000000..a730cfd
--- /dev/null
+++ b/OpenSim/Region/Framework/Interfaces/IExternalCapsModule.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 OpenSim.Framework;
+using Caps=OpenSim.Framework.Capabilities.Caps;
+
+namespace OpenSim.Region.Framework.Interfaces
+{
+    public interface IExternalCapsModule
+    {
+        /// <summary>
+        /// This function extends the simple URL configuration in the caps handlers
+        /// to facilitate more interesting computation when an external handler is
+        /// sent to the viewer. 
+        /// </summary>
+        /// <param name="agentID">New user UUID</param>
+        /// <param name="caps">Internal caps registry, where the external handler will be registered</param>
+        /// <param name="capName">Name of the specific cap we are registering</param>
+        /// <param name="urlSkel">The skeleton URL provided in the caps configuration</param>
+        bool RegisterExternalUserCapsHandler(UUID agentID, Caps caps, String capName, String urlSkel);
+    }
+}
diff --git a/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs b/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs
index 6885327..9ae5e87 100644
--- a/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IGroupsModule.cs
@@ -97,5 +97,7 @@ namespace OpenSim.Region.Framework.Interfaces
         void InviteGroupRequest(IClientAPI remoteClient, UUID GroupID, UUID InviteeID, UUID RoleID);
         void InviteGroup(IClientAPI remoteClient, UUID agentID, UUID GroupID, UUID InviteeID, UUID RoleID);
         void NotifyChange(UUID GroupID);
+
+        List<DirGroupsReplyData> FindGroups(IClientAPI remoteClient, string query);
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Interfaces/IServiceThrottleModule.cs b/OpenSim/Region/Framework/Interfaces/IServiceThrottleModule.cs
new file mode 100644
index 0000000..198256f
--- /dev/null
+++ b/OpenSim/Region/Framework/Interfaces/IServiceThrottleModule.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+
+namespace OpenSim.Region.Framework.Interfaces
+{
+    public interface IServiceThrottleModule
+    {
+        /// <summary>
+        /// Enqueue a continuation meant to get a resource from elsewhere.
+        /// As usual with CPS, caller beware: if that continuation is a never-ending computation,
+        /// the whole thread will be blocked, and no requests are processed
+        /// </summary>
+        /// <param name="category">Category of the resource (e.g. name, region)</param>
+        /// <param name="itemid">The resource identifier</param>
+        /// <param name="continuation">The continuation to be executed</param>
+        void Enqueue(string category, string itemid, Action continuation);
+    }
+
+}
diff --git a/OpenSim/Region/Framework/Interfaces/ISoundModule.cs b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
index 68af492..8372ddd 100644
--- a/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs
@@ -104,7 +104,6 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="sound">Sound asset ID</param>
         /// <param name="volume">Sound volume</param>
         /// <param name="triggered">Triggered or not.</param>
-        /// <param name="flags"></param>
         /// <param name="radius">Sound radius</param>
         /// <param name="useMaster">Play using sound master</param>
         /// <param name="isMaster">Play as sound master</param>
@@ -123,5 +122,12 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="max">AABB top north-east corner</param>
         void TriggerSoundLimited(UUID objectID, UUID sound, double volume,
                 Vector3 min, Vector3 max);
+
+        /// <summary>
+        /// Set whether sounds on the given prim should be queued.
+        /// </summary>
+        /// <param name='objectID'></param>
+        /// <param name='shouldQueue'></param>
+        void SetSoundQueueing(UUID objectID, bool shouldQueue);
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
index 66edfed..b7400ea 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
@@ -28,8 +28,11 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using System.Text;
 using log4net;
 using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+
 using OpenSim.Framework;
 
 using Animation = OpenSim.Framework.Animation;
@@ -60,6 +63,12 @@ namespace OpenSim.Region.Framework.Scenes.Animation
             ResetDefaultAnimation();
         }
 
+        public AnimationSet(OSDArray pArray)
+        {
+            ResetDefaultAnimation();
+            FromOSDArray(pArray);
+        }
+
         public bool HasAnimation(UUID animID)
         {
             if (m_defaultAnimation.AnimID == animID)
@@ -218,5 +227,110 @@ namespace OpenSim.Region.Framework.Scenes.Animation
             foreach (OpenSim.Framework.Animation anim in theArray)
                 m_animations.Add(anim);
         }
+
+        // Create representation of this AnimationSet as an OSDArray.
+        // First two entries in the array are the default and implicitDefault animations
+        //    followed by the other animations.
+        public OSDArray ToOSDArray()
+        {
+            OSDArray ret = new OSDArray();
+            ret.Add(DefaultAnimation.PackUpdateMessage());
+            ret.Add(ImplicitDefaultAnimation.PackUpdateMessage());
+
+            foreach (OpenSim.Framework.Animation anim in m_animations)
+                ret.Add(anim.PackUpdateMessage());
+
+            return ret;
+        }
+
+        public void FromOSDArray(OSDArray pArray)
+        {
+            this.Clear();
+
+            if (pArray.Count >= 1)
+            {
+                m_defaultAnimation = new OpenSim.Framework.Animation((OSDMap)pArray[0]);
+            }
+            if (pArray.Count >= 2)
+            {
+                m_implicitDefaultAnimation = new OpenSim.Framework.Animation((OSDMap)pArray[1]);
+            }
+            for (int ii = 2; ii < pArray.Count; ii++)
+            {
+                m_animations.Add(new OpenSim.Framework.Animation((OSDMap)pArray[ii]));
+            }
+        }
+
+        // Compare two AnimationSets and return 'true' if the default animations are the same
+        //     and all of the animations in the list are equal.
+        public override bool Equals(object obj)
+        {
+            AnimationSet other = obj as AnimationSet;
+            if (other != null)
+            {
+                if (this.DefaultAnimation.Equals(other.DefaultAnimation)
+                    && this.ImplicitDefaultAnimation.Equals(other.ImplicitDefaultAnimation))
+                {
+                    // The defaults are the same. Is the list of animations the same?
+                    OpenSim.Framework.Animation[] thisAnims = this.ToArray();
+                    OpenSim.Framework.Animation[] otherAnims = other.ToArray();
+                    if (thisAnims.Length == 0 && otherAnims.Length == 0)
+                        return true;    // the common case
+                    if (thisAnims.Length == otherAnims.Length)
+                    {
+                        // Do this the hard way but since the list is usually short this won't take long.
+                        foreach (OpenSim.Framework.Animation thisAnim in thisAnims)
+                        {
+                            bool found = false;
+                            foreach (OpenSim.Framework.Animation otherAnim in otherAnims)
+                            {
+                                if (thisAnim.Equals(otherAnim))
+                                {
+                                    found = true;
+                                    break;
+                                }
+                            }
+                            if (!found)
+                            {
+                                // If anything is not in the other list, these are not equal
+                                return false;
+                            }
+                        }
+                        // Found everything in the other list. Since lists are equal length, they must be equal.
+                        return true;
+                    }
+                }
+                return false;
+            }
+            // Don't know what was passed, but the base system will figure it out for me.
+            return base.Equals(obj);
+        }
+
+        public override string ToString()
+        {
+            StringBuilder buff = new StringBuilder();
+            buff.Append("dflt=");
+            buff.Append(DefaultAnimation.ToString());
+            buff.Append(",iDflt=");
+            if (DefaultAnimation.Equals(ImplicitDefaultAnimation))
+                buff.Append("same");
+            else
+                buff.Append(ImplicitDefaultAnimation.ToString());
+            if (m_animations.Count > 0)
+            {
+                buff.Append(",anims=");
+                bool firstTime = true;
+                foreach (OpenSim.Framework.Animation anim in m_animations)
+                {
+                    if (!firstTime)
+                        buff.Append(",");
+                    buff.Append("<");
+                    buff.Append(anim.ToString());
+                    buff.Append(">");
+                    firstTime = false;
+                }
+            }
+            return buff.ToString();
+        }
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs b/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs
index c2b0468..b79dd8f 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/DefaultAvatarAnimations.cs
@@ -104,5 +104,31 @@ namespace OpenSim.Region.Framework.Scenes.Animation
 
             return UUID.Zero;
         }
+
+        /// <summary>
+        /// Get the name of the animation given a UUID. If there is no matching animation
+        ///    return the UUID as a string.
+        /// </summary>
+        public static string GetDefaultAnimationName(UUID uuid)
+        {
+            string ret = "unknown";
+            if (AnimsUUID.ContainsValue(uuid))
+            {
+                foreach (KeyValuePair<string, UUID> kvp in AnimsUUID)
+                {
+                    if (kvp.Value == uuid)
+                    {
+                        ret = kvp.Key;
+                        break;
+                    }
+                }
+            }
+            else
+            {
+                ret = uuid.ToString();
+            }
+
+            return ret;
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index 65c279e..5529a25 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -93,7 +93,10 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                     GetAnimName(animID), animID, m_scenePresence.Name);
 
             if (m_animations.Add(animID, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, objectID))
+            {
                 SendAnimPack();
+                m_scenePresence.TriggerScenePresenceUpdated();
+            }
         }
 
         // Called from scripts
@@ -132,7 +135,10 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                     GetAnimName(animID), animID, m_scenePresence.Name);
 
             if (m_animations.Remove(animID, allowNoDefault))
+            {
                 SendAnimPack();
+                m_scenePresence.TriggerScenePresenceUpdated();
+            }
         }
 
         public void avnChangeAnim(UUID animID, bool addRemove, bool sendPack)
@@ -180,8 +186,10 @@ namespace OpenSim.Region.Framework.Scenes.Animation
         /// The movement animation is reserved for "main" animations
         /// that are mutually exclusive, e.g. flying and sitting.
         /// </summary>
-        public void TrySetMovementAnimation(string anim)
+        /// <returns>'true' if the animation was updated</returns>
+        public bool TrySetMovementAnimation(string anim)
         {
+            bool ret = false;
             if (!m_scenePresence.IsChildAgent)
             {
 //                m_log.DebugFormat(
@@ -198,6 +206,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                     // 16384 is CHANGED_ANIMATION
                     m_scenePresence.SendScriptEventToAttachments("changed", new Object[] { (int)Changed.ANIMATION});
                     SendAnimPack();
+                    ret = true;
                 }
             }
             else
@@ -206,6 +215,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                     "[SCENE PRESENCE ANIMATOR]: Tried to set movement animation {0} on child presence {1}",
                     anim, m_scenePresence.Name);
             }
+            return ret;
         }
 
         /// <summary>
@@ -439,8 +449,10 @@ namespace OpenSim.Region.Framework.Scenes.Animation
         /// <summary>
         /// Update the movement animation of this avatar according to its current state
         /// </summary>
-        public void UpdateMovementAnimations()
+        /// <returns>'true' if the animation was changed</returns>
+        public bool UpdateMovementAnimations()
         {
+            bool ret = false;
             lock (m_animations)
             {
                 string newMovementAnimation = DetermineMovementAnimation();
@@ -454,9 +466,10 @@ namespace OpenSim.Region.Framework.Scenes.Animation
 
                     // Only set it if it's actually changed, give a script
                     // a chance to stop a default animation
-                    TrySetMovementAnimation(CurrentMovementAnimation);
+                    ret = TrySetMovementAnimation(CurrentMovementAnimation);
                 }
             }
+            return ret;
         }
 
         public UUID[] GetAnimationArray()
diff --git a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
index f555b49..11a0146 100644
--- a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
+++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
@@ -104,14 +104,8 @@ namespace OpenSim.Region.Framework.Scenes
             // better than losing the object for now.
             if (permissionToDelete)
             {
-                List<uint> killIDs = new List<uint>();
-
                 foreach (SceneObjectGroup g in objectGroups)
-                {   killIDs.Add(g.LocalId);
-                    g.DeleteGroupFromScene(true);
-                }
-
-                m_scene.SendKillObject(killIDs);
+                    g.DeleteGroupFromScene(false);
             }
         }
         
@@ -160,7 +154,7 @@ namespace OpenSim.Region.Framework.Scenes
                             if (x.permissionToDelete)
                             {
                                 foreach (SceneObjectGroup g in x.objectGroups)
-                                    m_scene.DeleteSceneObject(g, false);
+                                    m_scene.DeleteSceneObject(g, true);
                             }
                         }
                         catch (Exception e)
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 4733547..6e8eb91 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -743,7 +743,7 @@ namespace OpenSim.Region.Framework.Scenes
         public event OnIncomingSceneObjectDelegate OnIncomingSceneObject;
         public delegate void OnIncomingSceneObjectDelegate(SceneObjectGroup so);
 
-        public delegate void NewInventoryItemUploadComplete(UUID avatarID, UUID assetID, string name, int userlevel);
+        public delegate void NewInventoryItemUploadComplete(UUID avatarID, AssetType type, UUID assetID, string name, int userlevel);
 
         public event NewInventoryItemUploadComplete OnNewInventoryItemUploadComplete;
 
@@ -974,6 +974,8 @@ namespace OpenSim.Region.Framework.Scenes
         public delegate void RegionStarted(Scene scene);
         public event RegionStarted OnRegionStarted;
 
+        public delegate void RegionHeartbeatStart(Scene scene);
+        public event RegionHeartbeatStart OnRegionHeartbeatStart;
         public delegate void RegionHeartbeatEnd(Scene scene);
         public event RegionHeartbeatEnd OnRegionHeartbeatEnd;
 
@@ -1024,6 +1026,16 @@ namespace OpenSim.Region.Framework.Scenes
         /// </remarks>
         public event TeleportFail OnTeleportFail;
 
+//        public delegate void GatherUuids(SceneObjectPart sop, IDictionary<UUID, AssetType> assetUuids);
+//
+//        /// <summary>
+//        /// Triggered when UUIDs referenced by a scene object are being gathered for archiving, hg transfer, etc.
+//        /// </summary>
+//        /// <remarks>
+//        /// The listener should add references to the IDictionary<UUID, AssetType> as appropriate.
+//        /// </remarks>
+//        public event GatherUuids OnGatherUuids;
+
         public class MoneyTransferArgs : EventArgs
         {
             public UUID sender;
@@ -2160,7 +2172,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        public void TriggerOnNewInventoryItemUploadComplete(UUID agentID, UUID AssetID, String AssetName, int userlevel)
+        public void TriggerOnNewInventoryItemUploadComplete(UUID agentID, AssetType type, UUID AssetID, String AssetName, int userlevel)
         {
             NewInventoryItemUploadComplete handlerNewInventoryItemUpdateComplete = OnNewInventoryItemUploadComplete;
             if (handlerNewInventoryItemUpdateComplete != null)
@@ -2169,7 +2181,7 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     try
                     {
-                        d(agentID, AssetID, AssetName, userlevel);
+                        d(agentID, type, AssetID, AssetName, userlevel);
                     }
                     catch (Exception e)
                     {
@@ -3096,6 +3108,27 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        public void TriggerRegionHeartbeatStart(Scene scene)
+        {
+            RegionHeartbeatStart handler = OnRegionHeartbeatStart;
+
+            if (handler != null)
+            {
+                foreach (RegionHeartbeatStart d in handler.GetInvocationList())
+                {
+                    try
+                    {
+                        d(scene);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat("[EVENT MANAGER]: Delegate for OnRegionHeartbeatStart failed - continuing {0} - {1}",
+                            e.Message, e.StackTrace);
+                    }
+                }
+            }
+        }
+
         public void TriggerRegionHeartbeatEnd(Scene scene)
         {
             RegionHeartbeatEnd handler = OnRegionHeartbeatEnd;
@@ -3251,5 +3284,26 @@ namespace OpenSim.Region.Framework.Scenes
                 handler(scenePresence);
             }
         }
+
+//        public void TriggerGatherUuids(SceneObjectPart sop, IDictionary<UUID, AssetType> assetUuids)
+//        {
+//            GatherUuids handler = OnGatherUuids;
+//
+//            if (handler != null)
+//            {
+//                foreach (GatherUuids d in handler.GetInvocationList())
+//                {
+//                    try
+//                    {
+//                        d(sop, assetUuids);
+//                    }
+//                    catch (Exception e)
+//                    {
+//                        m_log.ErrorFormat("[EVENT MANAGER]: Delegate for TriggerUuidGather failed - continuing {0} - {1}",
+//                            e.Message, e.StackTrace);
+//                    }
+//                }
+//            }
+//        }
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
index 276b61f..c0057ee 100644
--- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
+++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
@@ -1,6 +1,29 @@
-// Proprietary code of Avination Virtual Limited
-// (c) 2012 Melanie Thielker
-//
+/*
+ * 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.Timers;
@@ -32,7 +55,6 @@ namespace OpenSim.Region.Framework.Scenes
         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
         {
@@ -46,8 +68,6 @@ namespace OpenSim.Region.Framework.Scenes
             m_timer.AutoReset = true;
             m_timer.Elapsed += OnTimer;
 
-            m_scene = scene;
-
             m_timer.Start();
         }
 
@@ -71,13 +91,13 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         m.OnTimer(TickDuration);
                     }
-                    catch (Exception inner)
+                    catch (Exception)
                     {
                         // Don't stop processing
                     }
                 }
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 // Keep running no matter what
             }
@@ -134,7 +154,7 @@ namespace OpenSim.Region.Framework.Scenes
     [Serializable]
     public class KeyframeMotion
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public enum PlayMode : int
         {
diff --git a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
index c11174d..f208afb 100644
--- a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
+++ b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
@@ -46,47 +46,33 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.Framework.Scenes
 {
-    public class RegionStatsHandler : IStreamedRequestHandler
+    public class RegionStatsHandler : BaseStreamHandler
     {
         //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private string osRXStatsURI = String.Empty;
         private string osXStatsURI = String.Empty;
         //private string osSecret = String.Empty;
         private OpenSim.Framework.RegionInfo regionInfo;
         public string localZone = TimeZone.CurrentTimeZone.StandardName;
         public TimeSpan utcOffset = TimeZone.CurrentTimeZone.GetUtcOffset(DateTime.Now);
 
-        public string Name { get { return "RegionStats"; } }
-        public string Description { get { return "Region Statistics"; } }
-
-        public RegionStatsHandler(RegionInfo region_info)
+        public RegionStatsHandler(RegionInfo region_info) 
+            : base("GET", "/" + Util.SHA1Hash(region_info.regionSecret), "RegionStats", "Region Statistics")
         {
             regionInfo = region_info;
-            osRXStatsURI = Util.SHA1Hash(regionInfo.regionSecret);
             osXStatsURI = Util.SHA1Hash(regionInfo.osSecret);
         }
                     
-        public byte[] Handle(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        protected override byte[] ProcessRequest(
+            string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             return Util.UTF8.GetBytes(Report());
         }
 
-        public string ContentType
+        public override string ContentType
         {
             get { return "text/plain"; }
         }
-
-        public string HttpMethod
-        {
-            get { return "GET"; }
-        }
-
-        public string Path
-        {
-            // This is for the region and is the regionSecret hashed
-            get { return "/" + osRXStatsURI; }
-        }
         
         private string Report()
         {
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index d2e41f8..4337b5a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -139,7 +139,7 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     userlevel = 1;
                 }
-                EventManager.TriggerOnNewInventoryItemUploadComplete(item.Owner, item.AssetID, item.Name, userlevel);
+                EventManager.TriggerOnNewInventoryItemUploadComplete(item.Owner, (AssetType)item.AssetType, item.AssetID, item.Name, userlevel);
 
                 return true;
             }
@@ -178,7 +178,7 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     userlevel = 1;
                 }
-                EventManager.TriggerOnNewInventoryItemUploadComplete(item.Owner, item.AssetID, item.Name, userlevel);
+                EventManager.TriggerOnNewInventoryItemUploadComplete(item.Owner, (AssetType)item.AssetType, item.AssetID, item.Name, userlevel);
 
                 if (originalFolder != UUID.Zero)
                 {
@@ -411,19 +411,21 @@ namespace OpenSim.Region.Framework.Scenes
 //                        itemUpd.NextPermissions, itemUpd.GroupPermissions, itemUpd.EveryOnePermissions, item.Flags,
 //                        item.NextPermissions, item.GroupPermissions, item.EveryOnePermissions, item.CurrentPermissions);
 
+                bool sendUpdate = false;
+
                 if (itemUpd.NextPermissions != 0) // Use this to determine validity. Can never be 0 if valid
                 {
                     // Create a set of base permissions that will not include export if the user
                     // is not allowed to change the export flag.
                     bool denyExportChange = false;
 
-                    m_log.InfoFormat("[XXX]: B: {0} O: {1} E: {2}", itemUpd.BasePermissions, itemUpd.CurrentPermissions, itemUpd.EveryOnePermissions);
+//                    m_log.DebugFormat("[XXX]: B: {0} O: {1} E: {2}", itemUpd.BasePermissions, itemUpd.CurrentPermissions, itemUpd.EveryOnePermissions);
 
                     // If the user is not the creator or doesn't have "E" in both "B" and "O", deny setting export
                     if ((item.BasePermissions & (uint)(PermissionMask.All | PermissionMask.Export)) != (uint)(PermissionMask.All | PermissionMask.Export) || (item.CurrentPermissions & (uint)PermissionMask.Export) == 0 || item.CreatorIdAsUuid != item.Owner)
                         denyExportChange = true;
 
-                    m_log.InfoFormat("[XXX]: Deny Export Update {0}", denyExportChange);
+//                    m_log.DebugFormat("[XXX]: Deny Export Update {0}", denyExportChange);
 
                     // If it is already set, force it set and also force full perm
                     // else prevent setting it. It can and should never be set unless
@@ -447,7 +449,7 @@ namespace OpenSim.Region.Framework.Scenes
                         // If the new state is exportable, force full perm
                         if ((itemUpd.EveryOnePermissions & (uint)PermissionMask.Export) != 0)
                         {
-                            m_log.InfoFormat("[XXX]: Force full perm");
+//                            m_log.DebugFormat("[XXX]: Force full perm");
                             itemUpd.NextPermissions = (uint)(PermissionMask.All);
                         }
                     }
@@ -484,8 +486,13 @@ namespace OpenSim.Region.Framework.Scenes
                     item.SalePrice = itemUpd.SalePrice;
                     item.SaleType = itemUpd.SaleType;
 
+                    if (item.InvType == (int)InventoryType.Wearable && (item.Flags & 0xf) == 0 && (itemUpd.Flags & 0xf) != 0)
+                    {
+                        item.Flags = (uint)(item.Flags & 0xfffffff0) | (itemUpd.Flags & 0xf);
+                        sendUpdate = true;
+                    }
+
                     InventoryService.UpdateItem(item);
-                    remoteClient.SendBulkUpdateInventory(item);
                 }
 
                 if (UUID.Zero != transactionID)
@@ -495,6 +502,14 @@ namespace OpenSim.Region.Framework.Scenes
                         AgentTransactionsModule.HandleItemUpdateFromTransaction(remoteClient, transactionID, item);
                     }
                 }
+                else
+                {
+                    // This MAY be problematic, if it is, another solution
+                    // needs to be found. If inventory item flags are updated
+                    // the viewer's notion of the item needs to be refreshed.
+                    if (sendUpdate)
+                        remoteClient.SendBulkUpdateInventory(item);
+                }
             }
             else
             {
@@ -548,6 +563,9 @@ namespace OpenSim.Region.Framework.Scenes
         {
             //Console.WriteLine("Scene.Inventory.cs: GiveInventoryItem");
 
+            if (!Permissions.CanTransferUserInventory(itemId, senderId, recipient))
+                return null;
+
             InventoryItemBase item = new InventoryItemBase(itemId, senderId);
             item = InventoryService.GetItem(item);
 
@@ -2124,7 +2142,10 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     // If we don't have permission, stop right here
                     if (!permissionToTakeCopy)
+                    {
+                        remoteClient.SendAlertMessage("You don't have permission to take the object");
                         return;
+                    }
 
                     permissionToTake = true;
                     // Don't delete
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index ce6415a..421cb08 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -416,6 +416,7 @@ namespace OpenSim.Region.Framework.Scenes
         void ProcessViewerEffect(IClientAPI remoteClient, List<ViewerEffectEventHandlerArg> args)
         {
             // TODO: don't create new blocks if recycling an old packet
+            bool discardableEffects = true;
             ViewerEffectPacket.EffectBlock[] effectBlockArray = new ViewerEffectPacket.EffectBlock[args.Count];
             for (int i = 0; i < args.Count; i++)
             {
@@ -427,17 +428,34 @@ namespace OpenSim.Region.Framework.Scenes
                 effect.Type = args[i].Type;
                 effect.TypeData = args[i].TypeData;
                 effectBlockArray[i] = effect;
+
+                if ((EffectType)effect.Type != EffectType.LookAt && (EffectType)effect.Type != EffectType.Beam)
+                    discardableEffects = false;
+
+                //m_log.DebugFormat("[YYY]: VE {0} {1} {2}", effect.AgentID, effect.Duration, (EffectType)effect.Type);
             }
 
-            ForEachClient(
-                delegate(IClientAPI client)
+            ForEachScenePresence(sp =>
                 {
-                    if (client.AgentId != remoteClient.AgentId)
-                        client.SendViewerEffect(effectBlockArray);
-                }
-            );
+                    if (sp.ControllingClient.AgentId != remoteClient.AgentId)
+                    {
+                        if (!discardableEffects ||
+                            (discardableEffects && ShouldSendDiscardableEffect(remoteClient, sp)))
+                        {
+                            //m_log.DebugFormat("[YYY]: Sending to {0}", sp.UUID);
+                            sp.ControllingClient.SendViewerEffect(effectBlockArray);
+                        }
+                        //else
+                        //    m_log.DebugFormat("[YYY]: Not sending to {0}", sp.UUID);
+                    }
+                });
         }
         
+        private bool ShouldSendDiscardableEffect(IClientAPI thisClient, ScenePresence other)
+        {
+            return Vector3.Distance(other.CameraPosition, thisClient.SceneAgent.AbsolutePosition) < 10;
+        }
+
         private class DescendentsRequestData
         {
             public IClientAPI RemoteClient;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index b189599..d6d2df4 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -151,7 +151,7 @@ namespace OpenSim.Region.Framework.Scenes
         public SynchronizeSceneHandler SynchronizeScene;
 
         /// <summary>
-        /// Used to prevent simultaneous calls to RemoveClient() for the same agent from interfering with each other.
+        /// Used to prevent simultaneous calls to code that adds and removes agents.
         /// </summary>
         private object m_removeClientLock = new object();
 
@@ -230,6 +230,8 @@ namespace OpenSim.Region.Framework.Scenes
         public bool m_seeIntoBannedRegion = false;
         public int MaxUndoCount = 5;
 
+        public bool SeeIntoRegion { get; set; }
+
         // Using this for RegionReady module to prevent LoginsDisabled from changing under our feet;
         public bool LoginLock = false;
 
@@ -396,10 +398,12 @@ namespace OpenSim.Region.Framework.Scenes
                 if (value)
                 {
                     if (!m_active)
-                        Start();
+                        Start(false);
                 }
                 else
                 {
+                    // This appears assymetric with Start() above but is not - setting m_active = false stops the loops
+                    // XXX: Possibly this should be in an explicit Stop() method for symmetry.
                     m_active = false;
                 }
             }
@@ -859,9 +863,11 @@ namespace OpenSim.Region.Framework.Scenes
                 //Animation states
                 m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false);
 
+
+                MaxUndoCount = startupConfig.GetInt("MaxPrimUndos", 20);
+
                 PhysicalPrims = startupConfig.GetBoolean("physical_prim", true);
                 CollidablePrims = startupConfig.GetBoolean("collidable_prim", true);
-
                 m_minNonphys = startupConfig.GetFloat("NonPhysicalPrimMin", m_minNonphys);
                 if (RegionInfo.NonphysPrimMin > 0)
                 {
@@ -1332,7 +1338,7 @@ namespace OpenSim.Region.Framework.Scenes
             Thread.Sleep(500);
 
             // Stop all client threads.
-            ForEachScenePresence(delegate(ScenePresence avatar) { avatar.ControllingClient.Close(); });
+            ForEachScenePresence(delegate(ScenePresence avatar) { IncomingCloseAgent(avatar.UUID, false); });
 
             m_log.Debug("[SCENE]: TriggerSceneShuttingDown");
             EventManager.TriggerSceneShuttingDown(this);
@@ -1361,10 +1367,18 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        public override void Start()
+        {
+            Start(true);
+        }
+
         /// <summary>
         /// Start the scene
         /// </summary>
-        public void Start()
+        /// <param name='startScripts'>
+        /// Start the scripts within the scene.
+        /// </param> 
+        public void Start(bool startScripts)
         {
             m_active = true;
 
@@ -1401,6 +1415,8 @@ namespace OpenSim.Region.Framework.Scenes
             m_heartbeatThread
                 = Watchdog.StartThread(
                     Heartbeat, string.Format("Heartbeat ({0})", RegionInfo.RegionName), ThreadPriority.Normal, false, false);
+
+            StartScripts();
         }
 
         /// <summary>
@@ -1557,6 +1573,8 @@ namespace OpenSim.Region.Framework.Scenes
 
                 try
                 {
+                    EventManager.TriggerRegionHeartbeatStart(this);
+
                     // Apply taints in terrain module to terrain in physics scene
                     if (Frame % m_update_terrain == 0)
                     {
@@ -2939,6 +2957,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             ScenePresence sp;
             bool vialogin;
+            bool reallyNew = true;
 
             // Validation occurs in LLUDPServer
             //
@@ -2997,16 +3016,21 @@ namespace OpenSim.Region.Framework.Scenes
                     m_log.WarnFormat(
                         "[SCENE]: Already found {0} scene presence for {1} in {2} when asked to add new scene presence",
                         sp.IsChildAgent ? "child" : "root", sp.Name, RegionInfo.RegionName);
+                    reallyNew = false;
                 }
     
                 // We must set this here so that TriggerOnNewClient and TriggerOnClientLogin can determine whether the
                 // client is for a root or child agent.
                 client.SceneAgent = sp;
 
-                // Cache the user's name
+                // This is currently also being done earlier in NewUserConnection for real users to see if this 
+                // resolves problems where HG agents are occasionally seen by others as "Unknown user" in chat and other
+                // places.  However, we still need to do it here for NPCs.
                 CacheUserName(sp, aCircuit);
     
-                EventManager.TriggerOnNewClient(client);
+                if (reallyNew)
+                    EventManager.TriggerOnNewClient(client);
+    
                 if (vialogin)
                     EventManager.TriggerOnClientLogin(client);
             }
@@ -3027,7 +3051,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 string first = aCircuit.firstname, last = aCircuit.lastname;
 
-                if (sp.PresenceType == PresenceType.Npc)
+                if (sp != null && sp.PresenceType == PresenceType.Npc)
                 {
                     UserManagementModule.AddUser(aCircuit.AgentID, first, last);
                 }
@@ -3105,7 +3129,8 @@ namespace OpenSim.Region.Framework.Scenes
                         if (sp != null)
                         {
                             PresenceService.LogoutAgent(sp.ControllingClient.SessionId);
-                            sp.ControllingClient.Close();
+
+                            IncomingCloseAgent(sp.UUID, false);
                         }
 
                         // BANG! SLASH!
@@ -3244,8 +3269,6 @@ namespace OpenSim.Region.Framework.Scenes
         {
             //client.OnNameFromUUIDRequest += HandleUUIDNameRequest;
             client.OnMoneyTransferRequest += ProcessMoneyTransferRequest;
-            client.OnSetStartLocationRequest += SetHomeRezPoint;
-            client.OnRegionHandleRequest += RegionHandleRequest;
         }
         
         public virtual void SubscribeToClientNetworkEvents(IClientAPI client)
@@ -3371,8 +3394,6 @@ namespace OpenSim.Region.Framework.Scenes
         {
             //client.OnNameFromUUIDRequest -= HandleUUIDNameRequest;
             client.OnMoneyTransferRequest -= ProcessMoneyTransferRequest;
-            client.OnSetStartLocationRequest -= SetHomeRezPoint;
-            client.OnRegionHandleRequest -= RegionHandleRequest;
         }
 
         public virtual void UnSubscribeToClientNetworkEvents(IClientAPI client)
@@ -3498,33 +3519,6 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
-        /// Sets the Home Point.   The LoginService uses this to know where to put a user when they log-in
-        /// </summary>
-        /// <param name="remoteClient"></param>
-        /// <param name="regionHandle"></param>
-        /// <param name="position"></param>
-        /// <param name="lookAt"></param>
-        /// <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.");
-            else
-                m_dialogModule.SendAlertToUser(remoteClient, "Set Home request Failed.");
-        }
-
-        /// <summary>
         /// Get the avatar apperance for the given client.
         /// </summary>
         /// <param name="client"></param>
@@ -3548,63 +3542,69 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        /// <summary>
+        /// Remove the given client from the scene. 
+        /// </summary>
+        /// <remarks>
+        /// Only clientstack code should call this directly.  All other code should call IncomingCloseAgent() instead
+        /// to properly operate the state machine and avoid race conditions with other close requests (such as directly
+        /// from viewers).
+        /// </remarks>
+        /// <param name='agentID'>ID of agent to close</param>
+        /// <param name='closeChildAgents'>
+        /// Close the neighbour child agents associated with this client.
+        /// </param>
         public override void RemoveClient(UUID agentID, bool closeChildAgents)
         {
-//            CheckHeartbeat();
-            bool isChildAgent = false;
-            AgentCircuitData acd;
+            AgentCircuitData acd = m_authenticateHandler.GetAgentCircuitData(agentID);
 
-            lock (m_removeClientLock)
+            // Shouldn't be necessary since RemoveClient() is currently only called by IClientAPI.Close() which 
+            // in turn is only called by Scene.IncomingCloseAgent() which checks whether the presence exists or not
+            // However, will keep for now just in case.
+            if (acd == null)
             {
-                acd = m_authenticateHandler.GetAgentCircuitData(agentID);
+                m_log.ErrorFormat(
+                    "[SCENE]: No agent circuit found for {0} in {1}, aborting Scene.RemoveClient", agentID, Name);
 
-                if (acd == null)
-                {
-                    m_log.ErrorFormat("[SCENE]: No agent circuit found for {0}, aborting Scene.RemoveClient", agentID);
-                    return;
-                }
-                else
-                {
-                    // We remove the acd up here to avoid later race conditions if two RemoveClient() calls occurred
-                    // simultaneously.
-                    // We also need to remove by agent ID since NPCs will have no circuit code.
-                    m_authenticateHandler.RemoveCircuit(agentID);
-                }
+                return;
+            }
+            else
+            {
+                m_authenticateHandler.RemoveCircuit(agentID);
             }
 
+            // TODO: Can we now remove this lock?
             lock (acd)
-            {
+            {    
+                bool isChildAgent = false;
+
                 ScenePresence avatar = GetScenePresence(agentID);
-    
+ 
+                // Shouldn't be necessary since RemoveClient() is currently only called by IClientAPI.Close() which 
+                // in turn is only called by Scene.IncomingCloseAgent() which checks whether the presence exists or not
+                // However, will keep for now just in case.
                 if (avatar == null)
                 {
-                    m_log.WarnFormat(
+                    m_log.ErrorFormat(
                         "[SCENE]: Called RemoveClient() with agent ID {0} but no such presence is in the scene.", agentID);
     
                     return;
                 }
-    
+
                 try
                 {
                     isChildAgent = avatar.IsChildAgent;
 
                     m_log.DebugFormat(
                         "[SCENE]: Removing {0} agent {1} {2} from {3}",
-                        (isChildAgent ? "child" : "root"), avatar.Name, agentID, RegionInfo.RegionName);
+                        isChildAgent ? "child" : "root", avatar.Name, agentID, Name);
     
                     // Don't do this to root agents, it's not nice for the viewer
                     if (closeChildAgents && isChildAgent)
                     {
                         // Tell a single agent to disconnect from the region.
-                        IEventQueue eq = RequestModuleInterface<IEventQueue>();
-                        if (eq != null)
-                        {
-                            eq.DisableSimulator(RegionInfo.RegionHandle, avatar.UUID);
-                        }
-                        else
-                        {
-                            avatar.ControllingClient.SendShutdownConnectionNotice();
-                        }
+                        // Let's do this via UDP
+                        avatar.ControllingClient.SendShutdownConnectionNotice();
                     }
     
                     // Only applies to root agents.
@@ -3620,16 +3620,13 @@ namespace OpenSim.Region.Framework.Scenes
                     if (closeChildAgents && CapsModule != null)
                         CapsModule.RemoveCaps(agentID, avatar.ControllingClient.CircuitCode);
     
-//                    // REFACTORING PROBLEM -- well not really a problem, but just to point out that whatever
-//                    // this method is doing is HORRIBLE!!!
-                    // Commented pending deletion since this method no longer appears to do anything at all
-//                    avatar.Scene.NeedSceneCacheClear(avatar.UUID);
-    
                     if (closeChildAgents && !isChildAgent)
                     {
                         List<ulong> regions = avatar.KnownRegionHandles;
                         regions.Remove(RegionInfo.RegionHandle);
-                        m_sceneGridService.SendCloseChildAgentConnections(agentID, regions);
+
+                        // This ends up being done asynchronously so that a logout isn't held up where there are many present but unresponsive neighbours.
+                        m_sceneGridService.SendCloseChildAgentConnections(agentID, acd.SessionID.ToString(), regions);
                     }
     
                     m_eventManager.TriggerClientClosed(agentID, this);
@@ -3646,7 +3643,7 @@ namespace OpenSim.Region.Framework.Scenes
                             delegate(IClientAPI client)
                             {
                                 //We can safely ignore null reference exceptions.  It means the avatar is dead and cleaned up anyway
-                                try { client.SendKillObject(avatar.RegionHandle, new List<uint> { avatar.LocalId }); }
+                                try { client.SendKillObject(new List<uint> { avatar.LocalId }); }
                                 catch (NullReferenceException) { }
                             });
                     }
@@ -3727,7 +3724,8 @@ namespace OpenSim.Region.Framework.Scenes
                 }
                 deleteIDs.Add(localID);
             }
-            ForEachClient(delegate(IClientAPI client) { client.SendKillObject(m_regionHandle, deleteIDs); });
+
+            ForEachClient(c => c.SendKillObject(deleteIDs));
         }
 
         #endregion
@@ -3763,13 +3761,13 @@ namespace OpenSim.Region.Framework.Scenes
         /// is activated later when the viewer sends the initial UseCircuitCodePacket UDP packet (in the case of
         /// the LLUDP stack).
         /// </remarks>
-        /// <param name="agent">CircuitData of the agent who is connecting</param>
+        /// <param name="acd">CircuitData of the agent who is connecting</param>
         /// <param name="reason">Outputs the reason for the false response on this string</param>
         /// <param name="requirePresenceLookup">True for normal presence. False for NPC
         /// or other applications where a full grid/Hypergrid presence may not be required.</param>
         /// <returns>True if the region accepts this agent.  False if it does not.  False will 
         /// also return a reason.</returns>
-        public bool NewUserConnection(AgentCircuitData agent, uint teleportFlags, out string reason, bool requirePresenceLookup)
+        public bool NewUserConnection(AgentCircuitData acd, uint teleportFlags, out string reason, bool requirePresenceLookup)
         {
             bool vialogin = ((teleportFlags & (uint)TPFlags.ViaLogin) != 0 ||
                 (teleportFlags & (uint)TPFlags.ViaHGLogin) != 0);
@@ -3789,15 +3787,15 @@ namespace OpenSim.Region.Framework.Scenes
             m_log.DebugFormat(
                 "[SCENE]: Region {0} told of incoming {1} agent {2} {3} {4} (circuit code {5}, IP {6}, viewer {7}, teleportflags ({8}), position {9})",
                 RegionInfo.RegionName,
-                (agent.child ? "child" : "root"),
-                agent.firstname,
-                agent.lastname,
-                agent.AgentID,
-                agent.circuitcode,
-                agent.IPAddress,
-                agent.Viewer,
+                (acd.child ? "child" : "root"),
+                acd.firstname,
+                acd.lastname,
+                acd.AgentID,
+                acd.circuitcode,
+                acd.IPAddress,
+                acd.Viewer,
                 ((TPFlags)teleportFlags).ToString(),
-                agent.startpos
+                acd.startpos
             );
 
             if (!LoginsEnabled)
@@ -3815,7 +3813,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 foreach (string viewer in m_AllowedViewers)
                 {
-                    if (viewer == agent.Viewer.Substring(0, viewer.Length).Trim().ToLower())
+                    if (viewer == acd.Viewer.Substring(0, viewer.Length).Trim().ToLower())
                     {
                         ViewerDenied = false;
                         break;
@@ -3832,7 +3830,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 foreach (string viewer in m_BannedViewers)
                 {
-                    if (viewer == agent.Viewer.Substring(0, viewer.Length).Trim().ToLower())
+                    if (viewer == acd.Viewer.Substring(0, viewer.Length).Trim().ToLower())
                     {
                         ViewerDenied = true;
                         break;
@@ -3844,54 +3842,129 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 m_log.DebugFormat(
                     "[SCENE]: Access denied for {0} {1} using {2}",
-                    agent.firstname, agent.lastname, agent.Viewer);
+                    acd.firstname, acd.lastname, acd.Viewer);
                 reason = "Access denied, your viewer is banned by the region owner";
                 return false;
-            }           
+            }
 
-            ScenePresence sp = GetScenePresence(agent.AgentID);
+            ILandObject land;
+            ScenePresence sp;
 
-            // If we have noo presence here or if that presence is a zombie root
-            // presence that will be kicled, we need a new CAPS object.
-            if (sp == null || (sp != null && !sp.IsChildAgent))
+            lock (m_removeClientLock)
             {
-                if (CapsModule != null)
+                sp = GetScenePresence(acd.AgentID);
+
+                // We need to ensure that we are not already removing the scene presence before we ask it not to be 
+                // closed.
+                if (sp != null && sp.IsChildAgent 
+                    && (sp.LifecycleState == ScenePresenceState.Running 
+                        || sp.LifecycleState == ScenePresenceState.PreRemove))
                 {
-                    lock (agent)
+                    m_log.DebugFormat(
+                        "[SCENE]: Reusing existing child scene presence for {0}, state {1} in {2}", 
+                        sp.Name, sp.LifecycleState, Name);
+
+                    // In the case where, for example, an A B C D region layout, an avatar may
+                    // teleport from A -> D, but then -> C before A has asked B to close its old child agent.  When C
+                    // renews the lease on the child agent at B, we must make sure that the close from A does not succeed.
+                    //
+                    // XXX: In the end, this should not be necessary if child agents are closed without delay on 
+                    // teleport, since realistically, the close request should always be processed before any other
+                    // region tried to re-establish a child agent.  This is much simpler since the logic below is 
+                    // vulnerable to an issue when a viewer quits a region without sending a proper logout but then
+                    // re-establishes the connection on a relogin.  This could wrongly set the DoNotCloseAfterTeleport
+                    // flag when no teleport had taken place (and hence no close was going to come).
+//                    if (!acd.ChildrenCapSeeds.ContainsKey(RegionInfo.RegionHandle))
+//                    {
+//                        m_log.DebugFormat(
+//                            "[SCENE]: Setting DoNotCloseAfterTeleport for child scene presence {0} in {1} because source will attempt close.", 
+//                            sp.Name, Name);
+//
+//                        sp.DoNotCloseAfterTeleport = true;
+//                    }
+//                    else if (EntityTransferModule.IsInTransit(sp.UUID))
+
+                    sp.LifecycleState = ScenePresenceState.Running;
+
+                    if (EntityTransferModule.IsInTransit(sp.UUID))
                     {
-                        CapsModule.SetAgentCapsSeeds(agent);
-                        CapsModule.CreateCaps(agent.AgentID, agent.circuitcode);
+                        sp.DoNotCloseAfterTeleport = true;
+
+                        m_log.DebugFormat(
+                            "[SCENE]: Set DoNotCloseAfterTeleport for child scene presence {0} in {1} because this region will attempt end-of-teleport close from a previous close.", 
+                            sp.Name, Name);
                     }
                 }
             }
 
+            // Need to poll here in case we are currently deleting an sp.  Letting threads run over each other will
+            // allow unpredictable things to happen.
             if (sp != null)
             {
-                if (!sp.IsChildAgent)
+                const int polls = 10;
+                const int pollInterval = 1000;
+                int pollsLeft = polls;
+
+                while (sp.LifecycleState == ScenePresenceState.Removing && pollsLeft-- > 0)
+                    Thread.Sleep(pollInterval);
+
+                if (sp.LifecycleState == ScenePresenceState.Removing)
                 {
-                    // 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);
+                        "[SCENE]: Agent {0} in {1} was still being removed after {2}s.  Aborting NewUserConnection.", 
+                        sp.Name, Name, polls * pollInterval / 1000);
 
-                    sp.ControllingClient.Close(true, true);
-                    sp = null;
+                    return false;
+                }
+                else if (polls != pollsLeft)
+                {
+                    m_log.DebugFormat(
+                        "[SCENE]: NewUserConnection for agent {0} in {1} had to wait {2}s for in-progress removal to complete on an old presence.",
+                        sp.Name, Name, polls * pollInterval / 1000);
                 }
             }
 
-            lock (agent)
+            // TODO: can we remove this lock?
+            lock (acd)
             {
-                //On login test land permisions
+                if (sp != null && !sp.IsChildAgent)
+                {
+                    // We have a root agent. Is it in transit?
+                    if (!EntityTransferModule.IsInTransit(sp.UUID))
+                    {
+                        // 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);
+
+                        if (sp.ControllingClient != null)
+                            IncomingCloseAgent(sp.UUID, true);
+
+                        sp = null;
+                    }
+                    //else
+                    //    m_log.WarnFormat("[SCENE]: Existing root scene presence for {0} {1} in {2}, but agent is in trasit", sp.Name, sp.UUID, RegionInfo.RegionName);
+                }
+
+                // Optimistic: add or update the circuit data with the new agent circuit data and teleport flags.
+                // We need the circuit data here for some of the subsequent checks. (groups, for example)
+                // If the checks fail, we remove the circuit.
+                acd.teleportFlags = teleportFlags;
+                m_authenticateHandler.AddNewCircuit(acd.circuitcode, acd);
+
+                land = LandChannel.GetLandObject(acd.startpos.X, acd.startpos.Y);
+    
+                // On login test land permisions
                 if (vialogin)
                 {
                     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))
+                        cache.Remove(acd.firstname + " " + acd.lastname);
+                    if (land != null && !TestLandRestrictions(acd.AgentID, out reason, ref acd.startpos.X, ref acd.startpos.Y))
                     {
-                        m_log.DebugFormat("[CONNECTION BEGIN]: Denying access to {0} due to no land access", agent.AgentID.ToString());
+                        m_authenticateHandler.RemoveCircuit(acd.circuitcode);
                         return false;
                     }
                 }
@@ -3902,40 +3975,49 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         try
                         {
-                            if (!VerifyUserPresence(agent, out reason))
+                            if (!VerifyUserPresence(acd, out reason))
+                            {
+                                m_authenticateHandler.RemoveCircuit(acd.circuitcode);
                                 return false;
-                        } catch (Exception e)
+                            }
+                        }
+                        catch (Exception e)
                         {
                             m_log.ErrorFormat(
                                 "[SCENE]: Exception verifying presence {0}{1}", e.Message, e.StackTrace);
+
+                            m_authenticateHandler.RemoveCircuit(acd.circuitcode);
                             return false;
                         }
                     }
 
                     try
                     {
-                        // Always check estate if this is a login. Always
-                        // check if banned regions are to be blacked out.
-                        if (vialogin || (!m_seeIntoBannedRegion))
+                        if (!AuthorizeUser(acd, (vialogin ? false : SeeIntoRegion), out reason))
                         {
-                            if (!AuthorizeUser(agent, out reason))
-                            {
-                                return false;
-                            }
+                            m_authenticateHandler.RemoveCircuit(acd.circuitcode);
+                            return false;
                         }
                     }
                     catch (Exception e)
                     {
                         m_log.ErrorFormat(
                             "[SCENE]: Exception authorizing user {0}{1}", e.Message, e.StackTrace);
+
+                        m_authenticateHandler.RemoveCircuit(acd.circuitcode);
                         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);
-
+                        Name, (acd.child ? "child" : "root"), acd.firstname, acd.lastname,
+                        acd.AgentID, acd.circuitcode);
+    
+                    if (CapsModule != null)
+                    {
+                        CapsModule.SetAgentCapsSeeds(acd);
+                        CapsModule.CreateCaps(acd.AgentID, acd.circuitcode);
+                    }
                 }
                 else
                 {
@@ -3943,43 +4025,60 @@ namespace OpenSim.Region.Framework.Scenes
                     // uses down the line.
                     sp.TeleportFlags = (TPFlags)teleportFlags;
 
+                    // We must carry out a further authorization check if there's an 
+                    // attempt to make a child agent into a root agent, since SeeIntoRegion may have allowed a child
+                    // agent to login to a region where a full avatar would not be allowed.
+                    //
+                    // We determine whether this is a CreateAgent for a future non-child agent by inspecting 
+                    // TeleportFlags, which will be default for a child connection.  This relies on input from the source
+                    // region.
+                    if (sp.TeleportFlags != TPFlags.Default)
+                    {
+                        if (!AuthorizeUser(acd, false, out reason))
+                            return false;
+                    }
+    
                     if (sp.IsChildAgent)
                     {
                         m_log.DebugFormat(
                             "[SCENE]: Adjusting known seeds for existing agent {0} in {1}",
-                            agent.AgentID, RegionInfo.RegionName);
-
+                            acd.AgentID, RegionInfo.RegionName);
+    
                         sp.AdjustKnownSeeds();
 
                         if (CapsModule != null)
-                            CapsModule.SetAgentCapsSeeds(agent);
+                        {
+                            CapsModule.SetAgentCapsSeeds(acd);
+                            CapsModule.CreateCaps(acd.AgentID, acd.circuitcode);
+                        }
                     }
                 }
-            }
 
-            // In all cases, add or update the circuit data with the new agent circuit data and teleport flags
-            agent.teleportFlags = teleportFlags;
-            m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
+                // Try caching an incoming user name much earlier on to see if this helps with an issue
+                // where HG users are occasionally seen by others as "Unknown User" because their UUIDName
+                // request for the HG avatar appears to trigger before the user name is cached.
+                CacheUserName(null, acd);
+            }
 
             if (CapsModule != null)
             {
-                CapsModule.ActivateCaps(agent.circuitcode);
+                CapsModule.ActivateCaps(acd.circuitcode);
             }
 
             if (vialogin)
             {
 //                CleanDroppedAttachments();
 
-                if (TestBorderCross(agent.startpos, Cardinals.E))
+                if (TestBorderCross(acd.startpos, Cardinals.E))
                 {
-                    Border crossedBorder = GetCrossedBorder(agent.startpos, Cardinals.E);
-                    agent.startpos.X = crossedBorder.BorderLine.Z - 1;
+                    Border crossedBorder = GetCrossedBorder(acd.startpos, Cardinals.E);
+                    acd.startpos.X = crossedBorder.BorderLine.Z - 1;
                 }
 
-                if (TestBorderCross(agent.startpos, Cardinals.N))
+                if (TestBorderCross(acd.startpos, Cardinals.N))
                 {
-                    Border crossedBorder = GetCrossedBorder(agent.startpos, Cardinals.N);
-                    agent.startpos.Y = crossedBorder.BorderLine.Z - 1;
+                    Border crossedBorder = GetCrossedBorder(acd.startpos, Cardinals.N);
+                    acd.startpos.Y = crossedBorder.BorderLine.Z - 1;
                 }
 
                 //Mitigate http://opensimulator.org/mantis/view.php?id=3522
@@ -3989,39 +4088,39 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     lock (EastBorders)
                     {
-                        if (agent.startpos.X > EastBorders[0].BorderLine.Z)
+                        if (acd.startpos.X > EastBorders[0].BorderLine.Z)
                         {
                             m_log.Warn("FIX AGENT POSITION");
-                            agent.startpos.X = EastBorders[0].BorderLine.Z * 0.5f;
-                            if (agent.startpos.Z > 720)
-                                agent.startpos.Z = 720;
+                            acd.startpos.X = EastBorders[0].BorderLine.Z * 0.5f;
+                            if (acd.startpos.Z > 720)
+                                acd.startpos.Z = 720;
                         }
                     }
                     lock (NorthBorders)
                     {
-                        if (agent.startpos.Y > NorthBorders[0].BorderLine.Z)
+                        if (acd.startpos.Y > NorthBorders[0].BorderLine.Z)
                         {
                             m_log.Warn("FIX Agent POSITION");
-                            agent.startpos.Y = NorthBorders[0].BorderLine.Z * 0.5f;
-                            if (agent.startpos.Z > 720)
-                                agent.startpos.Z = 720;
+                            acd.startpos.Y = NorthBorders[0].BorderLine.Z * 0.5f;
+                            if (acd.startpos.Z > 720)
+                                acd.startpos.Z = 720;
                         }
                     }
                 } else
                 {
-                    if (agent.startpos.X > EastBorders[0].BorderLine.Z)
+                    if (acd.startpos.X > EastBorders[0].BorderLine.Z)
                     {
                         m_log.Warn("FIX AGENT POSITION");
-                        agent.startpos.X = EastBorders[0].BorderLine.Z * 0.5f;
-                        if (agent.startpos.Z > 720)
-                            agent.startpos.Z = 720;
+                        acd.startpos.X = EastBorders[0].BorderLine.Z * 0.5f;
+                        if (acd.startpos.Z > 720)
+                            acd.startpos.Z = 720;
                     }
-                    if (agent.startpos.Y > NorthBorders[0].BorderLine.Z)
+                    if (acd.startpos.Y > NorthBorders[0].BorderLine.Z)
                     {
                         m_log.Warn("FIX Agent POSITION");
-                        agent.startpos.Y = NorthBorders[0].BorderLine.Z * 0.5f;
-                        if (agent.startpos.Z > 720)
-                            agent.startpos.Z = 720;
+                        acd.startpos.Y = NorthBorders[0].BorderLine.Z * 0.5f;
+                        if (acd.startpos.Z > 720)
+                            acd.startpos.Z = 720;
                     }
                 }
 
@@ -4037,12 +4136,12 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         // We have multiple SpawnPoints, Route the agent to a random or sequential one
                         if (SpawnPointRouting == "random")
-                            agent.startpos = spawnpoints[Util.RandomClass.Next(spawnpoints.Count) - 1].GetLocation(
+                            acd.startpos = spawnpoints[Util.RandomClass.Next(spawnpoints.Count) - 1].GetLocation(
                                 telehub.AbsolutePosition,
                                 telehub.GroupRotation
                             );
                         else
-                            agent.startpos = spawnpoints[SpawnPoint()].GetLocation(
+                            acd.startpos = spawnpoints[SpawnPoint()].GetLocation(
                                 telehub.AbsolutePosition,
                                 telehub.GroupRotation
                             );
@@ -4050,7 +4149,7 @@ namespace OpenSim.Region.Framework.Scenes
                     else
                     {
                         // We have a single SpawnPoint and will route the agent to it
-                        agent.startpos = spawnpoints[0].GetLocation(telehub.AbsolutePosition, telehub.GroupRotation);
+                        acd.startpos = spawnpoints[0].GetLocation(telehub.AbsolutePosition, telehub.GroupRotation);
                     }
 
                     return true;
@@ -4063,7 +4162,7 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     if (land.LandData.LandingType == (byte)1 && land.LandData.UserLocation != Vector3.Zero)
                     {
-                        agent.startpos = land.LandData.UserLocation;
+                        acd.startpos = land.LandData.UserLocation;
                     }
                 }
                 */// This is now handled properly in ScenePresence.MakeRootAgent
@@ -4158,7 +4257,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="reason">outputs the reason to this string</param>
         /// <returns>True if the region accepts this agent.  False if it does not.  False will 
         /// also return a reason.</returns>
-        protected virtual bool AuthorizeUser(AgentCircuitData agent, out string reason)
+        protected virtual bool AuthorizeUser(AgentCircuitData agent, bool bypassAccessControl, out string reason)
         {
             reason = String.Empty;
 
@@ -4177,67 +4276,75 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
 
-            if (RegionInfo.EstateSettings != null)
+            // We only test the things below when we want to cut off
+            // child agents from being present in the scene for which their root
+            // agent isn't allowed. Otherwise, we allow child agents. The test for
+            // the root is done elsewhere (QueryAccess)
+            if (!bypassAccessControl)
             {
-                if (RegionInfo.EstateSettings.IsBanned(agent.AgentID, 0))
+                if (RegionInfo.EstateSettings != null)
                 {
-                    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);
-                    reason = String.Format("Denied access to region {0}: You have been banned from that region.",
-                                           RegionInfo.RegionName);
-                    return false;
+                    int flags = GetUserFlags(agent.AgentID);
+                    if (RegionInfo.EstateSettings.IsBanned(agent.AgentID, flags))
+                    {
+                        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);
+                        reason = String.Format("Denied access to region {0}: You have been banned from that region.",
+                                               RegionInfo.RegionName);
+                        return false;
+                    }
                 }
-            }
-            else
-            {
-                m_log.ErrorFormat("[CONNECTION BEGIN]: Estate Settings is null!");
-            }
-
-            List<UUID> agentGroups = new List<UUID>();
-
-            if (m_groupsModule != null)
-            {
-                GroupMembershipData[] GroupMembership = m_groupsModule.GetMembershipData(agent.AgentID);
-
-                if (GroupMembership != null)
+                else
                 {
-                    for (int i = 0; i < GroupMembership.Length; i++)
-                        agentGroups.Add(GroupMembership[i].GroupID);
+                    m_log.ErrorFormat("[CONNECTION BEGIN]: Estate Settings is null!");
                 }
-                else
+
+                List<UUID> agentGroups = new List<UUID>();
+
+                if (m_groupsModule != null)
                 {
-                    m_log.ErrorFormat("[CONNECTION BEGIN]: GroupMembership is null!");
+                    GroupMembershipData[] GroupMembership = m_groupsModule.GetMembershipData(agent.AgentID);
+
+                    if (GroupMembership != null)
+                    {
+                        for (int i = 0; i < GroupMembership.Length; i++)
+                            agentGroups.Add(GroupMembership[i].GroupID);
+                    }
+                    else
+                    {
+                        m_log.ErrorFormat("[CONNECTION BEGIN]: GroupMembership is null!");
+                    }
                 }
-            }
 
-            bool groupAccess = false;
-            UUID[] estateGroups = RegionInfo.EstateSettings.EstateGroups;
+                bool groupAccess = false;
+                UUID[] estateGroups = RegionInfo.EstateSettings.EstateGroups;
 
-            if (estateGroups != null)
-            {
-                foreach (UUID group in estateGroups)
+                if (estateGroups != null)
                 {
-                    if (agentGroups.Contains(group))
+                    foreach (UUID group in estateGroups)
                     {
-                        groupAccess = true;
-                        break;
+                        if (agentGroups.Contains(group))
+                        {
+                            groupAccess = true;
+                            break;
+                        }
                     }
                 }
-            }
-            else
-            {
-                m_log.ErrorFormat("[CONNECTION BEGIN]: EstateGroups is null!");
-            }
+                else
+                {
+                    m_log.ErrorFormat("[CONNECTION BEGIN]: EstateGroups is null!");
+                }
 
-            if (!RegionInfo.EstateSettings.PublicAccess &&
-                !RegionInfo.EstateSettings.HasAccess(agent.AgentID) &&
-                !groupAccess)
-            {
-                m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user does not have access to the estate",
-                                 agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName);
-                reason = String.Format("Denied access to private region {0}: You are not on the access list for that region.",
-                                       RegionInfo.RegionName);
-                return false;
+                if (!RegionInfo.EstateSettings.PublicAccess &&
+                    !RegionInfo.EstateSettings.HasAccess(agent.AgentID) &&
+                    !groupAccess)
+                {
+                    m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user does not have access to the estate",
+                                     agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName);
+                    reason = String.Format("Denied access to private region {0}: You are not on the access list for that region.",
+                                           RegionInfo.RegionName);
+                    return false;
+                }
             }
 
             // TODO: estate/region settings are not properly hooked up
@@ -4367,8 +4474,6 @@ namespace OpenSim.Region.Framework.Scenes
             m_log.DebugFormat(
                 "[SCENE]: Incoming child agent update for {0} in {1}", cAgentData.AgentID, RegionInfo.RegionName);
 
-            // 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);
@@ -4390,13 +4495,39 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             // We have to wait until the viewer contacts this region
-            // after receiving the EnableSimulator HTTP Event Queue message.  This triggers the viewer to send
+            // after receiving the EnableSimulator HTTP Event Queue message (for the v1 teleport protocol) 
+            // or TeleportFinish (for the v2 teleport protocol).  This triggers the viewer to send
             // a UseCircuitCode packet which in turn calls AddNewClient which finally creates the ScenePresence.
-            ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID);
+            ScenePresence sp = WaitGetScenePresence(cAgentData.AgentID);
 
-            if (childAgentUpdate != null)
+            if (sp != null)
             {
-                childAgentUpdate.ChildAgentDataUpdate(cAgentData);
+                if (cAgentData.SessionID != sp.ControllingClient.SessionId)
+                {
+                    m_log.WarnFormat(
+                        "[SCENE]: Attempt to update agent {0} with invalid session id {1} (possibly from simulator in older version; tell them to update).", 
+                        sp.UUID, cAgentData.SessionID);
+
+                    Console.WriteLine(String.Format("[SCENE]: Attempt to update agent {0} ({1}) with invalid session id {2}", 
+                        sp.UUID, sp.ControllingClient.SessionId, cAgentData.SessionID));
+                }
+
+                sp.ChildAgentDataUpdate(cAgentData);
+
+                int ntimes = 20;
+                if (cAgentData.SenderWantsToWaitForRoot)
+                {
+                    while (sp.IsChildAgent && ntimes-- > 0)
+                        Thread.Sleep(1000);
+
+                    m_log.DebugFormat(
+                        "[SCENE]: Found presence {0} {1} {2} in {3} after {4} waits",
+                        sp.Name, sp.UUID, sp.IsChildAgent ? "child" : "root", Name, 20 - ntimes);
+
+                    if (sp.IsChildAgent)
+                        return false;
+                }
+
                 return true;
             }
 
@@ -4415,6 +4546,11 @@ namespace OpenSim.Region.Framework.Scenes
             ScenePresence childAgentUpdate = GetScenePresence(cAgentData.AgentID);
             if (childAgentUpdate != null)
             {
+//                if (childAgentUpdate.ControllingClient.SessionId != cAgentData.SessionID)
+//                    // Only warn for now
+//                    m_log.WarnFormat("[SCENE]: Attempt at updating position of agent {0} with invalid session id {1}. Neighbor running older version?", 
+//                        childAgentUpdate.UUID, cAgentData.SessionID);
+
                 // I can't imagine *yet* why we would get an update if the agent is a root agent..
                 // however to avoid a race condition crossing borders..
                 if (childAgentUpdate.IsChildAgent)
@@ -4451,10 +4587,6 @@ namespace OpenSim.Region.Framework.Scenes
                 m_log.WarnFormat(
                     "[SCENE PRESENCE]: Did not find presence with id {0} in {1} before timeout",
                     agentID, RegionInfo.RegionName);
-//            else
-//                m_log.DebugFormat(
-//                    "[SCENE PRESENCE]: Found presence {0} {1} {2} in {3} after {4} waits",
-//                    sp.Name, sp.UUID, sp.IsChildAgent ? "child" : "root", RegionInfo.RegionName, 10 - ntimes);
 
             return sp;
         }
@@ -4471,6 +4603,42 @@ namespace OpenSim.Region.Framework.Scenes
 
             return false;
         }
+        /// <summary>
+        /// Authenticated close (via network)
+        /// </summary>
+        /// <param name="agentID"></param>
+        /// <param name="force"></param>
+        /// <param name="auth_token"></param>
+        /// <returns></returns>
+        public bool IncomingCloseAgent(UUID agentID, bool force, string auth_token)
+        {
+            //m_log.DebugFormat("[SCENE]: Processing incoming close agent {0} in region {1} with auth_token {2}", agentID, RegionInfo.RegionName, auth_token);
+
+            // Check that the auth_token is valid
+            AgentCircuitData acd = AuthenticateHandler.GetAgentCircuitData(agentID);
+
+            if (acd == null)
+            {
+                m_log.DebugFormat(
+                    "[SCENE]: Request to close agent {0} but no such agent in scene {1}.  May have been closed previously.", 
+                    agentID, Name);
+
+                return false;
+            }
+
+            if (acd.SessionID.ToString() == auth_token)
+            {
+                return IncomingCloseAgent(agentID, force);
+            }
+            else
+            {
+                m_log.WarnFormat(
+                    "[SCENE]: Request to close agent {0} with invalid authorization token {1} in {2}", 
+                    agentID, auth_token, Name);
+            }
+
+            return false;
+        }
 
         public bool IncomingCloseAgent(UUID agentID)
         {
@@ -4483,6 +4651,50 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
+        /// Tell a single agent to prepare to close.
+        /// </summary>
+        /// <remarks>
+        /// This should only be called if we may close the agent but there will be some delay in so doing.  Meant for
+        /// internal use - other callers should almost certainly called IncomingCloseAgent().
+        /// </remarks>
+        /// <param name="sp"></param>
+        /// <returns>true if pre-close state notification was successful.  false if the agent
+        /// was not in a state where it could transition to pre-close.</returns>
+        public bool IncomingPreCloseAgent(ScenePresence sp)
+        {
+            lock (m_removeClientLock)
+            {
+                // We need to avoid a race condition where in, for example, an A B C D region layout, an avatar may
+                // teleport from A -> D, but then -> C before A has asked B to close its old child agent.  We do not
+                // want to obey this close since C may have renewed the child agent lease on B.
+                if (sp.DoNotCloseAfterTeleport)
+                {
+                    m_log.DebugFormat(
+                        "[SCENE]: Not pre-closing {0} agent {1} in {2} since another simulator has re-established the child connection",
+                        sp.IsChildAgent ? "child" : "root", sp.Name, Name);
+
+                    // Need to reset the flag so that a subsequent close after another teleport can succeed.
+                    sp.DoNotCloseAfterTeleport = false;
+
+                    return false;
+                }
+
+                if (sp.LifecycleState != ScenePresenceState.Running)
+                {
+                    m_log.DebugFormat(
+                        "[SCENE]: Called IncomingPreCloseAgent() for {0} in {1} but presence is already in state {2}",
+                        sp.Name, Name, sp.LifecycleState);
+
+                    return false;
+                }
+
+                sp.LifecycleState = ScenePresenceState.PreRemove;
+
+                return true;
+            }
+        }
+
+        /// <summary>
         /// Tell a single agent to disconnect from the region.
         /// </summary>
         /// <param name="agentID"></param>
@@ -4492,16 +4704,55 @@ namespace OpenSim.Region.Framework.Scenes
         /// </param>
         public bool IncomingCloseAgent(UUID agentID, bool force)
         {
-            //m_log.DebugFormat("[SCENE]: Processing incoming close agent for {0}", agentID);
+            ScenePresence sp;
 
-            ScenePresence presence = m_sceneGraph.GetScenePresence(agentID);
-            if (presence != null)
+            lock (m_removeClientLock)
+            {
+                sp = GetScenePresence(agentID);
+    
+                if (sp == null)
+                {
+                    m_log.DebugFormat(
+                        "[SCENE]: Called IncomingCloseAgent() with agent ID {0} but no such presence is in {1}", 
+                        agentID, Name);
+    
+                    return false;
+                }
+
+                if (sp.LifecycleState != ScenePresenceState.Running && sp.LifecycleState != ScenePresenceState.PreRemove)
+                {
+                    m_log.DebugFormat(
+                        "[SCENE]: Called IncomingCloseAgent() for {0} in {1} but presence is already in state {2}",
+                        sp.Name, Name, sp.LifecycleState);
+
+                    return false;
+                }
+
+                // We need to avoid a race condition where in, for example, an A B C D region layout, an avatar may
+                // teleport from A -> D, but then -> C before A has asked B to close its old child agent.  We do not
+                // want to obey this close since C may have renewed the child agent lease on B.
+                if (sp.DoNotCloseAfterTeleport)
+                {
+                    m_log.DebugFormat(
+                        "[SCENE]: Not closing {0} agent {1} in {2} since another simulator has re-established the child connection",
+                        sp.IsChildAgent ? "child" : "root", sp.Name, Name);
+
+                    // Need to reset the flag so that a subsequent close after another teleport can succeed.
+                    sp.DoNotCloseAfterTeleport = false;
+
+                    return false;
+                }
+
+                sp.LifecycleState = ScenePresenceState.Removing;
+            }
+
+            if (sp != null)
             {
-                presence.ControllingClient.Close(force, force);
+                sp.ControllingClient.Close(force, force);
                 return true;
             }
 
-            // Agent not here
+            // Agent not here 
             return false;
         }
 
@@ -5091,21 +5342,6 @@ namespace OpenSim.Region.Framework.Scenes
 
         #endregion
 
-        public void RegionHandleRequest(IClientAPI client, UUID regionID)
-        {
-            ulong handle = 0;
-            if (regionID == RegionInfo.RegionID)
-                handle = RegionInfo.RegionHandle;
-            else
-            {
-                GridRegion r = GridService.GetRegionByUUID(UUID.Zero, regionID);
-                if (r != null)
-                    handle = r.RegionHandle;
-            }
-
-            if (handle != 0)
-                client.SendRegionHandle(regionID, handle);
-        }
 
 // Commented pending deletion since this method no longer appears to do anything at all
 //        public bool NeedSceneCacheClear(UUID agentID)
@@ -5657,12 +5893,12 @@ Environment.Exit(1);
            List<SceneObjectGroup> objects, 
            out float minX, out float maxX, out float minY, out float maxY, out float minZ, out float maxZ)
         {
-            minX = 256;
-            maxX = -256;
-            minY = 256;
-            maxY = -256;
-            minZ = 8192;
-            maxZ = -256;
+            minX = float.MaxValue;
+            maxX = float.MinValue;
+            minY = float.MaxValue;
+            maxY = float.MinValue;
+            minZ = float.MaxValue;
+            maxZ = float.MinValue;
 
             List<Vector3> offsets = new List<Vector3>();
 
@@ -5802,17 +6038,6 @@ Environment.Exit(1);
         {
             reason = "You are banned from the region";
 
-            if (EntityTransferModule.IsInTransit(agentID))
-            {
-                reason = "Agent is still in transit from this region";
-
-                m_log.WarnFormat(
-                    "[SCENE]: Denying agent {0} entry into {1} since region still has them registered as in transit",
-                    agentID, RegionInfo.RegionName);
-
-                return false;
-            }
-
             if (Permissions.IsGod(agentID))
             {
                 reason = String.Empty;
@@ -5862,9 +6087,9 @@ Environment.Exit(1);
 
             try
             {
-                if (!AuthorizeUser(aCircuit, out reason))
+                if (!AuthorizeUser(aCircuit, false, out reason))
                 {
-                    // m_log.DebugFormat("[SCENE]: Denying access for {0}", agentID);
+                    //m_log.DebugFormat("[SCENE]: Denying access for {0}", agentID);
                     return false;
                 }
             }
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 74c9582..1dac676 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -218,6 +218,19 @@ namespace OpenSim.Region.Framework.Scenes
         #region Add/Remove Agent/Avatar
 
         public abstract ISceneAgent AddNewClient(IClientAPI client, PresenceType type);
+
+        /// <summary>
+        /// Remove the given client from the scene. 
+        /// </summary>
+        /// <remarks>
+        /// Only clientstack code should call this directly.  All other code should call IncomingCloseAgent() instead
+        /// to properly operate the state machine and avoid race conditions with other close requests (such as directly
+        /// from viewers).
+        /// </remarks>
+        /// <param name='agentID'>ID of agent to close</param>
+        /// <param name='closeChildAgents'>
+        /// Close the neighbour child agents associated with this client.
+        /// </param>
         public abstract void RemoveClient(UUID agentID, bool closeChildAgents);
 
         public bool TryGetScenePresence(UUID agentID, out object scenePresence)
@@ -562,6 +575,10 @@ namespace OpenSim.Region.Framework.Scenes
             get { return false; }
         }
 
+        public virtual void Start()
+        {
+        }
+
         public void Restart()
         {
             // This has to be here to fire the event
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 775a4c2..52f46f2 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -200,7 +200,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// This Closes child agents on neighboring regions
         /// Calls an asynchronous method to do so..  so it doesn't lag the sim.
         /// </summary>
-        protected void SendCloseChildAgentAsync(UUID agentID, ulong regionHandle)
+        protected void SendCloseChildAgent(UUID agentID, ulong regionHandle, string auth_token)
         {
             // let's do our best, but there's not much we can do if the neighbour doesn't accept.
 
@@ -209,23 +209,25 @@ 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);
-        }
 
-        private void SendCloseChildAgentCompleted(IAsyncResult iar)
-        {
-            SendCloseChildAgentDelegate icon = (SendCloseChildAgentDelegate)iar.AsyncState;
-            icon.EndInvoke(iar);
+            m_log.DebugFormat(
+                "[SCENE COMMUNICATION SERVICE]: Sending close agent ID {0} to {1}", agentID, destination.RegionName);
+
+            m_scene.SimulationService.CloseAgent(destination, agentID, auth_token);
         }
 
-        public void SendCloseChildAgentConnections(UUID agentID, List<ulong> regionslst)
+        /// <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, string auth_code, List<ulong> regionslst)
         {
             foreach (ulong handle in regionslst)
             {
-                SendCloseChildAgentDelegate d = SendCloseChildAgentAsync;
-                d.BeginInvoke(agentID, handle,
-                              SendCloseChildAgentCompleted,
-                              d);
+                ulong handleCopy = handle;
+                Util.FireAndForget((o) => { SendCloseChildAgent(agentID, handleCopy, auth_code); });
             }
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index e599e90..b0f8991 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -631,40 +631,16 @@ namespace OpenSim.Region.Framework.Scenes
         protected internal ScenePresence CreateAndAddChildScenePresence(
             IClientAPI client, AvatarAppearance appearance, PresenceType type)
         {
-            ScenePresence newAvatar = null;
-
             // ScenePresence always defaults to child agent
-            newAvatar = new ScenePresence(client, m_parentScene, appearance, type);
-
-            AddScenePresence(newAvatar);
-
-            return newAvatar;
-        }
-
-        /// <summary>
-        /// Add a presence to the scene
-        /// </summary>
-        /// <param name="presence"></param>
-        protected internal void AddScenePresence(ScenePresence presence)
-        {
-            // Always a child when added to the scene
-            bool child = presence.IsChildAgent;
-
-            if (child)
-            {
-                m_numChildAgents++;
-            }
-            else
-            {
-                m_numRootAgents++;
-                presence.AddToPhysicalScene(false);
-            }
+            ScenePresence presence = new ScenePresence(client, m_parentScene, appearance, type);
 
             Entities[presence.UUID] = presence;
 
             m_scenePresencesLock.EnterWriteLock();
             try
             {
+                m_numChildAgents++;
+
                 Dictionary<UUID, ScenePresence> newmap = new Dictionary<UUID, ScenePresence>(m_scenePresenceMap);
                 List<ScenePresence> newlist = new List<ScenePresence>(m_scenePresenceArray);
 
@@ -675,7 +651,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
                 else
                 {
-                    // Remember the old presene reference from the dictionary
+                    // Remember the old presence reference from the dictionary
                     ScenePresence oldref = newmap[presence.UUID];
                     // Replace the presence reference in the dictionary with the new value
                     newmap[presence.UUID] = presence;
@@ -691,6 +667,8 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 m_scenePresencesLock.ExitWriteLock();
             }
+
+            return presence;
         }
 
         /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index c70342f..c5c083a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -420,29 +420,6 @@ namespace OpenSim.Region.Framework.Scenes
             return false;
         }
 
-        /// <summary>
-        /// Set the debug packet level on each current scene.  This level governs which packets are printed out to the
-        /// console.
-        /// </summary>
-        /// <param name="newDebug"></param>
-        /// <param name="name">Name of avatar to debug</param>
-        public void SetDebugPacketLevelOnCurrentScene(int newDebug, string name)
-        {
-            ForEachSelectedScene(scene =>
-                scene.ForEachScenePresence(sp =>
-                {
-                    if (name == null || sp.Name == name)
-                    {
-                        m_log.DebugFormat(
-                            "Packet debug for {0} ({1}) set to {2}",
-                            sp.Name, sp.IsChildAgent ? "child" : "root", newDebug);
-
-                        sp.ControllingClient.DebugPacketLevel = newDebug;
-                    }
-                })
-            );
-        }
-
         public List<ScenePresence> GetCurrentSceneAvatars()
         {
             List<ScenePresence> avatars = new List<ScenePresence>();
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index f8624e7..8c50a81 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -67,6 +67,12 @@ namespace OpenSim.Region.Framework.Scenes
         {
             int scriptsStarted = 0;
 
+            if (m_scene == null)
+            {
+                m_log.DebugFormat("[PRIM INVENTORY]: m_scene is null. Unable to create script instances");
+                return 0;
+            }
+
             // Don't start scripts if they're turned off in the region!
             if (!m_scene.RegionInfo.RegionSettings.DisableScripts)
             {
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 3e1dcaa..6deb870 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1868,11 +1868,11 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// Delete this group from its scene.
         /// </summary>
-        /// 
+        /// <remarks>
         /// This only handles the in-world consequences of deletion (e.g. any avatars sitting on it are forcibly stood
         /// up and all avatars receive notification of its removal.  Removal of the scene object from database backup
         /// must be handled by the caller.
-        /// 
+        /// </remarks>
         /// <param name="silent">If true then deletion is not broadcast to clients</param>
         public void DeleteGroupFromScene(bool silent)
         {
@@ -1886,10 +1886,10 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 SceneObjectPart part = parts[i];
 
-                Scene.ForEachRootScenePresence(delegate(ScenePresence avatar)
+                Scene.ForEachScenePresence(sp =>
                 {
-                    if (avatar.ParentID == LocalId)
-                        avatar.StandUp();
+                    if (!sp.IsChildAgent && sp.ParentID == LocalId)
+                        sp.StandUp();
 
                     if (!silent)
                     {
@@ -1897,9 +1897,9 @@ namespace OpenSim.Region.Framework.Scenes
                         if (part == m_rootPart)
                         {
                             if (!IsAttachment
-                                || AttachedAvatar == avatar.ControllingClient.AgentId
+                                || AttachedAvatar == sp.UUID
                                 || !HasPrivateAttachmentPoint)
-                                avatar.ControllingClient.SendKillObject(m_regionHandle, new List<uint> { part.LocalId });
+                                sp.ControllingClient.SendKillObject(new List<uint> { part.LocalId });
                         }
                     }
                 });
@@ -2208,7 +2208,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (!userExposed)
                 dupe.IsAttachment = true;
 
-            dupe.AbsolutePosition = new Vector3(AbsolutePosition.X, AbsolutePosition.Y, AbsolutePosition.Z);
+            dupe.m_sittingAvatars = new List<UUID>();
 
             if (!userExposed)
             {
@@ -3811,20 +3811,23 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// Update just the root prim position in a linkset
         /// </summary>
-        /// <param name="pos"></param>
-        public void UpdateRootPosition(Vector3 pos)
+        /// <param name="newPos"></param>
+        public void UpdateRootPosition(Vector3 newPos)
         {
             // 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,
-                              AbsolutePosition.Y + m_rootPart.OffsetPosition.Y,
-                              AbsolutePosition.Z + m_rootPart.OffsetPosition.Z);
+            Vector3 oldPos;
+
+            // FIXME: This improves the situation where editing just the root prim of an attached object would send
+            // all the other parts to oblivion after detach/reattach.  However, a problem remains since the root prim
+            // still ends up in the wrong position on reattach.
+            if (IsAttachment)
+                oldPos = RootPart.OffsetPosition;
+            else
+                oldPos = AbsolutePosition + RootPart.OffsetPosition;
+
             Vector3 diff = oldPos - newPos;
-            Vector3 axDiff = new Vector3(diff.X, diff.Y, diff.Z);
             Quaternion partRotation = m_rootPart.RotationOffset;
-            axDiff *= Quaternion.Inverse(partRotation);
-            diff = axDiff;
+            diff *= Quaternion.Inverse(partRotation);
 
             SceneObjectPart[] parts = m_parts.GetArray();
             for (int i = 0; i < parts.Length; i++)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 261e958..cf03d7c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -231,6 +231,13 @@ namespace OpenSim.Region.Framework.Scenes
 
         public double SoundRadius;
 
+        /// <summary>
+        /// Should sounds played from this prim be queued?
+        /// </summary>
+        /// <remarks>
+        /// This should only be changed by sound modules.  It is up to sound modules as to how they interpret this setting.
+        /// </remarks>
+        public bool SoundQueueing { get; set; }
 
         public uint TimeStampFull;
 
@@ -383,8 +390,6 @@ namespace OpenSim.Region.Framework.Scenes
 
         private SOPVehicle m_vehicleParams = null;
 
-        private KeyframeMotion m_keyframeMotion = null;
-
         public KeyframeMotion KeyframeMotion
         {
             get; set;
@@ -536,7 +541,11 @@ namespace OpenSim.Region.Framework.Scenes
                         CreatorID = uuid;
                     }
                     if (parts.Length >= 2)
+                    {
                         CreatorData = parts[1];
+                        if (!CreatorData.EndsWith("/"))
+                            CreatorData += "/";
+                    }
                     if (parts.Length >= 3)
                         name = parts[2];
 
@@ -815,7 +824,8 @@ namespace OpenSim.Region.Framework.Scenes
                         }
 
                         // Tell the physics engines that this prim changed.
-                        ParentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(actor);
+                        if (ParentGroup != null && ParentGroup.Scene != null && ParentGroup.Scene.PhysicsScene != null)
+                            ParentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(actor);
                     }
                     catch (Exception e)
                     {
@@ -933,7 +943,7 @@ namespace OpenSim.Region.Framework.Scenes
                             //m_log.Info("[PART]: RO2:" + actor.Orientation.ToString());
                         }
 
-                        if (ParentGroup != null)
+                        if (ParentGroup != null && ParentGroup.Scene != null && ParentGroup.Scene.PhysicsScene != null)
                             ParentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(actor);
                         //}
                     }
@@ -1218,23 +1228,14 @@ namespace OpenSim.Region.Framework.Scenes
         // the mappings more consistant.
         public Vector3 SitTargetPositionLL
         {
-            get { return new Vector3(m_sitTargetPosition.X, m_sitTargetPosition.Y,m_sitTargetPosition.Z); }
+            get { return m_sitTargetPosition; }
             set { m_sitTargetPosition = value; }
         }
 
         public Quaternion SitTargetOrientationLL
         {
-            get
-            {
-                return new Quaternion(
-                                        m_sitTargetOrientation.X,
-                                        m_sitTargetOrientation.Y,
-                                        m_sitTargetOrientation.Z,
-                                        m_sitTargetOrientation.W
-                                        );
-            }
-
-            set { m_sitTargetOrientation = new Quaternion(value.X, value.Y, value.Z, value.W); }
+            get { return m_sitTargetOrientation; }
+            set { m_sitTargetOrientation = value; }
         }
 
         public bool Stopped
@@ -4350,30 +4351,31 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        public void UpdateGroupPosition(Vector3 pos)
+        public void UpdateGroupPosition(Vector3 newPos)
         {
-            if ((pos.X != GroupPosition.X) ||
-                (pos.Y != GroupPosition.Y) ||
-                (pos.Z != GroupPosition.Z))
+            Vector3 oldPos = GroupPosition;
+
+            if ((newPos.X != oldPos.X) ||
+                (newPos.Y != oldPos.Y) ||
+                (newPos.Z != oldPos.Z))
             {
-                Vector3 newPos = new Vector3(pos.X, pos.Y, pos.Z);
                 GroupPosition = newPos;
                 ScheduleTerseUpdate();
             }
         }
 
         /// <summary>
-        ///
+        /// Update this part's offset position.
         /// </summary>
         /// <param name="pos"></param>
-        public void UpdateOffSet(Vector3 pos)
+        public void UpdateOffSet(Vector3 newPos)
         {
-            if ((pos.X != OffsetPosition.X) ||
-                (pos.Y != OffsetPosition.Y) ||
-                (pos.Z != OffsetPosition.Z))
-            {
-                Vector3 newPos = new Vector3(pos.X, pos.Y, pos.Z);
+            Vector3 oldPos = OffsetPosition;
 
+            if ((newPos.X != oldPos.X) ||
+                (newPos.Y != oldPos.Y) ||
+                (newPos.Z != oldPos.Z))
+            {
                 if (ParentGroup.RootPart.GetStatusSandbox())
                 {
                     if (Util.GetDistanceTo(ParentGroup.RootPart.StatusSandboxPos, newPos) > 10)
@@ -4520,7 +4522,7 @@ namespace OpenSim.Region.Framework.Scenes
             // For now, we use the NINJA naming scheme for identifying joints.
             // In the future, we can support other joint specification schemes such as a 
             // custom checkbox in the viewer GUI.
-            if (ParentGroup.Scene != null && ParentGroup.Scene.PhysicsScene.SupportsNINJAJoints)
+            if (ParentGroup.Scene != null && ParentGroup.Scene.PhysicsScene != null && ParentGroup.Scene.PhysicsScene.SupportsNINJAJoints)
             {
                 return IsHingeJoint() || IsBallJoint();
             }
@@ -4642,6 +4644,11 @@ namespace OpenSim.Region.Framework.Scenes
                             }
                         }
 */
+                        if (pa != null)
+                        {
+                            pa.SetMaterial(Material);
+                            DoPhysicsPropertyUpdate(UsePhysics, true);
+                        }
                     }
                     else // it already has a physical representation
                     {
@@ -5014,6 +5021,14 @@ namespace OpenSim.Region.Framework.Scenes
                 oldTex.DefaultTexture = fallbackOldFace;
             }
 
+            // Materials capable viewers can send a ObjectImage packet
+            // when nothing in TE has changed. MaterialID should be updated
+            // by the RenderMaterials CAP handler, so updating it here may cause a
+            // race condtion. Therefore, if no non-materials TE fields have changed, 
+            // we should ignore any changes and not update Shape.TextureEntry
+
+            bool otherFieldsChanged = false;
+
             for (int i = 0 ; i < GetNumberOfSides(); i++)
             {
 
@@ -5040,18 +5055,36 @@ namespace OpenSim.Region.Framework.Scenes
                 // Max change, skip the rest of testing
                 if (changeFlags == (Changed.TEXTURE | Changed.COLOR))
                     break;
+
+                if (!otherFieldsChanged)
+                {
+                    if (oldFace.Bump != newFace.Bump) otherFieldsChanged = true;
+                    if (oldFace.Fullbright != newFace.Fullbright) otherFieldsChanged = true;
+                    if (oldFace.Glow != newFace.Glow) otherFieldsChanged = true;
+                    if (oldFace.MediaFlags != newFace.MediaFlags) otherFieldsChanged = true;
+                    if (oldFace.OffsetU != newFace.OffsetU) otherFieldsChanged = true;
+                    if (oldFace.OffsetV != newFace.OffsetV) otherFieldsChanged = true;
+                    if (oldFace.RepeatU != newFace.RepeatU) otherFieldsChanged = true;
+                    if (oldFace.RepeatV != newFace.RepeatV) otherFieldsChanged = true;
+                    if (oldFace.Rotation != newFace.Rotation) otherFieldsChanged = true;
+                    if (oldFace.Shiny != newFace.Shiny) otherFieldsChanged = true;
+                    if (oldFace.TexMapType != newFace.TexMapType) otherFieldsChanged = true;
+                }
             }
 
-            m_shape.TextureEntry = newTex.GetBytes();
-            if (changeFlags != 0)
-                TriggerScriptChangedEvent(changeFlags);
-            UpdateFlag = UpdateRequired.FULL;
-            ParentGroup.HasGroupChanged = true;
+            if (changeFlags != 0 || otherFieldsChanged)
+            {
+                m_shape.TextureEntry = newTex.GetBytes();
+                if (changeFlags != 0)
+                    TriggerScriptChangedEvent(changeFlags);
+                UpdateFlag = UpdateRequired.FULL;
+                ParentGroup.HasGroupChanged = true;
 
-            //This is madness..
-            //ParentGroup.ScheduleGroupForFullUpdate();
-            //This is sparta
-            ScheduleFullUpdate();
+                //This is madness..
+                //ParentGroup.ScheduleGroupForFullUpdate();
+                //This is sparta
+                ScheduleFullUpdate();
+            }
         }
 
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index d04d87b..3be0623 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -696,7 +696,8 @@ namespace OpenSim.Region.Framework.Scenes
         /// </param>
         public void StopScriptInstance(TaskInventoryItem item)
         {
-            m_part.ParentGroup.Scene.EventManager.TriggerStopScript(m_part.LocalId, item.ItemID);
+            if (m_part.ParentGroup.Scene != null)
+                m_part.ParentGroup.Scene.EventManager.TriggerStopScript(m_part.LocalId, item.ItemID);
 
             // At the moment, even stopped scripts are counted as active, which is probably wrong.
 //            m_part.ParentGroup.AddActiveScriptCount(-1);
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 7004d23..183d8d1 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -29,7 +29,9 @@ using System;
 using System.Xml;
 using System.Collections.Generic;
 using System.Reflection;
+using System.Threading;
 using System.Timers;
+using Timer = System.Timers.Timer;
 using OpenMetaverse;
 using log4net;
 using Nini.Config;
@@ -73,21 +75,40 @@ namespace OpenSim.Region.Framework.Scenes
 
     public class ScenePresence : EntityBase, IScenePresence
     {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
 //        ~ScenePresence()
 //        {
 //            m_log.DebugFormat("[SCENE PRESENCE]: Destructor called on {0}", Name);
 //        }
 
-        private void TriggerScenePresenceUpdated()
+        public void TriggerScenePresenceUpdated()
         {
             if (m_scene != null)
                 m_scene.EventManager.TriggerScenePresenceUpdated(this);
         }
 
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
         public PresenceType PresenceType { get; private set; }
 
+        private ScenePresenceStateMachine m_stateMachine;
+
+        /// <summary>
+        /// The current state of this presence.  Governs only the existence lifecycle.  See ScenePresenceStateMachine
+        /// for more details.
+        /// </summary>
+        public ScenePresenceState LifecycleState 
+        { 
+            get
+            {
+                return m_stateMachine.GetState();
+            }
+
+            set
+            {
+                m_stateMachine.SetState(value);
+            }
+        }
+
 //        private static readonly byte[] DEFAULT_TEXTURE = AvatarAppearance.GetDefaultTexture().GetBytes();
         private static readonly Array DIR_CONTROL_FLAGS = Enum.GetValues(typeof(Dir_ControlFlags));
         private static readonly Vector3 HEAD_ADJUSTMENT = new Vector3(0f, 0f, 0.3f);
@@ -142,6 +163,8 @@ namespace OpenSim.Region.Framework.Scenes
         private Vector3 m_lastVelocity;
         private Vector3 m_lastSize = new Vector3(0.45f,0.6f,1.9f);
 
+        private bool m_followCamAuto = false;
+
 
         private Vector3? m_forceToApply;
         private int m_userFlags;
@@ -200,7 +223,7 @@ namespace OpenSim.Region.Framework.Scenes
         private float m_sitAvatarHeight = 2.0f;
 
         private Vector3 m_lastChildAgentUpdatePosition;
-        private Vector3 m_lastChildAgentUpdateCamPosition;
+//        private Vector3 m_lastChildAgentUpdateCamPosition;
 
         private const int LAND_VELOCITYMAG_MAX = 12;
 
@@ -290,9 +313,23 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         private Vector3 posLastSignificantMove;
 
-        // For teleports and crossings callbacks
-        string m_callbackURI;
-        UUID m_originRegionID;
+        #region For teleports and crossings callbacks
+
+        /// <summary>
+        /// In the V1 teleport protocol, the destination simulator sends ReleaseAgent to this address.
+        /// </summary>
+        private string m_callbackURI;
+
+        public UUID m_originRegionID;
+
+        /// <summary>
+        /// Used by the entity transfer module to signal when the presence should not be closed because a subsequent
+        /// teleport is reusing the connection.
+        /// </summary>
+        /// <remarks>May be refactored or move somewhere else soon.</remarks>
+        public bool DoNotCloseAfterTeleport { get; set; }
+
+        #endregion
 
         /// <value>
         /// Script engines present in the scene
@@ -795,7 +832,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public ScenePresence(
             IClientAPI client, Scene world, AvatarAppearance appearance, PresenceType type)
-        {
+        {            
             AttachmentsSyncLock = new Object();
             AllowMovement = true;
             IsChildAgent = true;
@@ -841,6 +878,8 @@ namespace OpenSim.Region.Framework.Scenes
             SetDirectionVectors();
 
             Appearance = appearance;
+
+            m_stateMachine = new ScenePresenceStateMachine(this);
         }
 
         private void RegionHeartbeatEnd(Scene scene)
@@ -874,6 +913,7 @@ namespace OpenSim.Region.Framework.Scenes
         {
             ControllingClient.OnCompleteMovementToRegion += CompleteMovement;
             ControllingClient.OnAgentUpdate += HandleAgentUpdate;
+            ControllingClient.OnAgentCameraUpdate += HandleAgentCamerasUpdate;
             ControllingClient.OnAgentRequestSit += HandleAgentRequestSit;
             ControllingClient.OnAgentSit += HandleAgentSit;
             ControllingClient.OnSetAlwaysRun += HandleSetAlwaysRun;
@@ -937,7 +977,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void MakeRootAgent(Vector3 pos, bool isFlying)
         {
-            m_log.DebugFormat(
+            m_log.InfoFormat(
                 "[SCENE]: Upgrading child to root agent for {0} in {1}",
                 Name, m_scene.RegionInfo.RegionName);
 
@@ -977,6 +1017,11 @@ namespace OpenSim.Region.Framework.Scenes
 
             IsChildAgent = false;
 
+            // Must reset this here so that a teleport to a region next to an existing region does not keep the flag
+            // set and prevent the close of the connection on a subsequent re-teleport.
+            // Should not be needed if we are not trying to tell this region to close
+//            DoNotCloseAfterTeleport = false;
+
             IGroupsModule gm = m_scene.RequestModuleInterface<IGroupsModule>();
             if (gm != null)
                 Grouptitle = gm.GetGroupTitle(m_uuid);
@@ -1153,7 +1198,6 @@ namespace OpenSim.Region.Framework.Scenes
 
             m_scene.EventManager.TriggerOnMakeRootAgent(this);
 
-            m_scene.EventManager.OnRegionHeartbeatEnd += RegionHeartbeatEnd;
         }
 
         public int GetStateSource()
@@ -1306,7 +1350,26 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void StopFlying()
         {
-            ControllingClient.StopFlying(this);
+            Vector3 pos = AbsolutePosition; 
+            if (Appearance.AvatarHeight != 127.0f)
+                pos += new Vector3(0f, 0f, (Appearance.AvatarHeight / 6f));
+            else
+                pos += new Vector3(0f, 0f, (1.56f / 6f));
+
+            AbsolutePosition = pos;
+
+            // attach a suitable collision plane regardless of the actual situation to force the LLClient to land.
+            // Collision plane below the avatar's position a 6th of the avatar's height is suitable.
+            // Mind you, that this method doesn't get called if the avatar's velocity magnitude is greater then a
+            // certain amount..   because the LLClient wouldn't land in that situation anyway.
+
+            // why are we still testing for this really old height value default???
+            if (Appearance.AvatarHeight != 127.0f)
+                CollisionPlane = new Vector4(0, 0, 0, pos.Z - Appearance.AvatarHeight / 6f);
+            else
+                CollisionPlane = new Vector4(0, 0, 0, pos.Z - (1.56f / 6f));
+
+            ControllingClient.SendAgentTerseUpdate(this);
         }
 
         /// <summary>
@@ -1480,6 +1543,26 @@ namespace OpenSim.Region.Framework.Scenes
             
         }
 
+        private bool WaitForUpdateAgent(IClientAPI client)
+        {
+            // Before UpdateAgent, m_originRegionID is UUID.Zero; after, it's non-Zero
+            int count = 50;
+            while (m_originRegionID.Equals(UUID.Zero) && count-- > 0)
+            {
+                m_log.DebugFormat("[SCENE PRESENCE]: Agent {0} waiting for update in {1}", client.Name, Scene.Name);
+                Thread.Sleep(200);
+            }
+
+            if (m_originRegionID.Equals(UUID.Zero))
+            {
+                // Movement into region will fail
+                m_log.WarnFormat("[SCENE PRESENCE]: Update agent {0} never arrived in {1}", client.Name, Scene.Name);
+                return false;
+            }
+
+            return true;
+        }
+
         /// <summary>
         /// Complete Avatar's movement into the region.
         /// </summary>
@@ -1497,6 +1580,15 @@ namespace OpenSim.Region.Framework.Scenes
                 "[SCENE PRESENCE]: Completing movement of {0} into region {1} in position {2}",
                 client.Name, Scene.RegionInfo.RegionName, AbsolutePosition);
 
+            // Make sure it's not a login agent. We don't want to wait for updates during login
+            if (PresenceType != PresenceType.Npc && (m_teleportFlags & TeleportFlags.ViaLogin) == 0)
+            {
+                // Let's wait until UpdateAgent (called by departing region) is done
+                if (!WaitForUpdateAgent(client))
+                    // The sending region never sent the UpdateAgent data, we have to refuse
+                    return;
+            }
+
             Vector3 look = Velocity;
 
             //            if ((look.X == 0) && (look.Y == 0) && (look.Z == 0))
@@ -1518,11 +1610,17 @@ namespace OpenSim.Region.Framework.Scenes
 
             bool flying = ((m_AgentControlFlags & AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0);
             MakeRootAgent(AbsolutePosition, flying);
+
+            // Tell the client that we're totally ready
             ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look);
 
+            // Remember in HandleUseCircuitCode, we delayed this to here
+            if (m_teleportFlags > 0)
+                SendInitialDataToMe();
+
 //            m_log.DebugFormat("[SCENE PRESENCE] Completed movement");
 
-            if ((m_callbackURI != null) && !m_callbackURI.Equals(""))
+            if (!string.IsNullOrEmpty(m_callbackURI))
             {
                 // We cannot sleep here since this would hold up the inbound packet processing thread, as
                 // CompleteMovement() is executed synchronously.  However, it might be better to delay the release
@@ -1550,7 +1648,6 @@ 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)
                     m_agentTransfer.EnableChildAgents(this);
@@ -1573,6 +1670,7 @@ namespace OpenSim.Region.Framework.Scenes
 //            m_log.DebugFormat(
 //                "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", 
 //                client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds);
+
         }
 
         /// <summary>
@@ -1653,9 +1751,9 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void HandleAgentUpdate(IClientAPI remoteClient, AgentUpdateArgs agentData)
         {
-//            m_log.DebugFormat(
-//                "[SCENE PRESENCE]: In {0} received agent update from {1}, flags {2}",
-//                Scene.RegionInfo.RegionName, remoteClient.Name, (AgentManager.ControlFlags)agentData.ControlFlags);
+            //m_log.DebugFormat(
+            //    "[SCENE PRESENCE]: In {0} received agent update from {1}, flags {2}",
+            //    Scene.RegionInfo.RegionName, remoteClient.Name, (AgentManager.ControlFlags)agentData.ControlFlags);
 
             if (IsChildAgent)
             {
@@ -1663,10 +1761,6 @@ namespace OpenSim.Region.Framework.Scenes
                 return;
             }
 
-            ++m_movementUpdateCount;
-            if (m_movementUpdateCount < 1)
-                m_movementUpdateCount = 1;
-
             #region Sanity Checking
 
             // This is irritating.  Really.
@@ -1697,21 +1791,6 @@ namespace OpenSim.Region.Framework.Scenes
 
             AgentManager.ControlFlags flags = (AgentManager.ControlFlags)agentData.ControlFlags;
 
-            // Camera location in world.  We'll need to raytrace
-            // from this location from time to time.
-            CameraPosition = agentData.CameraCenter;
-            if (Vector3.Distance(m_lastCameraPosition, CameraPosition) >= Scene.RootReprioritizationDistance)
-            {
-                ReprioritizeUpdates();
-                m_lastCameraPosition = CameraPosition;
-            }
-
-            // Use these three vectors to figure out what the agent is looking at
-            // Convert it to a Matrix and/or Quaternion
-            CameraAtAxis = agentData.CameraAtAxis;
-            CameraLeftAxis = agentData.CameraLeftAxis;
-            CameraUpAxis = agentData.CameraUpAxis;
-
             // The Agent's Draw distance setting
             // When we get to the point of re-computing neighbors everytime this
             // changes, then start using the agent's drawdistance rather than the 
@@ -1783,8 +1862,14 @@ namespace OpenSim.Region.Framework.Scenes
             // Here's where you get them.
             m_AgentControlFlags = flags;
             m_headrotation = agentData.HeadRotation;
+            byte oldState = State;
             State = agentData.State;
 
+            // We need to send this back to the client in order to stop the edit beams
+            if ((oldState & (uint)AgentState.Editing) != 0 && State == (uint)AgentState.None)
+                ControllingClient.SendAgentTerseUpdate(this);
+
+
             PhysicsActor actor = PhysicsActor;
             if (actor == null)
             {
@@ -1996,10 +2081,78 @@ namespace OpenSim.Region.Framework.Scenes
                 SendControlsToScripts(flagsForScripts);
             }
 
+            // We need to send this back to the client in order to see the edit beams
+            if ((State & (uint)AgentState.Editing) != 0)
+                ControllingClient.SendAgentTerseUpdate(this);
+
             m_scene.EventManager.TriggerOnClientMovement(this);
-            TriggerScenePresenceUpdated();
         }
 
+
+        /// <summary>
+        /// This is the event handler for client cameras. If a client is moving, or moving the camera, this event is triggering.
+        /// </summary>
+        private void HandleAgentCamerasUpdate(IClientAPI remoteClient, AgentUpdateArgs agentData)
+        {
+            //m_log.DebugFormat(
+            //    "[SCENE PRESENCE]: In {0} received agent camera update from {1}, flags {2}",
+            //    Scene.RegionInfo.RegionName, remoteClient.Name, (AgentManager.ControlFlags)agentData.ControlFlags);
+
+            if (IsChildAgent)
+            {
+                //    // m_log.Debug("DEBUG: HandleAgentUpdate: child agent");
+                return;
+            }
+
+            ++m_movementUpdateCount;
+            if (m_movementUpdateCount < 1)
+                m_movementUpdateCount = 1;
+
+//            AgentManager.ControlFlags flags = (AgentManager.ControlFlags)agentData.ControlFlags;
+
+            // Camera location in world.  We'll need to raytrace
+            // from this location from time to time.
+            CameraPosition = agentData.CameraCenter;
+            if (Vector3.Distance(m_lastCameraPosition, CameraPosition) >= Scene.RootReprioritizationDistance)
+            {
+                ReprioritizeUpdates();
+                m_lastCameraPosition = CameraPosition;
+            }
+
+            // Use these three vectors to figure out what the agent is looking at
+            // Convert it to a Matrix and/or Quaternion
+            CameraAtAxis = agentData.CameraAtAxis;
+            CameraLeftAxis = agentData.CameraLeftAxis;
+            CameraUpAxis = agentData.CameraUpAxis;
+
+            // The Agent's Draw distance setting
+            // When we get to the point of re-computing neighbors everytime this
+            // changes, then start using the agent's drawdistance rather than the 
+            // region's draw distance.
+            // 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_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())
+            {
+                if (m_followCamAuto)
+                {
+                    Vector3 posAdjusted = m_pos + HEAD_ADJUSTMENT;
+                    m_scene.PhysicsScene.RaycastWorld(m_pos, Vector3.Normalize(CameraPosition - posAdjusted), Vector3.Distance(CameraPosition, posAdjusted) + 0.3f, RayCastCameraCallback);
+                }
+            }
+
+            TriggerScenePresenceUpdated();
+        }
+        
         /// <summary>
         /// Calculate an update to move the presence to the set target.
         /// </summary>
@@ -2309,6 +2462,7 @@ namespace OpenSim.Region.Framework.Scenes
                 AddToPhysicalScene(false);
 
             Animator.TrySetMovementAnimation("STAND");
+            TriggerScenePresenceUpdated();
         }
 
         private SceneObjectPart FindNextAvailableSitTarget(UUID targetID)
@@ -2407,7 +2561,7 @@ namespace OpenSim.Region.Framework.Scenes
                 ControllingClient.SendSitResponse(
                     part.UUID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook);
 
-                m_requestedSitTargetUUID = targetID;
+                m_requestedSitTargetUUID = part.UUID;
 
                 HandleAgentSit(ControllingClient, UUID);
 
@@ -2435,7 +2589,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (part != null)
             {
                 m_requestedSitTargetID = part.LocalId;
-                m_requestedSitTargetUUID = targetID;
+                m_requestedSitTargetUUID = part.UUID;
 
             }
             else
@@ -2554,6 +2708,9 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void HandleAgentSit(IClientAPI remoteClient, UUID agentID)
         {
+            if (IsChildAgent)
+                return;
+
             SceneObjectPart part = m_scene.GetSceneObjectPart(m_requestedSitTargetID);
 
             if (part != null)
@@ -2634,14 +2791,19 @@ namespace OpenSim.Region.Framework.Scenes
                 }
                 Animator.TrySetMovementAnimation(sitAnimation);
                 SendAvatarDataToAllAgents();
+                TriggerScenePresenceUpdated();
             }
         }
 
         public void HandleAgentSitOnGround()
         {
+            if (IsChildAgent)
+                return;
+
 //            m_updateCount = 0;  // Kill animation update burst so that the SIT_G.. will stick..
             m_AngularVelocity = Vector3.Zero;
             Animator.TrySetMovementAnimation("SIT_GROUND_CONSTRAINED");
+            TriggerScenePresenceUpdated();
             SitGround = true;
             RemoveFromPhysicalScene();
         }
@@ -2658,11 +2820,13 @@ namespace OpenSim.Region.Framework.Scenes
         public void HandleStartAnim(IClientAPI remoteClient, UUID animID)
         {
             Animator.AddAnimation(animID, UUID.Zero);
+            TriggerScenePresenceUpdated();
         }
 
         public void HandleStopAnim(IClientAPI remoteClient, UUID animID)
         {
             Animator.RemoveAnimation(animID, false);
+            TriggerScenePresenceUpdated();
         }
 
         public void avnHandleChangeAnim(UUID animID, bool addRemove,bool sendPack)
@@ -2880,11 +3044,12 @@ namespace OpenSim.Region.Framework.Scenes
                 SendOtherAgentsAppearanceToMe();
 
                 EntityBase[] entities = Scene.Entities.GetEntities();
-                foreach(EntityBase e in entities)
+                foreach (EntityBase e in entities)
                 {
                     if (e != null && e is SceneObjectGroup)
                         ((SceneObjectGroup)e).SendFullUpdateToClient(ControllingClient);
                 }
+
             });
         }
 
@@ -3079,11 +3244,10 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             // Minimum Draw distance is 64 meters, the Radius of the draw distance sphere is 32m
-            if (Util.GetDistanceTo(AbsolutePosition, m_lastChildAgentUpdatePosition) >= Scene.ChildReprioritizationDistance ||
-                Util.GetDistanceTo(CameraPosition, m_lastChildAgentUpdateCamPosition) >= Scene.ChildReprioritizationDistance)
+            if (Util.GetDistanceTo(AbsolutePosition, m_lastChildAgentUpdatePosition) >= Scene.ChildReprioritizationDistance)
             {
                 m_lastChildAgentUpdatePosition = AbsolutePosition;
-                m_lastChildAgentUpdateCamPosition = CameraPosition;
+//                m_lastChildAgentUpdateCamPosition = CameraPosition;
 
                 ChildAgentDataUpdate cadu = new ChildAgentDataUpdate();
                 cadu.ActiveGroupID = UUID.Zero.Guid;
@@ -3110,7 +3274,7 @@ namespace OpenSim.Region.Framework.Scenes
                 cadu.Velocity = Velocity;
 
                 AgentPosition agentpos = new AgentPosition();
-                agentpos.CopyFrom(cadu);
+                agentpos.CopyFrom(cadu, ControllingClient.SessionId);
 
                 // Let's get this out of the update loop
                 Util.FireAndForget(delegate { m_scene.SendOutChildAgentUpdates(agentpos, this); });
@@ -3294,11 +3458,6 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        public void RestoreInCurrentScene()
-        {
-            AddToPhysicalScene(false); // not exactly false
-        }
-
         public void Reset()
         {
 //            m_log.DebugFormat("[SCENE PRESENCE]: Resetting {0} in {1}", Name, Scene.RegionInfo.RegionName);
@@ -3348,10 +3507,12 @@ namespace OpenSim.Region.Framework.Scenes
             if (byebyeRegions.Count > 0)
             {
                 m_log.Debug("[SCENE PRESENCE]: Closing " + byebyeRegions.Count + " child agents");
-                Util.FireAndForget(delegate 
-                { 
-                    m_scene.SceneGridService.SendCloseChildAgentConnections(ControllingClient.AgentId, byebyeRegions); 
-                });
+
+                AgentCircuitData acd = Scene.AuthenticateHandler.GetAgentCircuitData(UUID);
+                string auth = string.Empty;
+                if (acd != null)
+                    auth = acd.SessionID.ToString();
+                m_scene.SceneGridService.SendCloseChildAgentConnections(ControllingClient.AgentId, auth, byebyeRegions); 
             }
             
             foreach (ulong handle in byebyeRegions)
@@ -3452,6 +3613,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             cAgent.AgentID = UUID;
             cAgent.RegionID = Scene.RegionInfo.RegionID;
+            cAgent.SessionID = ControllingClient.SessionId;
 
             cAgent.Position = AbsolutePosition;
             cAgent.Velocity = m_velocity;
@@ -3694,7 +3856,8 @@ namespace OpenSim.Region.Framework.Scenes
 
 //                if (m_updateCount > 0)
 //                {
-            Animator.UpdateMovementAnimations();
+            if (Animator.UpdateMovementAnimations())
+                TriggerScenePresenceUpdated();
 //                    m_updateCount--;
 //                }
 
@@ -3858,6 +4021,7 @@ namespace OpenSim.Region.Framework.Scenes
 //                Animator.Close();
             Animator = null;
 
+            LifecycleState = ScenePresenceState.Removed;
         }
 
         public void AddAttachment(SceneObjectGroup gobj)
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresenceStateMachine.cs b/OpenSim/Region/Framework/Scenes/ScenePresenceStateMachine.cs
new file mode 100644
index 0000000..cae7fe5
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/ScenePresenceStateMachine.cs
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+
+namespace OpenSim.Region.Framework.Scenes
+{
+    /// <summary>
+    /// The possible states that a scene presence can be in.  This is currently orthagonal to whether a scene presence
+    /// is root or child.
+    /// </summary>
+    /// <remarks>
+    /// This is a state machine.
+    ///
+    /// [Entry]               => Running
+    /// Running               => PreRemove, Removing
+    /// PreRemove             => Running, Removing
+    /// Removing              => Removed
+    /// 
+    /// All other methods should only see the scene presence in running state - this is the normal operational state
+    /// Removed state occurs when the presence has been removed.  This is the end state with no exit.
+    /// </remarks>
+    public enum ScenePresenceState
+    {
+        Running,                // Normal operation state.  The scene presence is available.
+        PreRemove,              // The presence is due to be removed but can still be returning to running.
+        Removing,               // The presence is in the process of being removed from the scene via Scene.RemoveClient.
+        Removed,                // The presence has been removed from the scene and is effectively dead.
+                                // There is no exit from this state.
+    }
+
+    internal class ScenePresenceStateMachine
+    {
+        private ScenePresence m_sp;
+        private ScenePresenceState m_state;
+
+        internal ScenePresenceStateMachine(ScenePresence sp)
+        {
+            m_sp = sp;
+            m_state = ScenePresenceState.Running;
+        }
+
+        internal ScenePresenceState GetState()
+        {
+            return m_state;
+        }
+
+        /// <summary>
+        /// Updates the state of an agent that is already in transit.
+        /// </summary>
+        /// <param name='id'></param>
+        /// <param name='newState'></param>
+        /// <returns></returns>
+        /// <exception cref='Exception'>Illegal transitions will throw an Exception</exception>
+        internal void SetState(ScenePresenceState newState)
+        {
+            bool transitionOkay = false;
+
+            lock (this)
+            {
+                if (newState == m_state)
+                    return;
+                else if (newState == ScenePresenceState.Running && m_state == ScenePresenceState.PreRemove)
+                    transitionOkay = true;
+                else if (newState == ScenePresenceState.PreRemove && m_state == ScenePresenceState.Running)
+                    transitionOkay = true;
+                else if (newState == ScenePresenceState.Removing)
+                {   
+                    if (m_state == ScenePresenceState.Running || m_state == ScenePresenceState.PreRemove)
+                        transitionOkay = true;
+                }
+                else if (newState == ScenePresenceState.Removed && m_state == ScenePresenceState.Removing)
+                    transitionOkay = true;
+            }           
+
+            if (!transitionOkay)
+            {
+                throw new Exception(
+                    string.Format(
+                        "Scene presence {0} is not allowed to move from state {1} to new state {2} in {3}",
+                        m_sp.Name, m_state, newState, m_sp.Scene.Name));
+            }
+            else
+            {
+                m_state = newState;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index ce4fb40..68918d3 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -1346,7 +1346,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             if (sop.MediaUrl != null)
                 writer.WriteElementString("MediaUrl", sop.MediaUrl.ToString());
             
-            if (sop.DynAttrs.Count > 0)
+            if (sop.DynAttrs.CountNamespaces > 0)
             {
                 writer.WriteStartElement("DynAttrs");
                 sop.DynAttrs.WriteXml(writer);
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index 5398ab9..bf32251 100644
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -290,6 +290,9 @@ namespace OpenSim.Region.Framework.Scenes
 
         private void statsHeartBeat(object sender, EventArgs e)
         {
+            if (!m_scene.Active)
+                return;
+
             SimStatsPacket.StatBlock[] sb = new SimStatsPacket.StatBlock[23];
             SimStatsPacket.RegionBlock rb = new SimStatsPacket.RegionBlock();
             
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
index 9557cd0..95b30d5 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
@@ -33,7 +33,9 @@ using NUnit.Framework;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
+using OpenSim.Region.CoreModules.Framework.EntityTransfer;
 using OpenSim.Region.CoreModules.Framework.InventoryAccess;
+using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
 using OpenSim.Region.CoreModules.World.Permissions;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
@@ -52,6 +54,24 @@ namespace OpenSim.Region.Framework.Scenes.Tests
     [TestFixture]
     public class SceneObjectDeRezTests : OpenSimTestCase
     {
+        [TestFixtureSetUp]
+        public void FixtureInit()
+        {
+            // Don't allow tests to be bamboozled by asynchronous events.  Execute everything on the same thread.
+            // This facility was added after the original async delete tests were written, so it may be possible now
+            // to not bother explicitly disabling their async (since everything will be running sync).
+            Util.FireAndForgetMethod = FireAndForgetMethod.RegressionTest;
+        }
+
+        [TestFixtureTearDown]
+        public void TearDown()
+        {
+            // We must set this back afterwards, otherwise later tests will fail since they're expecting multiple
+            // threads.  Possibly, later tests should be rewritten so none of them require async stuff (which regression
+            // tests really shouldn't).
+            Util.FireAndForgetMethod = Util.DefaultFireAndForgetMethod;
+        }
+
         /// <summary>
         /// Test deleting an object from a scene.
         /// </summary>
@@ -59,7 +79,6 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         public void TestDeRezSceneObject()
         {
             TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();
                         
             UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
             
@@ -73,32 +92,77 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             // Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
             AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter;
             sogd.Enabled = false;            
-            
-            SceneObjectPart part
-                = new SceneObjectPart(userId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero);
-            part.Name = "obj1";
-            scene.AddNewSceneObject(new SceneObjectGroup(part), false);
+
+            SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "so1", userId);
+            uint soLocalId = so.LocalId;
 
             List<uint> localIds = new List<uint>();
-            localIds.Add(part.LocalId);
+            localIds.Add(so.LocalId);
             scene.DeRezObjects(client, localIds, UUID.Zero, DeRezAction.Delete, UUID.Zero);
 
             // Check that object isn't deleted until we crank the sogd handle.
-            SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
+            SceneObjectPart retrievedPart = scene.GetSceneObjectPart(so.LocalId);
             Assert.That(retrievedPart, Is.Not.Null);
             Assert.That(retrievedPart.ParentGroup.IsDeleted, Is.False);
 
             sogd.InventoryDeQueueAndDelete();
             
-            SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(part.LocalId);
-            Assert.That(retrievedPart2, Is.Null);
+            SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId);
+            Assert.That(retrievedPart2, Is.Null);              
+        }
+
+        /// <summary>
+        /// Test that child and root agents correctly receive KillObject notifications.
+        /// </summary>
+        [Test]
+        public void TestDeRezSceneObjectToAgents()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            SceneHelpers sh = new SceneHelpers();
+            TestScene sceneA = sh.SetupScene("sceneA", TestHelpers.ParseTail(0x100), 1000, 1000);
+            TestScene sceneB = sh.SetupScene("sceneB", TestHelpers.ParseTail(0x200), 1000, 999);
+
+            // We need this so that the creation of the root client for userB in sceneB can trigger the creation of a child client in sceneA
+            LocalSimulationConnectorModule lscm = new LocalSimulationConnectorModule();
+            EntityTransferModule etmB = new EntityTransferModule();
+            IConfigSource config = new IniConfigSource();
+            IConfig modulesConfig = config.AddConfig("Modules");
+            modulesConfig.Set("EntityTransferModule", etmB.Name);
+            modulesConfig.Set("SimulationServices", lscm.Name);
+            SceneHelpers.SetupSceneModules(new Scene[] { sceneA, sceneB }, config, lscm);
+            SceneHelpers.SetupSceneModules(sceneB, config, etmB);
+
+            // We need this for derez
+            //SceneHelpers.SetupSceneModules(sceneA, new PermissionsModule());
+
+            UserAccount uaA = UserAccountHelpers.CreateUserWithInventory(sceneA, "Andy", "AAA", 0x1, "");
+            UserAccount uaB = UserAccountHelpers.CreateUserWithInventory(sceneA, "Brian", "BBB", 0x2, "");
+
+            TestClient clientA = (TestClient)SceneHelpers.AddScenePresence(sceneA, uaA).ControllingClient;
+
+            // This is the more long-winded route we have to take to get a child client created for userB in sceneA
+            // rather than just calling AddScenePresence() as for userA
+            AgentCircuitData acd = SceneHelpers.GenerateAgentData(uaB);
+            TestClient clientB = new TestClient(acd, sceneB);
+            List<TestClient> childClientsB = new List<TestClient>();
+            EntityTransferHelpers.SetupInformClientOfNeighbourTriggersNeighbourClientCreate(clientB, childClientsB);
+
+            SceneHelpers.AddScenePresence(sceneB, clientB, acd);
+
+            SceneObjectGroup so = SceneHelpers.AddSceneObject(sceneA);
+            uint soLocalId = so.LocalId;
+
+            sceneA.DeleteSceneObject(so, false);
         }
         
         /// <summary>
         /// Test deleting an object from a scene where the deleter is not the owner
         /// </summary>
-        /// 
+        /// <remarks>
         /// This test assumes that the deleter is not a god.       
+        /// </remarks>
         [Test]
         public void TestDeRezSceneObjectNotOwner()
         {
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
index bbfbbfc..bbe34d2 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
@@ -119,7 +119,20 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
             UUID spUuid = TestHelpers.ParseTail(0x1);
 
+            // The etm is only invoked by this test to check whether an agent is still in transit if there is a dupe
+            EntityTransferModule etm = new EntityTransferModule();
+
+            IConfigSource config = new IniConfigSource();
+            IConfig modulesConfig = config.AddConfig("Modules");
+            modulesConfig.Set("EntityTransferModule", etm.Name);
+            IConfig entityTransferConfig = config.AddConfig("EntityTransfer");
+
+            // In order to run a single threaded regression test we do not want the entity transfer module waiting
+            // for a callback from the destination scene before removing its avatar data.
+            entityTransferConfig.Set("wait_for_callback", false);
+
             TestScene scene = new SceneHelpers().SetupScene();
+            SceneHelpers.SetupSceneModules(scene, config, etm);
             SceneHelpers.AddScenePresence(scene, spUuid);
             SceneHelpers.AddScenePresence(scene, spUuid);
 
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
new file mode 100644
index 0000000..4ae7a8e
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
@@ -0,0 +1,88 @@
+/*
+ * 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.Text;
+using System.Threading;
+using System.Timers;
+using Timer = System.Timers.Timer;
+using Nini.Config;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Region.ClientStack.Linden;
+using OpenSim.Region.CoreModules.Framework;
+using OpenSim.Region.CoreModules.Framework.EntityTransfer;
+using OpenSim.Region.CoreModules.World.Serialiser;
+using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Tests.Common;
+using OpenSim.Tests.Common.Mock;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+
+namespace OpenSim.Region.Framework.Scenes.Tests
+{
+    [TestFixture]
+    public class ScenePresenceCapabilityTests : OpenSimTestCase
+    {
+        [Test]
+        public void TestChildAgentSingleRegionCapabilities()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            UUID spUuid = TestHelpers.ParseTail(0x1);
+
+            // XXX: This is not great since the use of statics will mean that this has to be manually cleaned up for
+            // any subsequent test.
+            // XXX: May replace with a mock IHttpServer later.
+            BaseHttpServer httpServer = new BaseHttpServer(99999);
+            MainServer.AddHttpServer(httpServer);
+            MainServer.Instance = httpServer;
+
+            CapabilitiesModule capsMod = new CapabilitiesModule();
+            TestScene scene = new SceneHelpers().SetupScene();
+            SceneHelpers.SetupSceneModules(scene, capsMod);
+
+            ScenePresence sp = SceneHelpers.AddChildScenePresence(scene, spUuid);
+            //Assert.That(capsMod.GetCapsForUser(spUuid), Is.Not.Null);
+
+            // TODO: Need to add tests for other ICapabiltiesModule methods.
+
+            scene.IncomingCloseAgent(sp.UUID, false);
+            //Assert.That(capsMod.GetCapsForUser(spUuid), Is.Null);
+
+            // TODO: Need to add tests for other ICapabiltiesModule methods.
+        }
+    }
+}
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs
index 8775949..12a778b 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs
@@ -95,11 +95,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             SceneHelpers.SetupSceneModules(sceneB, config, new CapabilitiesModule(), etmB);
 
             AgentCircuitData acd = SceneHelpers.GenerateAgentData(userId);
-            TestClient tc = new TestClient(acd, sceneA, sh.SceneManager);
+            TestClient tc = new TestClient(acd, sceneA);
             List<TestClient> destinationTestClients = new List<TestClient>();
-            EntityTransferHelpers.SetUpInformClientOfNeighbour(tc, destinationTestClients);
+            EntityTransferHelpers.SetupInformClientOfNeighbourTriggersNeighbourClientCreate(tc, destinationTestClients);
 
-            ScenePresence originalSp = SceneHelpers.AddScenePresence(sceneA, tc, acd, sh.SceneManager);
+            ScenePresence originalSp = SceneHelpers.AddScenePresence(sceneA, tc, acd);
             originalSp.AbsolutePosition = new Vector3(128, 32, 10);
 
 //            originalSp.Flying = true;
@@ -112,6 +112,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             //moveArgs.BodyRotation = Quaternion.CreateFromEulers(Vector3.Zero);
             moveArgs.BodyRotation = Quaternion.CreateFromEulers(new Vector3(0, 0, (float)-(Math.PI / 2)));
             moveArgs.ControlFlags = (uint)AgentManager.ControlFlags.AGENT_CONTROL_AT_POS;
+            moveArgs.SessionID = acd.SessionID;
 
             originalSp.HandleAgentUpdate(originalSp.ControllingClient, moveArgs);
 
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
index 8d94d29..fff542b 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Net;
 using System.Text;
+using System.Threading;
 using Nini.Config;
 using NUnit.Framework;
 using OpenMetaverse;
@@ -107,7 +108,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         }
 
         [Test]
-        public void TestSameSimulatorIsolatedRegions()
+        public void TestSameSimulatorIsolatedRegionsV1()
         {
             TestHelpers.InMethod();
 //            TestHelpers.EnableLogging();
@@ -136,14 +137,18 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             SceneHelpers.SetupSceneModules(sceneB, config, etmB);
             SceneHelpers.SetupSceneModules(new Scene[] { sceneA, sceneB }, config, lscm);
 
+            // FIXME: Hack - this is here temporarily to revert back to older entity transfer behaviour
+            lscm.ServiceVersion = "SIMULATION/0.1";
+
             Vector3 teleportPosition = new Vector3(10, 11, 12);
             Vector3 teleportLookAt = new Vector3(20, 21, 22);
 
-            ScenePresence sp = SceneHelpers.AddScenePresence(sceneA, userId, sh.SceneManager);
+            ScenePresence sp = SceneHelpers.AddScenePresence(sceneA, userId);
             sp.AbsolutePosition = new Vector3(30, 31, 32);
 
             List<TestClient> destinationTestClients = new List<TestClient>();
-            EntityTransferHelpers.SetUpInformClientOfNeighbour((TestClient)sp.ControllingClient, destinationTestClients);
+            EntityTransferHelpers.SetupInformClientOfNeighbourTriggersNeighbourClientCreate(
+                (TestClient)sp.ControllingClient, destinationTestClients);
 
             sceneA.RequestTeleportLocation(
                 sp.ControllingClient,
@@ -176,6 +181,67 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 //            Assert.That(sp.Lookat, Is.EqualTo(teleportLookAt));
         }
 
+        [Test]
+        public void TestSameSimulatorIsolatedRegionsV2()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            UUID userId = TestHelpers.ParseTail(0x1);
+
+            EntityTransferModule etmA = new EntityTransferModule();
+            EntityTransferModule etmB = new EntityTransferModule();
+            LocalSimulationConnectorModule lscm = new LocalSimulationConnectorModule();
+
+            IConfigSource config = new IniConfigSource();
+            IConfig modulesConfig = config.AddConfig("Modules");
+            modulesConfig.Set("EntityTransferModule", etmA.Name);
+            modulesConfig.Set("SimulationServices", lscm.Name);
+
+            SceneHelpers sh = new SceneHelpers();
+            TestScene sceneA = sh.SetupScene("sceneA", TestHelpers.ParseTail(0x100), 1000, 1000);
+            TestScene sceneB = sh.SetupScene("sceneB", TestHelpers.ParseTail(0x200), 1002, 1000);
+
+            SceneHelpers.SetupSceneModules(sceneA, config, etmA);
+            SceneHelpers.SetupSceneModules(sceneB, config, etmB);
+            SceneHelpers.SetupSceneModules(new Scene[] { sceneA, sceneB }, config, lscm);
+
+            Vector3 teleportPosition = new Vector3(10, 11, 12);
+            Vector3 teleportLookAt = new Vector3(20, 21, 22);
+
+            ScenePresence sp = SceneHelpers.AddScenePresence(sceneA, userId);
+            sp.AbsolutePosition = new Vector3(30, 31, 32);
+
+            List<TestClient> destinationTestClients = new List<TestClient>();
+            EntityTransferHelpers.SetupSendRegionTeleportTriggersDestinationClientCreateAndCompleteMovement(
+                (TestClient)sp.ControllingClient, destinationTestClients);
+
+            sceneA.RequestTeleportLocation(
+                sp.ControllingClient,
+                sceneB.RegionInfo.RegionHandle,
+                teleportPosition,
+                teleportLookAt,
+                (uint)TeleportFlags.ViaLocation);
+
+            Assert.That(sceneA.GetScenePresence(userId), Is.Null);
+
+            ScenePresence sceneBSp = sceneB.GetScenePresence(userId);
+            Assert.That(sceneBSp, Is.Not.Null);
+            Assert.That(sceneBSp.Scene.RegionInfo.RegionName, Is.EqualTo(sceneB.RegionInfo.RegionName));
+            Assert.That(sceneBSp.AbsolutePosition, Is.EqualTo(teleportPosition));
+
+            Assert.That(sceneA.GetRootAgentCount(), Is.EqualTo(0));
+            Assert.That(sceneA.GetChildAgentCount(), Is.EqualTo(0));
+            Assert.That(sceneB.GetRootAgentCount(), Is.EqualTo(1));
+            Assert.That(sceneB.GetChildAgentCount(), Is.EqualTo(0));
+
+            // TODO: Add assertions to check correct circuit details in both scenes.
+
+            // Lookat is sent to the client only - sp.Lookat does not yield the same thing (calculation from camera
+            // position instead).
+//            Assert.That(sp.Lookat, Is.EqualTo(teleportLookAt));
+        }
+
         /// <summary>
         /// Test teleport procedures when the target simulator returns false when queried about access.
         /// </summary>
@@ -224,7 +290,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             Vector3 teleportPosition = new Vector3(10, 11, 12);
             Vector3 teleportLookAt = new Vector3(20, 21, 22);
 
-            ScenePresence sp = SceneHelpers.AddScenePresence(sceneA, userId, sh.SceneManager);
+            ScenePresence sp = SceneHelpers.AddScenePresence(sceneA, userId);
             sp.AbsolutePosition = preTeleportPosition;
 
             // Make sceneB return false on query access
@@ -300,7 +366,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             Vector3 teleportPosition = new Vector3(10, 11, 12);
             Vector3 teleportLookAt = new Vector3(20, 21, 22);
 
-            ScenePresence sp = SceneHelpers.AddScenePresence(sceneA, userId, sh.SceneManager);
+            ScenePresence sp = SceneHelpers.AddScenePresence(sceneA, userId);
             sp.AbsolutePosition = preTeleportPosition;
 
             // Make sceneB refuse CreateAgent
@@ -389,7 +455,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             Vector3 teleportPosition = new Vector3(10, 11, 12);
             Vector3 teleportLookAt = new Vector3(20, 21, 22);
 
-            ScenePresence sp = SceneHelpers.AddScenePresence(sceneA, userId, sh.SceneManager);
+            ScenePresence sp = SceneHelpers.AddScenePresence(sceneA, userId);
             sp.AbsolutePosition = preTeleportPosition;
 
             sceneA.RequestTeleportLocation(
@@ -425,10 +491,10 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         }
 
         [Test]
-        public void TestSameSimulatorNeighbouringRegions()
+        public void TestSameSimulatorNeighbouringRegionsV1()
         {
             TestHelpers.InMethod();
-            TestHelpers.EnableLogging();
+//            TestHelpers.EnableLogging();
 
             UUID userId = TestHelpers.ParseTail(0x1);
 
@@ -454,15 +520,18 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             SceneHelpers.SetupSceneModules(sceneA, config, new CapabilitiesModule(), etmA);
             SceneHelpers.SetupSceneModules(sceneB, config, new CapabilitiesModule(), etmB);
 
+            // FIXME: Hack - this is here temporarily to revert back to older entity transfer behaviour
+            lscm.ServiceVersion = "SIMULATION/0.1";
+
             Vector3 teleportPosition = new Vector3(10, 11, 12);
             Vector3 teleportLookAt = new Vector3(20, 21, 22);
 
             AgentCircuitData acd = SceneHelpers.GenerateAgentData(userId);
-            TestClient tc = new TestClient(acd, sceneA, sh.SceneManager);
+            TestClient tc = new TestClient(acd, sceneA);
             List<TestClient> destinationTestClients = new List<TestClient>();
-            EntityTransferHelpers.SetUpInformClientOfNeighbour(tc, destinationTestClients);
+            EntityTransferHelpers.SetupInformClientOfNeighbourTriggersNeighbourClientCreate(tc, destinationTestClients);
 
-            ScenePresence beforeSceneASp = SceneHelpers.AddScenePresence(sceneA, tc, acd, sh.SceneManager);
+            ScenePresence beforeSceneASp = SceneHelpers.AddScenePresence(sceneA, tc, acd);
             beforeSceneASp.AbsolutePosition = new Vector3(30, 31, 32);
 
             Assert.That(beforeSceneASp, Is.Not.Null);
@@ -506,5 +575,89 @@ namespace OpenSim.Region.Framework.Scenes.Tests
 
 //            TestHelpers.DisableLogging();
         }
+
+        [Test]
+        public void TestSameSimulatorNeighbouringRegionsV2()
+        {
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            UUID userId = TestHelpers.ParseTail(0x1);
+
+            EntityTransferModule etmA = new EntityTransferModule();
+            EntityTransferModule etmB = new EntityTransferModule();
+            LocalSimulationConnectorModule lscm = new LocalSimulationConnectorModule();
+
+            IConfigSource config = new IniConfigSource();
+            IConfig modulesConfig = config.AddConfig("Modules");
+            modulesConfig.Set("EntityTransferModule", etmA.Name);
+            modulesConfig.Set("SimulationServices", lscm.Name);
+
+            SceneHelpers sh = new SceneHelpers();
+            TestScene sceneA = sh.SetupScene("sceneA", TestHelpers.ParseTail(0x100), 1000, 1000);
+            TestScene sceneB = sh.SetupScene("sceneB", TestHelpers.ParseTail(0x200), 1001, 1000);
+
+            SceneHelpers.SetupSceneModules(new Scene[] { sceneA, sceneB }, config, lscm);
+            SceneHelpers.SetupSceneModules(sceneA, config, new CapabilitiesModule(), etmA);
+            SceneHelpers.SetupSceneModules(sceneB, config, new CapabilitiesModule(), etmB);
+
+            Vector3 teleportPosition = new Vector3(10, 11, 12);
+            Vector3 teleportLookAt = new Vector3(20, 21, 22);
+
+            AgentCircuitData acd = SceneHelpers.GenerateAgentData(userId);
+            TestClient tc = new TestClient(acd, sceneA);
+            List<TestClient> destinationTestClients = new List<TestClient>();
+            EntityTransferHelpers.SetupInformClientOfNeighbourTriggersNeighbourClientCreate(tc, destinationTestClients);
+
+            ScenePresence beforeSceneASp = SceneHelpers.AddScenePresence(sceneA, tc, acd);
+            beforeSceneASp.AbsolutePosition = new Vector3(30, 31, 32);
+
+            Assert.That(beforeSceneASp, Is.Not.Null);
+            Assert.That(beforeSceneASp.IsChildAgent, Is.False);
+
+            ScenePresence beforeSceneBSp = sceneB.GetScenePresence(userId);
+            Assert.That(beforeSceneBSp, Is.Not.Null);
+            Assert.That(beforeSceneBSp.IsChildAgent, Is.True);
+
+            // Here, we need to make clientA's receipt of SendRegionTeleport trigger clientB's CompleteMovement().  This
+            // is to operate the teleport V2 mechanism where the EntityTransferModule will first request the client to
+            // CompleteMovement to the region and then call UpdateAgent to the destination region to confirm the receipt
+            // Both these operations will occur on different threads and will wait for each other.
+            // We have to do this via ThreadPool directly since FireAndForget has been switched to sync for the V1
+            // test protocol, where we are trying to avoid unpredictable async operations in regression tests.
+            tc.OnTestClientSendRegionTeleport 
+                += (regionHandle, simAccess, regionExternalEndPoint, locationID, flags, capsURL) 
+                    => ThreadPool.UnsafeQueueUserWorkItem(o => destinationTestClients[0].CompleteMovement(), null);
+
+            sceneA.RequestTeleportLocation(
+                beforeSceneASp.ControllingClient,
+                sceneB.RegionInfo.RegionHandle,
+                teleportPosition,
+                teleportLookAt,
+                (uint)TeleportFlags.ViaLocation);
+
+            ScenePresence afterSceneASp = sceneA.GetScenePresence(userId);
+            Assert.That(afterSceneASp, Is.Not.Null);
+            Assert.That(afterSceneASp.IsChildAgent, Is.True);
+
+            ScenePresence afterSceneBSp = sceneB.GetScenePresence(userId);
+            Assert.That(afterSceneBSp, Is.Not.Null);
+            Assert.That(afterSceneBSp.IsChildAgent, Is.False);
+            Assert.That(afterSceneBSp.Scene.RegionInfo.RegionName, Is.EqualTo(sceneB.RegionInfo.RegionName));
+            Assert.That(afterSceneBSp.AbsolutePosition, Is.EqualTo(teleportPosition));
+
+            Assert.That(sceneA.GetRootAgentCount(), Is.EqualTo(0));
+            Assert.That(sceneA.GetChildAgentCount(), Is.EqualTo(1));
+            Assert.That(sceneB.GetRootAgentCount(), Is.EqualTo(1));
+            Assert.That(sceneB.GetChildAgentCount(), Is.EqualTo(0));
+
+            // TODO: Add assertions to check correct circuit details in both scenes.
+
+            // Lookat is sent to the client only - sp.Lookat does not yield the same thing (calculation from camera
+            // position instead).
+//            Assert.That(sp.Lookat, Is.EqualTo(teleportLookAt));
+
+//            TestHelpers.DisableLogging();
+        }
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index b09ae39..e60a025 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -34,6 +34,7 @@ using System.Threading;
 using log4net;
 using OpenMetaverse;
 using OpenMetaverse.Assets;
+using OpenMetaverse.StructuredData;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes.Serialization;
 using OpenSim.Services.Interfaces;
@@ -180,6 +181,14 @@ namespace OpenSim.Region.Framework.Scenes
                         if (!assetUuids.ContainsKey(tii.AssetID))
                             GatherAssetUuids(tii.AssetID, (AssetType)tii.Type, assetUuids);
                     }
+
+                    // FIXME: We need to make gathering modular but we cannot yet, since gatherers are not guaranteed
+                    // to be called with scene objects that are in a scene (e.g. in the case of hg asset mapping and
+                    // inventory transfer.  There needs to be a way for a module to register a method without assuming a 
+                    // Scene.EventManager is present.
+//                    part.ParentGroup.Scene.EventManager.TriggerGatherUuids(part, assetUuids);
+
+                    GatherMaterialsUuids(part, assetUuids);
                 }
                 catch (Exception e)
                 {
@@ -205,6 +214,73 @@ namespace OpenSim.Region.Framework.Scenes
 //        }
 
         /// <summary>
+        /// Gather all of the texture asset UUIDs used to reference "Materials" such as normal and specular maps
+        /// </summary>
+        /// <param name="part"></param>
+        /// <param name="assetUuids"></param>
+        public void GatherMaterialsUuids(SceneObjectPart part, IDictionary<UUID, AssetType> assetUuids)
+        {
+            // scan thru the dynAttrs map of this part for any textures used as materials
+            OSD osdMaterials = null;
+
+            lock (part.DynAttrs)
+            {
+                if (part.DynAttrs.ContainsStore("OpenSim", "Materials"))
+                {
+                    OSDMap materialsStore = part.DynAttrs.GetStore("OpenSim", "Materials");
+
+                    if (materialsStore == null)
+                        return;
+
+                    materialsStore.TryGetValue("Materials", out osdMaterials);
+                }
+
+                if (osdMaterials != null)
+                {
+                    //m_log.Info("[UUID Gatherer]: found Materials: " + OSDParser.SerializeJsonString(osd));
+
+                    if (osdMaterials is OSDArray)
+                    {
+                        OSDArray matsArr = osdMaterials as OSDArray;
+                        foreach (OSDMap matMap in matsArr)
+                        {
+                            try
+                            {
+                                if (matMap.ContainsKey("Material"))
+                                {
+                                    OSDMap mat = matMap["Material"] as OSDMap;
+                                    if (mat.ContainsKey("NormMap"))
+                                    {
+                                        UUID normalMapId = mat["NormMap"].AsUUID();
+                                        if (normalMapId != UUID.Zero)
+                                        {
+                                            assetUuids[normalMapId] = AssetType.Texture;
+                                            //m_log.Info("[UUID Gatherer]: found normal map ID: " + normalMapId.ToString());
+                                        }
+                                    }
+                                    if (mat.ContainsKey("SpecMap"))
+                                    {
+                                        UUID specularMapId = mat["SpecMap"].AsUUID();
+                                        if (specularMapId != UUID.Zero)
+                                        {
+                                            assetUuids[specularMapId] = AssetType.Texture;
+                                            //m_log.Info("[UUID Gatherer]: found specular map ID: " + specularMapId.ToString());
+                                        }
+                                    }
+                                }
+
+                            }
+                            catch (Exception e)
+                            {
+                                m_log.Warn("[UUID Gatherer]: exception getting materials: " + e.Message);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+       
+        /// <summary>
         /// Get an asset synchronously, potentially using an asynchronous callback.  If the
         /// asynchronous callback is used, we will wait for it to complete.
         /// </summary>
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index dd72cfb..a96c8b4 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -660,6 +660,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
         public event BakeTerrain OnBakeTerrain;
         public event EstateChangeInfo OnEstateChangeInfo;
         public event EstateManageTelehub OnEstateManageTelehub;
+        public event CachedTextureRequest OnCachedTextureRequest;
         public event SetAppearance OnSetAppearance;
         public event AvatarNowWearing OnAvatarNowWearing;
         public event RezSingleAttachmentFromInv OnRezSingleAttachmentFromInv;
@@ -687,6 +688,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
         public event Action<IClientAPI, bool> OnCompleteMovementToRegion;
         public event UpdateAgent OnPreAgentUpdate;
         public event UpdateAgent OnAgentUpdate;
+        public event UpdateAgent OnAgentCameraUpdate;
         public event AgentRequestSit OnAgentRequestSit;
         public event AgentSit OnAgentSit;
         public event AvatarPickerRequest OnAvatarPickerRequest;
@@ -943,13 +945,18 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
         {
             
         }
+        
+        public void SendCachedTextureResponse(ISceneEntity avatar, int serial, List<CachedTextureResponseArg> cachedTextures)
+        {
 
+        }
+        
         public void SendStartPingCheck(byte seq)
         {
             
         }
 
-        public void SendKillObject(ulong regionHandle, List<uint> localID)
+        public void SendKillObject(List<uint> localID)
         {
             
         }
@@ -1681,7 +1688,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
         {
         }
 
-        public void StopFlying(ISceneEntity presence)
+        public void SendAgentTerseUpdate(ISceneEntity presence)
         {
         }
         
diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
index 992f38e..1eb0a6b 100644
--- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
 using System.Text;
 using log4net;
@@ -51,7 +52,7 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "LindenUDPInfoModule")]
     public class LindenUDPInfoModule : ISharedRegionModule
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);                
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);                
         
         protected Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>();
         
@@ -130,6 +131,15 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
                 "Go on/off emergency monitoring mode",
                 "Go on/off emergency monitoring mode",
                 HandleEmergencyMonitoring);
+
+            scene.AddCommand(
+                "Comms", this, "show client stats",
+                "show client stats [first_name last_name]",
+                "Show client request stats",
+                "Without the 'first_name last_name' option, all clients are shown."
+                  + "  With the 'first_name last_name' option only a specific client is shown.",
+                (mod, cmd) => MainConsole.Instance.Output(HandleClientStatsReport(cmd)));
+
         }
         
         public void RemoveRegion(Scene scene)
@@ -587,6 +597,115 @@ namespace OpenSim.Region.OptionalModules.UDP.Linden
                 (throttleRates.Asset  * 8) / 1000);  
 
             return report.ToString();
-        }        
+        }
+
+        /// <summary>
+        /// Show client stats data
+        /// </summary>
+        /// <param name="showParams"></param>
+        /// <returns></returns>
+        protected string HandleClientStatsReport(string[] showParams)
+        {
+            // NOTE: This writes to m_log on purpose. We want to store this information
+            // in case we need to analyze it later.
+            //
+            if (showParams.Length <= 4)
+            {
+                m_log.InfoFormat("[INFO]: {0,-12} {1,-20} {2,-6} {3,-11} {4,-11} {5,-16}", "Region", "Name", "Root", "Time", "Reqs/min", "AgentUpdates");
+                foreach (Scene scene in m_scenes.Values)
+                {
+                    scene.ForEachClient(
+                        delegate(IClientAPI client)
+                        {
+                            if (client is LLClientView)
+                            {
+                                LLClientView llClient = client as LLClientView;
+                                ClientInfo cinfo = llClient.UDPClient.GetClientInfo();
+                                int avg_reqs = cinfo.AsyncRequests.Values.Sum() + cinfo.GenericRequests.Values.Sum() + cinfo.SyncRequests.Values.Sum();
+                                avg_reqs = avg_reqs / ((DateTime.Now - cinfo.StartedTime).Minutes + 1);
+
+                                string childAgentStatus;
+
+                                if (llClient.SceneAgent != null)
+                                    childAgentStatus = llClient.SceneAgent.IsChildAgent ? "N" : "Y"; 
+                                else
+                                    childAgentStatus = "Off!";
+
+                                m_log.InfoFormat("[INFO]: {0,-12} {1,-20} {2,-6} {3,-11} {4,-11} {5,-16}", 
+                                    scene.RegionInfo.RegionName, llClient.Name,
+                                         childAgentStatus, 
+                                         (DateTime.Now - cinfo.StartedTime).Minutes,
+                                         avg_reqs, 
+                                         string.Format(
+                                            "{0} ({1:0.00}%)", 
+                                            llClient.TotalAgentUpdates, 
+                                            (float)cinfo.SyncRequests["AgentUpdate"] / llClient.TotalAgentUpdates * 100));
+                            }
+                        });
+                }
+                return string.Empty;
+            }
+
+            string fname = "", lname = "";
+
+            if (showParams.Length > 3)
+                fname = showParams[3];
+            if (showParams.Length > 4)
+                lname = showParams[4];
+
+            foreach (Scene scene in m_scenes.Values)
+            {
+                scene.ForEachClient(
+                    delegate(IClientAPI client)
+                    {
+                        if (client is LLClientView)
+                        {
+                            LLClientView llClient = client as LLClientView;
+
+                            if (llClient.Name == fname + " " + lname)
+                            {
+
+                                ClientInfo cinfo = llClient.GetClientInfo();
+                                AgentCircuitData aCircuit = scene.AuthenticateHandler.GetAgentCircuitData(llClient.CircuitCode);
+                                if (aCircuit == null) // create a dummy one
+                                    aCircuit = new AgentCircuitData();
+
+                                if (!llClient.SceneAgent.IsChildAgent)
+                                    m_log.InfoFormat("[INFO]: {0} # {1} # {2}", llClient.Name, aCircuit.Viewer, aCircuit.Id0);
+
+                                int avg_reqs = cinfo.AsyncRequests.Values.Sum() + cinfo.GenericRequests.Values.Sum() + cinfo.SyncRequests.Values.Sum();
+                                avg_reqs = avg_reqs / ((DateTime.Now - cinfo.StartedTime).Minutes + 1);
+
+                                m_log.InfoFormat("[INFO]:");
+                                m_log.InfoFormat("[INFO]: {0} # {1} # Time: {2}min # Avg Reqs/min: {3}", scene.RegionInfo.RegionName,
+                                    (llClient.SceneAgent.IsChildAgent ? "Child" : "Root"), (DateTime.Now - cinfo.StartedTime).Minutes, avg_reqs);
+
+                                Dictionary<string, int> sortedDict = (from entry in cinfo.AsyncRequests orderby entry.Value descending select entry)
+                                        .ToDictionary(pair => pair.Key, pair => pair.Value);
+                                PrintRequests("TOP ASYNC", sortedDict, cinfo.AsyncRequests.Values.Sum());
+
+                                sortedDict = (from entry in cinfo.SyncRequests orderby entry.Value descending select entry)
+                                        .ToDictionary(pair => pair.Key, pair => pair.Value);
+                                PrintRequests("TOP SYNC", sortedDict, cinfo.SyncRequests.Values.Sum());
+
+                                sortedDict = (from entry in cinfo.GenericRequests orderby entry.Value descending select entry)
+                                        .ToDictionary(pair => pair.Key, pair => pair.Value);
+                                PrintRequests("TOP GENERIC", sortedDict, cinfo.GenericRequests.Values.Sum());
+                            }
+                        }
+                    });
+            }
+            return string.Empty;
+        }
+
+        private void PrintRequests(string type, Dictionary<string, int> sortedDict, int sum)
+        {
+            m_log.InfoFormat("[INFO]:");
+            m_log.InfoFormat("[INFO]: {0,25}", type);
+            foreach (KeyValuePair<string, int> kvp in sortedDict.Take(12))
+                m_log.InfoFormat("[INFO]: {0,25} {1,-6}", kvp.Key, kvp.Value);
+            m_log.InfoFormat("[INFO]: {0,25}", "...");
+            m_log.InfoFormat("[INFO]: {0,25} {1,-6}", "Total", sum);
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
index 018357a..c48e585 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Concierge/ConciergeModule.cs
@@ -375,11 +375,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.Concierge
                                           scene.GetRootAgentCount(), scene.RegionInfo.RegionName,
                                           scene.RegionInfo.RegionID,
                                           DateTime.UtcNow.ToString("s")));
+
             scene.ForEachRootScenePresence(delegate(ScenePresence sp)
             {
-                    list.Append(String.Format("    <avatar name=\"{0}\" uuid=\"{1}\" />\n", sp.Name, sp.UUID));
-                    list.Append("</avatars>");
+                list.Append(String.Format("    <avatar name=\"{0}\" uuid=\"{1}\" />\n", sp.Name, sp.UUID));                    
             });
+
+            list.Append("</avatars>");
             string payload = list.ToString();
 
             // post via REST to broker
diff --git a/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs b/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs
new file mode 100644
index 0000000..5a6b284
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs
@@ -0,0 +1,220 @@
+/*
+ * 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.Linq;
+using System.Reflection;
+using System.Text;
+using System.Text.RegularExpressions;
+using log4net;
+using Mono.Addins;
+using NDesk.Options;
+using Nini.Config;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Console;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Region.OptionalModules.Avatar.SitStand
+{
+    /// <summary>
+    /// A module that just holds commands for changing avatar sitting and standing states.
+    /// </summary>
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "AnimationsCommandModule")]
+    public class SitStandCommandModule : INonSharedRegionModule
+    {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private Scene m_scene;
+
+        public string Name { get { return "SitStand Command Module"; } }
+        
+        public Type ReplaceableInterface { get { return null; } }
+        
+        public void Initialise(IConfigSource source)
+        {
+//            m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: INITIALIZED MODULE");
+        }
+        
+        public void PostInitialise()
+        {
+//            m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: POST INITIALIZED MODULE");
+        }
+        
+        public void Close()
+        {
+//            m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: CLOSED MODULE");
+        }
+        
+        public void AddRegion(Scene scene)
+        {
+//            m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName);
+        }
+        
+        public void RemoveRegion(Scene scene)
+        {
+//            m_log.DebugFormat("[ATTACHMENTS COMMAND MODULE]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
+        }        
+        
+        public void RegionLoaded(Scene scene)
+        {
+//            m_log.DebugFormat("[ANIMATIONS COMMAND MODULE]: REGION {0} LOADED", scene.RegionInfo.RegionName);
+
+            m_scene = scene;
+
+            scene.AddCommand(
+                "Users", this, "sit user name",
+                "sit user name [--regex] <first-name> <last-name>",
+                "Sit the named user on an unoccupied object with a sit target.",
+                "If there are no such objects then nothing happens.\n"
+                    + "If --regex is specified then the names are treated as regular expressions.",
+                HandleSitUserNameCommand);
+
+            scene.AddCommand(
+                "Users", this, "stand user name",
+                "stand user name [--regex] <first-name> <last-name>",
+                "Stand the named user.",
+                "If --regex is specified then the names are treated as regular expressions.",
+                HandleStandUserNameCommand);
+        }
+
+        private void HandleSitUserNameCommand(string module, string[] cmd)
+        {
+            if (MainConsole.Instance.ConsoleScene != m_scene && MainConsole.Instance.ConsoleScene != null)
+                return;
+
+            if (cmd.Length < 5)
+            {
+                MainConsole.Instance.Output("Usage: sit user name [--regex] <first-name> <last-name>");
+                return;
+            }
+
+            List<ScenePresence> scenePresences = GetScenePresences(cmd);
+
+            foreach (ScenePresence sp in scenePresences)
+            {
+                if (sp.SitGround || sp.IsSatOnObject)
+                    continue;
+
+                SceneObjectPart sitPart = null;
+                List<SceneObjectGroup> sceneObjects = m_scene.GetSceneObjectGroups();
+
+                foreach (SceneObjectGroup sceneObject in sceneObjects)
+                {
+                    if (sceneObject.IsAttachment)
+                        continue;
+
+                    foreach (SceneObjectPart part in sceneObject.Parts)
+                    {
+                        if (part.IsSitTargetSet && part.SitTargetAvatar == UUID.Zero)
+                        {
+                            sitPart = part;
+                            break;
+                        }
+                    }
+                }
+
+                if (sitPart != null)
+                {
+                    MainConsole.Instance.OutputFormat(
+                        "Sitting {0} on {1} {2} in {3}", 
+                        sp.Name, sitPart.ParentGroup.Name, sitPart.ParentGroup.UUID, m_scene.Name);
+
+                    sp.HandleAgentRequestSit(sp.ControllingClient, sp.UUID, sitPart.UUID, Vector3.Zero);
+                    sp.HandleAgentSit(sp.ControllingClient, sp.UUID);
+                }
+                else
+                {
+                    MainConsole.Instance.OutputFormat(
+                        "Could not find any unoccupied set seat on which to sit {0} in {1}.  Aborting",
+                        sp.Name, m_scene.Name);
+
+                    break;
+                }
+            }
+        }
+
+        private void HandleStandUserNameCommand(string module, string[] cmd)
+        {
+            if (MainConsole.Instance.ConsoleScene != m_scene && MainConsole.Instance.ConsoleScene != null)
+                return;
+
+            if (cmd.Length < 5)
+            {
+                MainConsole.Instance.Output("Usage: stand user name [--regex] <first-name> <last-name>");
+                return;
+            }
+
+            List<ScenePresence> scenePresences = GetScenePresences(cmd);
+
+            foreach (ScenePresence sp in scenePresences)
+            {
+                if (sp.SitGround || sp.IsSatOnObject)
+                {
+                    MainConsole.Instance.OutputFormat("Standing {0} in {1}", sp.Name, m_scene.Name);
+                    sp.StandUp();
+                }
+            }
+        }
+
+        private List<ScenePresence> GetScenePresences(string[] cmdParams)
+        {
+            bool useRegex = false;
+            OptionSet options = new OptionSet().Add("regex", v=> useRegex = v != null );
+
+            List<string> mainParams = options.Parse(cmdParams);
+
+            string firstName = mainParams[3];
+            string lastName = mainParams[4];
+
+            List<ScenePresence> scenePresencesMatched = new List<ScenePresence>();
+
+            if (useRegex)
+            {
+                Regex nameRegex = new Regex(string.Format("{0} {1}", firstName, lastName));
+                List<ScenePresence> scenePresences = m_scene.GetScenePresences();
+
+                foreach (ScenePresence sp in scenePresences)
+                {
+                    if (!sp.IsChildAgent && nameRegex.IsMatch(sp.Name)) 
+                        scenePresencesMatched.Add(sp);
+                }
+            }
+            else
+            {
+                ScenePresence sp = m_scene.GetScenePresence(firstName, lastName);
+        
+                if (sp != null && !sp.IsChildAgent)
+                    scenePresencesMatched.Add(sp);
+            }
+
+            return scenePresencesMatched;
+        }
+    }
+}
\ 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 0cec959..2b33084 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -326,15 +326,15 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
                     "ParcelVoiceInfoRequest",
                     agentID.ToString()));
 
-            caps.RegisterHandler(
-                "ChatSessionRequest",
-                new RestStreamHandler(
-                    "POST",
-                    capsBase + m_chatSessionRequestPath,
-                            (request, path, param, httpRequest, httpResponse)
-                                => ChatSessionRequest(scene, request, path, param, agentID, caps),
-                    "ChatSessionRequest",
-                    agentID.ToString()));
+            //caps.RegisterHandler(
+            //    "ChatSessionRequest",
+            //    new RestStreamHandler(
+            //        "POST",
+            //        capsBase + m_chatSessionRequestPath,
+            //                (request, path, param, httpRequest, httpResponse)
+            //                    => ChatSessionRequest(scene, request, path, param, agentID, caps),
+            //        "ChatSessionRequest",
+            //        agentID.ToString()));
         }
 
         /// <summary>
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
index e756c70..349c0d0 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
@@ -117,6 +117,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
         
         private IConfig m_config;
 
+        private object m_Lock;
+
         public void Initialise(IConfigSource config)
         {
 
@@ -128,6 +130,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
             if (!m_config.GetBoolean("enabled", false))
                 return;
 
+            m_Lock = new object();
+
             try
             {
                 // retrieve configuration variables
@@ -429,15 +433,15 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
                     "ParcelVoiceInfoRequest",
                     agentID.ToString()));
 
-            caps.RegisterHandler(
-                "ChatSessionRequest",
-                 new RestStreamHandler(
-                    "POST",
-                    capsBase + m_chatSessionRequestPath,
-                    (request, path, param, httpRequest, httpResponse)
-                        => ChatSessionRequest(scene, request, path, param, agentID, caps),
-                    "ChatSessionRequest",
-                    agentID.ToString()));
+            //caps.RegisterHandler(
+            //    "ChatSessionRequest",
+            //     new RestStreamHandler(
+            //        "POST",
+            //        capsBase + m_chatSessionRequestPath,
+            //        (request, path, param, httpRequest, httpResponse)
+            //            => ChatSessionRequest(scene, request, path, param, agentID, caps),
+            //        "ChatSessionRequest",
+            //        agentID.ToString()));
         }
 
         /// <summary>
@@ -837,7 +841,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
             requrl = String.Format("{0}&chan_roll_off={1}",          requrl, m_vivoxChannelRollOff);
             requrl = String.Format("{0}&chan_dist_model={1}",        requrl, m_vivoxChannelDistanceModel);
             requrl = String.Format("{0}&chan_max_range={1}",         requrl, m_vivoxChannelMaximumRange);
-            requrl = String.Format("{0}&chan_ckamping_distance={1}", requrl, m_vivoxChannelClampingDistance);
+            requrl = String.Format("{0}&chan_clamping_distance={1}", requrl, m_vivoxChannelClampingDistance);
             
             XmlElement resp = VivoxCall(requrl, true);
             if (XmlFind(resp, "response.level0.body.chan_uri", out channelUri))
@@ -1118,25 +1122,32 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
 
             doc = new XmlDocument();
 
-            try
+            // Let's serialize all calls to Vivox. Most of these are driven by
+            // the clients (CAPs), when the user arrives at the region. We don't 
+            // want to issue many simultaneous http requests to Vivox, because mono
+            // doesn't like that
+            lock (m_Lock)
             {
-                // Otherwise prepare the request
-//                m_log.DebugFormat("[VivoxVoice] Sending request <{0}>", requrl);
+                try
+                {
+                    // Otherwise prepare the request
+                    //m_log.DebugFormat("[VivoxVoice] Sending request <{0}>", requrl);
 
-                HttpWebRequest req = (HttpWebRequest)WebRequest.Create(requrl);
+                    HttpWebRequest req = (HttpWebRequest)WebRequest.Create(requrl);
 
-                // We are sending just parameters, no content
-                req.ContentLength = 0;
+                    // We are sending just parameters, no content
+                    req.ContentLength = 0;
 
-                // Send request and retrieve the response
-                using (HttpWebResponse rsp = (HttpWebResponse)req.GetResponse())
+                    // Send request and retrieve the response
+                    using (HttpWebResponse rsp = (HttpWebResponse)req.GetResponse())
                     using (Stream s = rsp.GetResponseStream())
-                        using (XmlTextReader rdr = new XmlTextReader(s))
-                            doc.Load(rdr);
-            }
-            catch (Exception e)
-            {
-                m_log.ErrorFormat("[VivoxVoice] Error in admin call : {0}", e.Message);
+                    using (XmlTextReader rdr = new XmlTextReader(s))
+                        doc.Load(rdr);
+                }
+                catch (Exception e)
+                {
+                    m_log.ErrorFormat("[VivoxVoice] Error in admin call : {0}", e.Message);
+                }
             }
 
             // If we're debugging server responses, dump the whole
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index d0a5989..8a734e1 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -250,7 +250,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             client.OnUUIDGroupNameRequest += HandleUUIDGroupNameRequest;
             client.OnAgentDataUpdateRequest += OnAgentDataUpdateRequest;
-            client.OnDirFindQuery += OnDirFindQuery;
             client.OnRequestAvatarProperties += OnRequestAvatarProperties;
 
             // Used for Notices and Group Invites/Accept/Reject
@@ -303,21 +302,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
         }
         */
 
-        void OnDirFindQuery(IClientAPI remoteClient, UUID queryID, string queryText, uint queryFlags, int queryStart)
-        {
-            if (((DirFindFlags)queryFlags & DirFindFlags.Groups) == DirFindFlags.Groups)
-            {
-                if (m_debugEnabled) 
-                    m_log.DebugFormat(
-                        "[GROUPS]: {0} called with queryText({1}) queryFlags({2}) queryStart({3})", 
-                        System.Reflection.MethodBase.GetCurrentMethod().Name, queryText, (DirFindFlags)queryFlags, queryStart);
-
-                // TODO: This currently ignores pretty much all the query flags including Mature and sort order
-                remoteClient.SendDirGroupsReply(queryID, m_groupData.FindGroups(GetRequestingAgentID(remoteClient), queryText).ToArray());
-            }
-            
-        }
-
         private void OnAgentDataUpdateRequest(IClientAPI remoteClient, UUID dataForAgentID, UUID sessionID)
         {
             if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
@@ -1178,6 +1162,12 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             }
         }
 
+        public List<DirGroupsReplyData> FindGroups(IClientAPI remoteClient, string query)
+        {
+            return m_groupData.FindGroups(GetRequestingAgentID(remoteClient), query);
+        }
+
+
         #endregion
 
         #region Client/Update Tools
@@ -1222,7 +1212,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             AgentDataMap.Add("AgentID", OSD.FromUUID(dataForAgentID));
             AgentData.Add(AgentDataMap);
 
-
             OSDArray GroupData = new OSDArray(data.Length);
             OSDArray NewGroupData = new OSDArray(data.Length);
 
diff --git a/OpenSim/Region/OptionalModules/Framework/Monitoring/ServerStats.cs b/OpenSim/Region/OptionalModules/Framework/Monitoring/ServerStats.cs
deleted file mode 100644
index 6e74ce0..0000000
--- a/OpenSim/Region/OptionalModules/Framework/Monitoring/ServerStats.cs
+++ /dev/null
@@ -1,339 +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.Diagnostics;
-using System.Linq;
-using System.Net.NetworkInformation;
-using System.Text;
-using System.Threading;
-
-using log4net;
-using Mono.Addins;
-using Nini.Config;
-
-using OpenSim.Framework;
-using OpenSim.Framework.Console;
-using OpenSim.Framework.Monitoring;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-
-using OpenMetaverse.StructuredData;
-
-namespace OpenSim.Region.OptionalModules.Framework.Monitoring
-{
-[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ServerStatistics")]
-public class ServerStats : ISharedRegionModule
-{
-    private readonly ILog m_log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-    private readonly string LogHeader = "[SERVER STATS]";
-
-    public bool Enabled = false;
-    private static Dictionary<string, Stat> RegisteredStats = new Dictionary<string, Stat>();
-
-    public readonly string CategoryServer = "server";
-
-    public readonly string ContainerProcessor = "processor";
-    public readonly string ContainerMemory = "memory";
-    public readonly string ContainerNetwork = "network";
-    public readonly string ContainerProcess = "process";
-
-    public string NetworkInterfaceTypes = "Ethernet";
-
-    readonly int performanceCounterSampleInterval = 500;
-    int lastperformanceCounterSampleTime = 0;
-
-    private class PerfCounterControl
-    {
-        public PerformanceCounter perfCounter;
-        public int lastFetch;
-        public string name;
-        public PerfCounterControl(PerformanceCounter pPc)
-            : this(pPc, String.Empty)
-        {
-        }
-        public PerfCounterControl(PerformanceCounter pPc, string pName)
-        {
-            perfCounter = pPc;
-            lastFetch = 0;
-            name = pName;
-        }
-    }
-
-    PerfCounterControl processorPercentPerfCounter = null;
-
-    #region ISharedRegionModule
-    // IRegionModuleBase.Name
-    public string Name { get { return "Server Stats"; } }
-    // IRegionModuleBase.ReplaceableInterface
-    public Type ReplaceableInterface { get { return null; } }
-    // IRegionModuleBase.Initialize
-    public void Initialise(IConfigSource source)
-    {
-        IConfig cfg = source.Configs["Monitoring"];
-
-        if (cfg != null)
-            Enabled = cfg.GetBoolean("ServerStatsEnabled", true);
-
-        if (Enabled)
-        {
-            NetworkInterfaceTypes = cfg.GetString("NetworkInterfaceTypes", "Ethernet");
-        }
-    }
-    // IRegionModuleBase.Close
-    public void Close()
-    {
-        if (RegisteredStats.Count > 0)
-        {
-            foreach (Stat stat in RegisteredStats.Values)
-            {
-                StatsManager.DeregisterStat(stat);
-                stat.Dispose();
-            }
-            RegisteredStats.Clear();
-        }
-    }
-    // IRegionModuleBase.AddRegion
-    public void AddRegion(Scene scene)
-    {
-    }
-    // IRegionModuleBase.RemoveRegion
-    public void RemoveRegion(Scene scene)
-    {
-    }
-    // IRegionModuleBase.RegionLoaded
-    public void RegionLoaded(Scene scene)
-    {
-    }
-    // ISharedRegionModule.PostInitialize
-    public void PostInitialise()
-    {
-        if (RegisteredStats.Count == 0)
-        {
-            RegisterServerStats();
-        }
-    }
-    #endregion ISharedRegionModule
-
-    private void MakeStat(string pName, string pDesc, string pUnit, string pContainer, Action<Stat> act)
-    {
-        string desc = pDesc;
-        if (desc == null)
-            desc = pName;
-        Stat stat = new Stat(pName, pName, desc, pUnit, CategoryServer, pContainer, StatType.Pull, act, StatVerbosity.Info);
-        StatsManager.RegisterStat(stat);
-        RegisteredStats.Add(pName, stat);
-    }
-
-    public void RegisterServerStats()
-    {
-        lastperformanceCounterSampleTime = Util.EnvironmentTickCount();
-        PerformanceCounter tempPC;
-        Stat tempStat;
-        string tempName;
-
-        try
-        {
-            tempName = "CPUPercent";
-            tempPC = new PerformanceCounter("Processor", "% Processor Time", "_Total");
-            processorPercentPerfCounter = new PerfCounterControl(tempPC);
-            // A long time bug in mono is that CPU percent is reported as CPU percent idle. Windows reports CPU percent busy.
-            tempStat = new Stat(tempName, tempName, "", "percent", CategoryServer, ContainerProcessor,
-                            StatType.Pull, (s) => { GetNextValue(s, processorPercentPerfCounter, Util.IsWindows() ? 1 : -1); },
-                            StatVerbosity.Info);
-            StatsManager.RegisterStat(tempStat);
-            RegisteredStats.Add(tempName, tempStat);
-
-            MakeStat("TotalProcessorTime", null, "sec", ContainerProcessor, 
-                                (s) => { s.Value = Process.GetCurrentProcess().TotalProcessorTime.TotalSeconds; });
-
-            MakeStat("UserProcessorTime", null, "sec", ContainerProcessor,
-                                (s) => { s.Value = Process.GetCurrentProcess().UserProcessorTime.TotalSeconds; });
-
-            MakeStat("PrivilegedProcessorTime", null, "sec", ContainerProcessor,
-                                (s) => { s.Value = Process.GetCurrentProcess().PrivilegedProcessorTime.TotalSeconds; });
-
-            MakeStat("Threads", null, "threads", ContainerProcessor,
-                                (s) => { s.Value = Process.GetCurrentProcess().Threads.Count; });
-        }
-        catch (Exception e)
-        {
-            m_log.ErrorFormat("{0} Exception creating 'Process': {1}", LogHeader, e);
-        }
-
-        try
-        {
-            List<string> okInterfaceTypes = new List<string>(NetworkInterfaceTypes.Split(','));
-
-            IEnumerable<NetworkInterface> nics = NetworkInterface.GetAllNetworkInterfaces();
-            foreach (NetworkInterface nic in nics)
-            {
-                if (nic.OperationalStatus != OperationalStatus.Up)
-                    continue;
-
-                string nicInterfaceType = nic.NetworkInterfaceType.ToString();
-                if (!okInterfaceTypes.Contains(nicInterfaceType))
-                {
-                    m_log.DebugFormat("{0} Not including stats for network interface '{1}' of type '{2}'.",
-                                            LogHeader, nic.Name, nicInterfaceType);
-                    m_log.DebugFormat("{0}     To include, add to comma separated list in [Monitoring]NetworkInterfaceTypes={1}",
-                                            LogHeader, NetworkInterfaceTypes);
-                    continue;
-                }
-
-                if (nic.Supports(NetworkInterfaceComponent.IPv4))
-                {
-                    IPv4InterfaceStatistics nicStats = nic.GetIPv4Statistics();
-                    if (nicStats != null)
-                    {
-                        MakeStat("BytesRcvd/" + nic.Name, nic.Name, "KB", ContainerNetwork,
-                                        (s) => { LookupNic(s, (ns) => { return ns.BytesReceived; }, 1024.0); });
-                        MakeStat("BytesSent/" + nic.Name, nic.Name, "KB", ContainerNetwork,
-                                        (s) => { LookupNic(s, (ns) => { return ns.BytesSent; }, 1024.0); });
-                        MakeStat("TotalBytes/" + nic.Name, nic.Name, "KB", ContainerNetwork,
-                                        (s) => { LookupNic(s, (ns) => { return ns.BytesSent + ns.BytesReceived; }, 1024.0); });
-                    }
-                }
-                // TODO: add IPv6 (it may actually happen someday)
-            }
-        }
-        catch (Exception e)
-        {
-            m_log.ErrorFormat("{0} Exception creating 'Network Interface': {1}", LogHeader, e);
-        }
-
-        MakeStat("ProcessMemory", null, "MB", ContainerMemory,
-                            (s) => { s.Value = Process.GetCurrentProcess().WorkingSet64 / 1024d / 1024d; });
-        MakeStat("ObjectMemory", null, "MB", ContainerMemory,
-                            (s) => { s.Value = GC.GetTotalMemory(false) / 1024d / 1024d; });
-        MakeStat("LastMemoryChurn", null, "MB/sec", ContainerMemory,
-                            (s) => { s.Value = Math.Round(MemoryWatchdog.LastMemoryChurn * 1000d / 1024d / 1024d, 3); });
-        MakeStat("AverageMemoryChurn", null, "MB/sec", ContainerMemory,
-                            (s) => { s.Value = Math.Round(MemoryWatchdog.AverageMemoryChurn * 1000d / 1024d / 1024d, 3); });
-    }
-
-    // Notes on performance counters: 
-    //  "How To Read Performance Counters": http://blogs.msdn.com/b/bclteam/archive/2006/06/02/618156.aspx
-    //  "How to get the CPU Usage in C#": http://stackoverflow.com/questions/278071/how-to-get-the-cpu-usage-in-c
-    //  "Mono Performance Counters": http://www.mono-project.com/Mono_Performance_Counters
-    private delegate double PerfCounterNextValue();
-    private void GetNextValue(Stat stat, PerfCounterControl perfControl)
-    {
-        GetNextValue(stat, perfControl, 1.0);
-    }
-    private void GetNextValue(Stat stat, PerfCounterControl perfControl, double factor)
-    {
-        if (Util.EnvironmentTickCountSubtract(perfControl.lastFetch) > performanceCounterSampleInterval)
-        {
-            if (perfControl != null && perfControl.perfCounter != null)
-            {
-                try
-                {
-                    // Kludge for factor to run double duty. If -1, subtract the value from one
-                    if (factor == -1)
-                        stat.Value = 1 - perfControl.perfCounter.NextValue();
-                    else
-                        stat.Value = perfControl.perfCounter.NextValue() / factor;
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat("{0} Exception on NextValue fetching {1}: {2}", LogHeader, stat.Name, e);
-                }
-                perfControl.lastFetch = Util.EnvironmentTickCount();
-            }
-        }
-    }
-
-    // Lookup the nic that goes with this stat and set the value by using a fetch action.
-    // Not sure about closure with delegates inside delegates.
-    private delegate double GetIPv4StatValue(IPv4InterfaceStatistics interfaceStat);
-    private void LookupNic(Stat stat, GetIPv4StatValue getter, double factor)
-    {
-        // Get the one nic that has the name of this stat
-        IEnumerable<NetworkInterface> nics = NetworkInterface.GetAllNetworkInterfaces().Where(
-                              (network) => network.Name == stat.Description);
-        try
-        {
-            foreach (NetworkInterface nic in nics)
-            {
-                IPv4InterfaceStatistics intrStats = nic.GetIPv4Statistics();
-                if (intrStats != null)
-                {
-                    double newVal = Math.Round(getter(intrStats) / factor, 3);
-                    stat.Value = newVal;
-                }
-                break;
-            }
-        }
-        catch
-        {
-            // There are times interfaces go away so we just won't update the stat for this
-            m_log.ErrorFormat("{0} Exception fetching stat on interface '{1}'", LogHeader, stat.Description);
-        }
-    }
-}
-
-public class ServerStatsAggregator : Stat
-{
-    public ServerStatsAggregator(
-        string shortName,
-        string name,
-        string description,
-        string unitName,
-        string category,
-        string container
-        )
-        : base(
-            shortName,
-            name,
-            description,
-            unitName,
-            category,
-            container,
-            StatType.Push,
-            MeasuresOfInterest.None,
-            null,
-            StatVerbosity.Info)
-    {
-    }
-    public override string ToConsoleString()
-    {
-        StringBuilder sb = new StringBuilder();
-
-        return sb.ToString();
-    }
-
-    public override OSDMap ToOSDMap()
-    {
-        OSDMap ret = new OSDMap();
-
-        return ret;
-    }
-}
-
-}
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
new file mode 100644
index 0000000..d8f5563
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -0,0 +1,657 @@
+/*
+ * 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.Reflection;
+using System.Security.Cryptography; // for computing md5 hash
+using log4net;
+using Mono.Addins;
+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 Ionic.Zlib;
+
+// You will need to uncomment these lines if you are adding a region module to some other assembly which does not already
+// specify its assembly.  Otherwise, the region modules in the assembly will not be picked up when OpenSimulator scans
+// the available DLLs
+//[assembly: Addin("MaterialsDemoModule", "1.0")]
+//[assembly: AddinDependency("OpenSim", "0.5")]
+
+namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
+{
+    /// <summary>
+    ///
+    //   #    #    ##    #####   #    #     #    #    #   ####
+    //   #    #   #  #   #    #  ##   #     #    ##   #  #    #
+    //   #    #  #    #  #    #  # #  #     #    # #  #  #
+    //   # ## #  ######  #####   #  # #     #    #  # #  #  ###
+    //   ##  ##  #    #  #   #   #   ##     #    #   ##  #    #
+    //   #    #  #    #  #    #  #    #     #    #    #   ####
+    //
+    //   THIS MODULE IS FOR EXPERIMENTAL USE ONLY AND MAY CAUSE REGION OR ASSET CORRUPTION!
+    //
+    //////////////  WARNING  //////////////////////////////////////////////////////////////////
+    /// This is an *Experimental* module for developing support for materials-capable viewers
+    /// This module should NOT be used in a production environment! It may cause data corruption and
+    /// viewer crashes. It should be only used to evaluate implementations of materials.
+    /// 
+    /// Materials are persisted via SceneObjectPart.dynattrs. This is a relatively new feature
+    /// of OpenSimulator and is not field proven at the time this module was written. Persistence
+    /// may fail or become corrupt and this could cause viewer crashes due to erroneous materials
+    /// data being sent to viewers. Materials descriptions might survive IAR, OAR, or other means
+    /// of archiving however the texture resources used by these materials probably will not as they
+    /// may not be adequately referenced to ensure proper archiving.
+    /// 
+    /// 
+    /// 
+    /// To enable this module, add this string at the bottom of OpenSim.ini:
+    /// [MaterialsDemoModule]
+    /// 
+    /// </summary>
+    /// 
+
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "MaterialsDemoModule")]
+    public class MaterialsDemoModule : INonSharedRegionModule
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        
+        public string Name { get { return "MaterialsDemoModule"; } }        
+        
+        public Type ReplaceableInterface { get { return null; } }
+
+        private Scene m_scene = null;
+        private bool m_enabled = false;
+
+        public Dictionary<UUID, OSDMap> m_knownMaterials = new Dictionary<UUID, OSDMap>();
+        
+        public void Initialise(IConfigSource source)
+        {
+            m_enabled = (source.Configs["MaterialsDemoModule"] != null);
+            if (!m_enabled)
+                return;
+
+            m_log.DebugFormat("[MaterialsDemoModule]: INITIALIZED MODULE");
+        }
+        
+        public void Close()
+        {
+            if (!m_enabled)
+                return;
+
+            m_log.DebugFormat("[MaterialsDemoModule]: CLOSED MODULE");
+        }
+        
+        public void AddRegion(Scene scene)
+        {
+            if (!m_enabled)
+                return;
+
+            m_log.DebugFormat("[MaterialsDemoModule]: REGION {0} ADDED", scene.RegionInfo.RegionName);
+
+            m_scene = scene;
+            m_scene.EventManager.OnRegisterCaps += OnRegisterCaps;
+            m_scene.EventManager.OnObjectAddedToScene += EventManager_OnObjectAddedToScene;
+//            m_scene.EventManager.OnGatherUuids += GatherMaterialsUuids;           
+        }
+
+        void EventManager_OnObjectAddedToScene(SceneObjectGroup obj)
+        {
+            foreach (var part in obj.Parts)
+                if (part != null)
+                    GetStoredMaterialsForPart(part);
+        }
+
+        void OnRegisterCaps(OpenMetaverse.UUID agentID, OpenSim.Framework.Capabilities.Caps caps)
+        {
+            string capsBase = "/CAPS/" + caps.CapsObjectPath;
+
+            IRequestHandler renderMaterialsPostHandler 
+                = new RestStreamHandler("POST", capsBase + "/", RenderMaterialsPostCap, "RenderMaterials", null);
+            caps.RegisterHandler("RenderMaterials", renderMaterialsPostHandler);
+
+            // OpenSimulator CAPs infrastructure seems to be somewhat hostile towards any CAP that requires both GET
+            // and POST handlers, (at least at the time this was originally written), so we first set up a POST
+            // handler normally and then add a GET handler via MainServer
+
+            IRequestHandler renderMaterialsGetHandler 
+                = new RestStreamHandler("GET", capsBase + "/", RenderMaterialsGetCap, "RenderMaterials", null);
+            MainServer.Instance.AddStreamHandler(renderMaterialsGetHandler);
+
+            // materials viewer seems to use either POST or PUT, so assign POST handler for PUT as well
+            IRequestHandler renderMaterialsPutHandler 
+                = new RestStreamHandler("PUT", capsBase + "/", RenderMaterialsPostCap, "RenderMaterials", null);
+            MainServer.Instance.AddStreamHandler(renderMaterialsPutHandler);
+        }
+        
+        public void RemoveRegion(Scene scene)
+        {
+            if (!m_enabled)
+                return;
+
+            m_scene.EventManager.OnRegisterCaps -= OnRegisterCaps;
+            m_scene.EventManager.OnObjectAddedToScene -= EventManager_OnObjectAddedToScene;
+//            m_scene.EventManager.OnGatherUuids -= GatherMaterialsUuids; 
+
+            m_log.DebugFormat("[MaterialsDemoModule]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
+        }        
+        
+        public void RegionLoaded(Scene scene)
+        {
+        }
+
+        OSDMap GetMaterial(UUID id)
+        {
+            OSDMap map = null;
+            lock (m_knownMaterials)
+            {
+                if (m_knownMaterials.ContainsKey(id))
+                {
+                    map = new OSDMap();
+                    map["ID"] = OSD.FromBinary(id.GetBytes());
+                    map["Material"] = m_knownMaterials[id];
+                }
+            }
+            return map;
+        }
+
+        void GetStoredMaterialsForPart(SceneObjectPart part)
+        { 
+            OSD OSMaterials = null;
+            OSDArray matsArr = null;
+
+            if (part.DynAttrs == null)
+            {
+                m_log.Warn("[MaterialsDemoModule]: NULL DYNATTRS :( ");
+            }
+
+            lock (part.DynAttrs)
+            {
+                if (part.DynAttrs.ContainsStore("OpenSim", "Materials"))
+                {
+                    OSDMap materialsStore = part.DynAttrs.GetStore("OpenSim", "Materials");
+
+                    if (materialsStore == null)
+                        return;
+
+                    materialsStore.TryGetValue("Materials", out OSMaterials);
+                }
+
+                if (OSMaterials != null && OSMaterials is OSDArray)
+                    matsArr = OSMaterials as OSDArray;
+                else
+                    return;
+            }
+
+            m_log.Info("[MaterialsDemoModule]: OSMaterials: " + OSDParser.SerializeJsonString(OSMaterials));
+
+            if (matsArr == null)
+            {
+                m_log.Info("[MaterialsDemoModule]: matsArr is null :( ");
+                return;
+            }
+
+            foreach (OSD elemOsd in matsArr)
+            {
+                if (elemOsd != null && elemOsd is OSDMap)
+                {
+                    OSDMap matMap = elemOsd as OSDMap;
+                    if (matMap.ContainsKey("ID") && matMap.ContainsKey("Material"))
+                    {
+                        try
+                        {
+                            lock (m_knownMaterials)
+                                m_knownMaterials[matMap["ID"].AsUUID()] = (OSDMap)matMap["Material"];
+                        }
+                        catch (Exception e)
+                        {
+                            m_log.Warn("[MaterialsDemoModule]: exception decoding persisted material: " + e.ToString());
+                        }
+                    }
+                }
+            }
+        }
+
+        void StoreMaterialsForPart(SceneObjectPart part)
+        {
+            try
+            {
+                if (part == null || part.Shape == null)
+                    return;
+
+                Dictionary<UUID, OSDMap> mats = new Dictionary<UUID, OSDMap>();
+
+                Primitive.TextureEntry te = part.Shape.Textures;
+
+                if (te.DefaultTexture != null)
+                {
+                    lock (m_knownMaterials)
+                    {
+                        if (m_knownMaterials.ContainsKey(te.DefaultTexture.MaterialID))
+                            mats[te.DefaultTexture.MaterialID] = m_knownMaterials[te.DefaultTexture.MaterialID];
+                    }
+                }
+
+                if (te.FaceTextures != null)
+                {
+                    foreach (var face in te.FaceTextures)
+                    {
+                        if (face != null)
+                        {
+                            lock (m_knownMaterials)
+                            {
+                                if (m_knownMaterials.ContainsKey(face.MaterialID))
+                                    mats[face.MaterialID] = m_knownMaterials[face.MaterialID];
+                            }
+                        }
+                    }
+                }
+                if (mats.Count == 0)
+                    return;
+
+                OSDArray matsArr = new OSDArray();
+                foreach (KeyValuePair<UUID, OSDMap> kvp in mats)
+                {
+                    OSDMap matOsd = new OSDMap();
+                    matOsd["ID"] = OSD.FromUUID(kvp.Key);
+                    matOsd["Material"] = kvp.Value;
+                    matsArr.Add(matOsd);
+                }
+
+                OSDMap OSMaterials = new OSDMap();
+                OSMaterials["Materials"] = matsArr;
+
+                lock (part.DynAttrs)
+                    part.DynAttrs.SetStore("OpenSim", "Materials", OSMaterials);
+            }
+            catch (Exception e)
+            {
+                m_log.Warn("[MaterialsDemoModule]: exception in StoreMaterialsForPart(): " + e.ToString());
+            }
+        }
+
+        public string RenderMaterialsPostCap(string request, string path,
+                string param, IOSHttpRequest httpRequest,
+                IOSHttpResponse httpResponse)
+        {
+            m_log.Debug("[MaterialsDemoModule]: POST cap handler");
+
+            OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
+            OSDMap resp = new OSDMap();
+
+            OSDMap materialsFromViewer = null;
+
+            OSDArray respArr = new OSDArray();
+
+            if (req.ContainsKey("Zipped"))
+            {
+                OSD osd = null;
+
+                byte[] inBytes = req["Zipped"].AsBinary();
+
+                try 
+                {
+                    osd = ZDecompressBytesToOsd(inBytes);
+
+                    if (osd != null)
+                    {
+                        if (osd is OSDArray) // assume array of MaterialIDs designating requested material entries
+                        {
+                            foreach (OSD elem in (OSDArray)osd)
+                            {
+
+                                try
+                                {
+                                    UUID id = new UUID(elem.AsBinary(), 0);
+
+                                    lock (m_knownMaterials)
+                                    {
+                                        if (m_knownMaterials.ContainsKey(id))
+                                        {
+                                            m_log.Info("[MaterialsDemoModule]: request for known material ID: " + id.ToString());
+                                            OSDMap matMap = new OSDMap();
+                                            matMap["ID"] = OSD.FromBinary(id.GetBytes());
+
+                                            matMap["Material"] = m_knownMaterials[id];
+                                            respArr.Add(matMap);
+                                        }
+                                        else
+                                            m_log.Info("[MaterialsDemoModule]: request for UNKNOWN material ID: " + id.ToString());
+                                    }
+                                }
+                                catch (Exception e)
+                                {
+                                    // report something here?
+                                    continue;
+                                }
+                            }
+                        }
+                        else if (osd is OSDMap) // reqest to assign a material
+                        {
+                            materialsFromViewer = osd as OSDMap;
+
+                            if (materialsFromViewer.ContainsKey("FullMaterialsPerFace"))
+                            {
+                                OSD matsOsd = materialsFromViewer["FullMaterialsPerFace"];
+                                if (matsOsd is OSDArray)
+                                {
+                                    OSDArray matsArr = matsOsd as OSDArray;
+
+                                    try
+                                    {
+                                        foreach (OSDMap matsMap in matsArr)
+                                        {
+                                            m_log.Debug("[MaterialsDemoModule]: processing matsMap: " + OSDParser.SerializeJsonString(matsMap));
+
+                                            uint matLocalID = 0;
+                                            try { matLocalID = matsMap["ID"].AsUInteger(); }
+                                            catch (Exception e) { m_log.Warn("[MaterialsDemoModule]: cannot decode \"ID\" from matsMap: " + e.Message); }
+                                            m_log.Debug("[MaterialsDemoModule]: matLocalId: " + matLocalID.ToString());
+
+
+                                            OSDMap mat = null;
+                                            try { mat = matsMap["Material"] as OSDMap; }
+                                            catch (Exception e) { m_log.Warn("[MaterialsDemoModule]: cannot decode \"Material\" from matsMap: " + e.Message); }
+                                            m_log.Debug("[MaterialsDemoModule]: mat: " + OSDParser.SerializeJsonString(mat));
+                                        
+                                            UUID id = HashOsd(mat);
+                                            lock (m_knownMaterials)
+                                                m_knownMaterials[id] = mat;
+                                        
+
+                                            var sop = m_scene.GetSceneObjectPart(matLocalID);
+                                            if (sop == null)
+                                                m_log.Debug("[MaterialsDemoModule]: null SOP for localId: " + matLocalID.ToString());
+                                            else
+                                            {
+                                                var te = new Primitive.TextureEntry(sop.Shape.TextureEntry, 0, sop.Shape.TextureEntry.Length);
+
+                                                if (te == null)
+                                                {
+                                                    m_log.Debug("[MaterialsDemoModule]: null TextureEntry for localId: " + matLocalID.ToString());
+                                                }
+                                                else
+                                                {
+                                                    int face = -1;
+
+                                                    if (matsMap.ContainsKey("Face"))
+                                                    {
+                                                        face = matsMap["Face"].AsInteger();
+                                                        if (te.FaceTextures == null) // && face == 0)
+                                                        {
+                                                            if (te.DefaultTexture == null)
+                                                                m_log.Debug("[MaterialsDemoModule]: te.DefaultTexture is null");
+                                                            else
+                                                                te.DefaultTexture.MaterialID = id;
+                                                        }
+                                                        else
+                                                        {
+                                                            if (te.FaceTextures.Length >= face - 1)
+                                                            {
+                                                                if (te.FaceTextures[face] == null)
+                                                                    te.DefaultTexture.MaterialID = id;
+                                                                else
+                                                                    te.FaceTextures[face].MaterialID = id;
+                                                            }
+                                                        }
+                                                    }
+                                                    else
+                                                    {
+                                                        if (te.DefaultTexture != null)
+                                                            te.DefaultTexture.MaterialID = id;
+                                                    }
+
+                                                    m_log.Debug("[MaterialsDemoModule]: setting material ID for face " + face.ToString() + " to " + id.ToString());
+
+                                                    //we cant use sop.UpdateTextureEntry(te); because it filters so do it manually
+
+                                                    if (sop.ParentGroup != null)
+                                                    {
+                                                        sop.Shape.TextureEntry = te.GetBytes();
+                                                        sop.TriggerScriptChangedEvent(Changed.TEXTURE);
+                                                        sop.UpdateFlag = UpdateRequired.FULL;
+                                                        sop.ParentGroup.HasGroupChanged = true;
+
+                                                        sop.ScheduleFullUpdate();
+
+                                                        StoreMaterialsForPart(sop);
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                    catch (Exception e)
+                                    {
+                                        m_log.Warn("[MaterialsDemoModule]: exception processing received material: " + e.Message);
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                }
+                catch (Exception e)
+                {
+                    m_log.Warn("[MaterialsDemoModule]: exception decoding zipped CAP payload: " + e.Message);
+                    //return "";
+                }
+                m_log.Debug("[MaterialsDemoModule]: knownMaterials.Count: " + m_knownMaterials.Count.ToString());
+            }
+
+            
+            resp["Zipped"] = ZCompressOSD(respArr, false);
+            string response = OSDParser.SerializeLLSDXmlString(resp);
+
+            //m_log.Debug("[MaterialsDemoModule]: cap request: " + request);
+            m_log.Debug("[MaterialsDemoModule]: cap request (zipped portion): " + ZippedOsdBytesToString(req["Zipped"].AsBinary()));
+            m_log.Debug("[MaterialsDemoModule]: cap response: " + response);
+            return response;
+        }
+
+
+        public string RenderMaterialsGetCap(string request, string path,
+                string param, IOSHttpRequest httpRequest,
+                IOSHttpResponse httpResponse)
+        {
+            m_log.Debug("[MaterialsDemoModule]: GET cap handler");
+
+            OSDMap resp = new OSDMap();
+            int matsCount = 0;
+            OSDArray allOsd = new OSDArray();
+
+            lock (m_knownMaterials)
+            {
+                foreach (KeyValuePair<UUID, OSDMap> kvp in m_knownMaterials)
+                {
+                    OSDMap matMap = new OSDMap();
+
+                    matMap["ID"] = OSD.FromBinary(kvp.Key.GetBytes());
+                    matMap["Material"] = kvp.Value;
+                    allOsd.Add(matMap);
+                    matsCount++;
+                }
+            }
+
+            resp["Zipped"] = ZCompressOSD(allOsd, false);
+            m_log.Debug("[MaterialsDemoModule]: matsCount: " + matsCount.ToString());
+
+            return OSDParser.SerializeLLSDXmlString(resp);
+        }
+
+        static string ZippedOsdBytesToString(byte[] bytes)
+        {
+            try
+            {
+                return OSDParser.SerializeJsonString(ZDecompressBytesToOsd(bytes));
+            }
+            catch (Exception e)
+            {
+                return "ZippedOsdBytesToString caught an exception: " + e.ToString();
+            }
+        }
+
+        /// <summary>
+        /// computes a UUID by hashing a OSD object
+        /// </summary>
+        /// <param name="osd"></param>
+        /// <returns></returns>
+        private static UUID HashOsd(OSD osd)
+        {
+            using (var md5 = MD5.Create())
+                using (MemoryStream ms = new MemoryStream(OSDParser.SerializeLLSDBinary(osd, false)))
+                    return new UUID(md5.ComputeHash(ms), 0);
+        }
+
+        public static OSD ZCompressOSD(OSD inOsd, bool useHeader)
+        {
+            OSD osd = null;
+
+            using (MemoryStream msSinkCompressed = new MemoryStream())
+            {
+                using (Ionic.Zlib.ZlibStream zOut = new Ionic.Zlib.ZlibStream(msSinkCompressed, 
+                    Ionic.Zlib.CompressionMode.Compress, CompressionLevel.BestCompression, true))
+                {
+                    CopyStream(new MemoryStream(OSDParser.SerializeLLSDBinary(inOsd, useHeader)), zOut);
+                    zOut.Close();
+                }
+
+                msSinkCompressed.Seek(0L, SeekOrigin.Begin);
+                osd = OSD.FromBinary( msSinkCompressed.ToArray());
+            }
+
+            return osd;
+        }
+
+
+        public static OSD ZDecompressBytesToOsd(byte[] input)
+        {
+            OSD osd = null;
+
+            using (MemoryStream msSinkUnCompressed = new MemoryStream())
+            {
+                using (Ionic.Zlib.ZlibStream zOut = new Ionic.Zlib.ZlibStream(msSinkUnCompressed, CompressionMode.Decompress, true))
+                {
+                    CopyStream(new MemoryStream(input), zOut);
+                    zOut.Close();
+                }
+                msSinkUnCompressed.Seek(0L, SeekOrigin.Begin);
+                osd = OSDParser.DeserializeLLSDBinary(msSinkUnCompressed.ToArray());
+            }
+
+            return osd;
+        }
+
+        static void CopyStream(System.IO.Stream input, System.IO.Stream output)
+        {
+            byte[] buffer = new byte[2048];
+            int len;
+            while ((len = input.Read(buffer, 0, 2048)) > 0)
+            {
+                output.Write(buffer, 0, len);
+            }
+
+            output.Flush();
+        }
+
+        // FIXME: This code is currently still in UuidGatherer since we cannot use Scene.EventManager as some 
+        // calls to the gatherer are done for objects with no scene.
+//        /// <summary>
+//        /// Gather all of the texture asset UUIDs used to reference "Materials" such as normal and specular maps
+//        /// </summary>
+//        /// <param name="part"></param>
+//        /// <param name="assetUuids"></param>
+//        private void GatherMaterialsUuids(SceneObjectPart part, IDictionary<UUID, AssetType> assetUuids)
+//        {
+//            // scan thru the dynAttrs map of this part for any textures used as materials
+//            OSD osdMaterials = null;
+//
+//            lock (part.DynAttrs)
+//            {
+//                if (part.DynAttrs.ContainsStore("OpenSim", "Materials"))
+//                {
+//                    OSDMap materialsStore = part.DynAttrs.GetStore("OpenSim", "Materials");
+//                    if (materialsStore == null)
+//                        return;
+//                        
+//                    materialsStore.TryGetValue("Materials", out osdMaterials);
+//                }
+//
+//                if (osdMaterials != null)
+//                {
+//                    //m_log.Info("[UUID Gatherer]: found Materials: " + OSDParser.SerializeJsonString(osd));
+//
+//                    if (osdMaterials is OSDArray)
+//                    {
+//                        OSDArray matsArr = osdMaterials as OSDArray;
+//                        foreach (OSDMap matMap in matsArr)
+//                        {
+//                            try
+//                            {
+//                                if (matMap.ContainsKey("Material"))
+//                                {
+//                                    OSDMap mat = matMap["Material"] as OSDMap;
+//                                    if (mat.ContainsKey("NormMap"))
+//                                    {
+//                                        UUID normalMapId = mat["NormMap"].AsUUID();
+//                                        if (normalMapId != UUID.Zero)
+//                                        {
+//                                            assetUuids[normalMapId] = AssetType.Texture;
+//                                            //m_log.Info("[UUID Gatherer]: found normal map ID: " + normalMapId.ToString());
+//                                        }
+//                                    }
+//                                    if (mat.ContainsKey("SpecMap"))
+//                                    {
+//                                        UUID specularMapId = mat["SpecMap"].AsUUID();
+//                                        if (specularMapId != UUID.Zero)
+//                                        {
+//                                            assetUuids[specularMapId] = AssetType.Texture;
+//                                            //m_log.Info("[UUID Gatherer]: found specular map ID: " + specularMapId.ToString());
+//                                        }
+//                                    }
+//                                }
+//
+//                            }
+//                            catch (Exception e)
+//                            {
+//                                m_log.Warn("[MaterialsDemoModule]: exception getting materials: " + e.Message);
+//                            }
+//                        }
+//                    }
+//                }
+//            }
+//        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
index 6009dc5..d1d318c 100755
--- a/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
@@ -31,10 +31,10 @@ using System.Reflection;
 using System.Text;
 
 using OpenSim.Framework;
+using OpenSim.Region.CoreModules;
 using OpenSim.Region.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.CoreModules;
 
 using Mono.Addins;
 using Nini.Config;
@@ -49,6 +49,20 @@ public class ExtendedPhysics : INonSharedRegionModule
     private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
     private static string LogHeader = "[EXTENDED PHYSICS]";
 
+    // =============================================================
+    // Since BulletSim is a plugin, this these values aren't defined easily in one place.
+    // This table must correspond to an identical table in BSScene.
+
+    // Per scene functions. See BSScene.
+
+    // Per avatar functions. See BSCharacter.
+
+    // Per prim functions. See BSPrim.
+    public const string PhysFunctGetLinksetType = "BulletSim.GetLinksetType";
+    public const string PhysFunctSetLinksetType = "BulletSim.SetLinksetType";
+
+    // =============================================================
+
     private IConfig Configuration { get; set; }
     private bool Enabled { get; set; }
     private Scene BaseScene { get; set; }
@@ -119,6 +133,7 @@ public class ExtendedPhysics : INonSharedRegionModule
  
         // Register as LSL functions all the [ScriptInvocation] marked methods.
         Comms.RegisterScriptInvocations(this);
+        Comms.RegisterConstants(this);
 
         // When an object is modified, we might need to update its extended physics parameters
         BaseScene.EventManager.OnObjectAddedToScene += EventManager_OnObjectAddedToScene;
@@ -132,7 +147,6 @@ public class ExtendedPhysics : INonSharedRegionModule
 
     private void EventManager_OnObjectAddedToScene(SceneObjectGroup obj)
     {
-        throw new NotImplementedException();
     }
 
     // Event generated when some property of a prim changes.
@@ -143,13 +157,6 @@ public class ExtendedPhysics : INonSharedRegionModule
     [ScriptConstant]
     public static int PHYS_CENTER_OF_MASS =     1 << 0;
 
-    [ScriptConstant]
-    public static int PHYS_LINKSET_TYPE_CONSTRAINT  = 1;
-    [ScriptConstant]
-    public static int PHYS_LINKSET_TYPE_COMPOUND    = 2;
-    [ScriptConstant]
-    public static int PHYS_LINKSET_TYPE_MANUAL      = 3;
-
     [ScriptInvocation]
     public string physGetEngineType(UUID hostID, UUID scriptID)
     {
@@ -163,9 +170,95 @@ public class ExtendedPhysics : INonSharedRegionModule
         return ret;
     }
 
+    [ScriptConstant]
+    public static int PHYS_LINKSET_TYPE_CONSTRAINT  = 0;
+    [ScriptConstant]
+    public static int PHYS_LINKSET_TYPE_COMPOUND    = 1;
+    [ScriptConstant]
+    public static int PHYS_LINKSET_TYPE_MANUAL      = 2;
+
     [ScriptInvocation]
-    public void physSetLinksetType(UUID hostID, UUID scriptID, int linksetType)
+    public int physSetLinksetType(UUID hostID, UUID scriptID, int linksetType)
     {
+        int ret = -1;
+
+        if (!Enabled) return ret;
+
+        // The part that is requesting the change.
+        SceneObjectPart requestingPart = BaseScene.GetSceneObjectPart(hostID);
+
+        if (requestingPart != null)
+        {
+            // The change is always made to the root of a linkset.
+            SceneObjectGroup containingGroup = requestingPart.ParentGroup;
+            SceneObjectPart rootPart = containingGroup.RootPart;
+
+            if (rootPart != null)
+            {
+                Physics.Manager.PhysicsActor rootPhysActor = rootPart.PhysActor;
+                if (rootPhysActor != null)
+                {
+                    ret = (int)rootPhysActor.Extension(PhysFunctSetLinksetType, linksetType);
+                }
+                else
+                {
+                    m_log.WarnFormat("{0} physSetLinksetType: root part does not have a physics actor. rootName={1}, hostID={2}",
+                                        LogHeader, rootPart.Name, hostID);
+                }
+            }
+            else
+            {
+                m_log.WarnFormat("{0} physSetLinksetType: root part does not exist. RequestingPartName={1}, hostID={2}",
+                                    LogHeader, requestingPart.Name, hostID);
+            }
+        }
+        else
+        {
+            m_log.WarnFormat("{0} physSetLinsetType: cannot find script object in scene. hostID={1}", LogHeader, hostID);
+        }
+        return ret;
+    }
+
+    [ScriptInvocation]
+    public int physGetLinksetType(UUID hostID, UUID scriptID)
+    {
+        int ret = -1;
+
+        if (!Enabled) return ret;
+
+        // The part that is requesting the change.
+        SceneObjectPart requestingPart = BaseScene.GetSceneObjectPart(hostID);
+
+        if (requestingPart != null)
+        {
+            // The type is is always on the root of a linkset.
+            SceneObjectGroup containingGroup = requestingPart.ParentGroup;
+            SceneObjectPart rootPart = containingGroup.RootPart;
+
+            if (rootPart != null)
+            {
+                Physics.Manager.PhysicsActor rootPhysActor = rootPart.PhysActor;
+                if (rootPhysActor != null)
+                {
+                    ret = (int)rootPhysActor.Extension(PhysFunctGetLinksetType);
+                }
+                else
+                {
+                    m_log.WarnFormat("{0} physGetLinksetType: root part does not have a physics actor. rootName={1}, hostID={2}",
+                                        LogHeader, rootPart.Name, hostID);
+                }
+            }
+            else
+            {
+                m_log.WarnFormat("{0} physGetLinksetType: root part does not exist. RequestingPartName={1}, hostID={2}",
+                                    LogHeader, requestingPart.Name, hostID);
+            }
+        }
+        else
+        {
+            m_log.WarnFormat("{0} physGetLinsetType: cannot find script object in scene. hostID={1}", LogHeader, hostID);
+        }
+        return ret;
     }
 }
 }
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
index c68fe99..3b3b300 100644
--- a/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
@@ -263,7 +263,7 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
             m_module = module;
         }
 
-        public override byte[] Handle(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        protected override byte[] ProcessRequest(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             StreamReader reader = new StreamReader(request);
             string requestBody = reader.ReadToEnd();
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index 5d10e93..bcb21d0 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -696,7 +696,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
         /// <param name="agentId"></param>
         public void EconomyDataRequestHandler(IClientAPI user)
         {
-            Scene s = LocateSceneClientIn(user.AgentId);
+            Scene s = (Scene)user.Scene;
 
             user.SendEconomyData(EnergyEfficiency, s.RegionInfo.ObjectCapacity, ObjectCount, PriceEnergyUnit, PriceGroupCreate,
                                  PriceObjectClaim, PriceObjectRent, PriceObjectScaleFactor, PriceParcelClaim, PriceParcelClaimFactor,
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 4674489..f2355e2 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -259,6 +259,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         public event Action<IClientAPI, bool> OnCompleteMovementToRegion;
         public event UpdateAgent OnPreAgentUpdate;
         public event UpdateAgent OnAgentUpdate;
+        public event UpdateAgent OnAgentCameraUpdate;
         public event AgentRequestSit OnAgentRequestSit;
         public event AgentSit OnAgentSit;
         public event AvatarPickerRequest OnAvatarPickerRequest;
@@ -393,6 +394,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         public event EstateTeleportAllUsersHomeRequest OnEstateTeleportAllUsersHomeRequest;
         public event EstateChangeInfo OnEstateChangeInfo;
         public event EstateManageTelehub OnEstateManageTelehub;
+        public event CachedTextureRequest OnCachedTextureRequest;
         public event ScriptReset OnScriptReset;
         public event GetScriptRunning OnGetScriptRunning;
         public event SetScriptRunning OnSetScriptRunning;
@@ -573,6 +575,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         {
         }
 
+        public void SendCachedTextureResponse(ISceneEntity avatar, int serial, List<CachedTextureResponseArg> cachedTextures)
+        {
+
+        }
+
         public virtual void Kick(string message)
         {
         }
@@ -590,7 +597,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
 
         }
 
-        public virtual void SendKillObject(ulong regionHandle, List<uint> localID)
+        public virtual void SendKillObject(List<uint> localID)
         {
         }
 
@@ -1236,7 +1243,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         {
         }
         
-        public void StopFlying(ISceneEntity presence)
+        public void SendAgentTerseUpdate(ISceneEntity presence)
         {
         }
 
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index 8c9c006..78fe096 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -116,7 +116,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                     return false;
 
             // Delete existing npc attachments
-            scene.AttachmentsModule.DeleteAttachmentsFromScene(npc, false);
+            if(scene.AttachmentsModule != null)
+                scene.AttachmentsModule.DeleteAttachmentsFromScene(npc, false);
 
             // XXX: We can't just use IAvatarFactoryModule.SetAppearance() yet
             // since it doesn't transfer attachments
@@ -125,7 +126,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC
             npc.Appearance = npcAppearance;
 
             // Rez needed npc attachments
-            scene.AttachmentsModule.RezAttachments(npc);
+            if (scene.AttachmentsModule != null)
+                scene.AttachmentsModule.RezAttachments(npc);
 
             IAvatarFactoryModule module =
                     scene.RequestModuleInterface<IAvatarFactoryModule>();
@@ -375,7 +377,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                     m_log.DebugFormat("[NPC MODULE]: Found {0} {1} to remove",
                             agentID, av.Name);
                     */
-                    scene.RemoveClient(agentID, false);
+
+                    scene.IncomingCloseAgent(agentID, false);
+//                    scene.RemoveClient(agentID, false);
                     m_avatars.Remove(agentID);
 
 //                    m_log.DebugFormat("[NPC MODULE]: Removed NPC {0} {1}", agentID, av.Name);
diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
index 34362af..20c178c 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
@@ -155,7 +155,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
         public void TestCreateWithAttachments()
         {
             TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();
+//            TestHelpers.EnableLogging();
 
             UUID userId = TestHelpers.ParseTail(0x1);
             UserAccountHelpers.CreateUserWithInventory(m_scene, userId);
diff --git a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs
index 550b5d4..8720cc7 100644
--- a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs
+++ b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.OptionalModules.World.WorldView
             m_WorldViewModule = fmodule;
         }
 
-        public override byte[] Handle(string path, Stream requestData,
+        protected override byte[] ProcessRequest(string path, Stream requestData,
                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             httpResponse.ContentType = "image/jpeg";
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
index 77ea3ed..12a0c17 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIUnman.cs
@@ -75,11 +75,11 @@ private sealed class BulletBodyUnman : BulletBody
 private sealed class BulletShapeUnman : BulletShape
 {
     public IntPtr ptr;
-    public BulletShapeUnman(IntPtr xx, BSPhysicsShapeType typ) 
+    public BulletShapeUnman(IntPtr xx, BSPhysicsShapeType typ)
         : base()
     {
         ptr = xx;
-        type = typ;
+        shapeType = typ;
     }
     public override bool HasPhysicalShape
     {
@@ -91,7 +91,7 @@ private sealed class BulletShapeUnman : BulletShape
     }
     public override BulletShape Clone()
     {
-        return new BulletShapeUnman(ptr, type);
+        return new BulletShapeUnman(ptr, shapeType);
     }
     public override bool ReferenceSame(BulletShape other)
     {
@@ -251,23 +251,52 @@ public override BulletShape CreateMeshShape(BulletWorld world,
                     BSPhysicsShapeType.SHAPE_MESH);
 }
 
+public override BulletShape CreateGImpactShape(BulletWorld world,
+                int indicesCount, int[] indices,
+                int verticesCount, float[] vertices)
+{
+    BulletWorldUnman worldu = world as BulletWorldUnman;
+    return new BulletShapeUnman(
+                    BSAPICPP.CreateGImpactShape2(worldu.ptr, indicesCount, indices, verticesCount, vertices),
+                    BSPhysicsShapeType.SHAPE_GIMPACT);
+}
+
 public override BulletShape CreateHullShape(BulletWorld world, int hullCount, float[] hulls)
 {
     BulletWorldUnman worldu = world as BulletWorldUnman;
     return new BulletShapeUnman(
-                    BSAPICPP.CreateHullShape2(worldu.ptr, hullCount, hulls), 
+                    BSAPICPP.CreateHullShape2(worldu.ptr, hullCount, hulls),
                     BSPhysicsShapeType.SHAPE_HULL);
 }
 
-public override BulletShape BuildHullShapeFromMesh(BulletWorld world, BulletShape meshShape)
+public override BulletShape BuildHullShapeFromMesh(BulletWorld world, BulletShape meshShape, HACDParams parms)
 {
     BulletWorldUnman worldu = world as BulletWorldUnman;
     BulletShapeUnman shapeu = meshShape as BulletShapeUnman;
     return new BulletShapeUnman(
-                    BSAPICPP.BuildHullShapeFromMesh2(worldu.ptr, shapeu.ptr),
+                    BSAPICPP.BuildHullShapeFromMesh2(worldu.ptr, shapeu.ptr, parms),
                     BSPhysicsShapeType.SHAPE_HULL);
 }
 
+public override BulletShape BuildConvexHullShapeFromMesh(BulletWorld world, BulletShape meshShape)
+{
+    BulletWorldUnman worldu = world as BulletWorldUnman;
+    BulletShapeUnman shapeu = meshShape as BulletShapeUnman;
+    return new BulletShapeUnman(
+                    BSAPICPP.BuildConvexHullShapeFromMesh2(worldu.ptr, shapeu.ptr),
+                    BSPhysicsShapeType.SHAPE_CONVEXHULL);
+}
+
+public override BulletShape CreateConvexHullShape(BulletWorld world,
+                int indicesCount, int[] indices,
+                int verticesCount, float[] vertices)
+{
+    BulletWorldUnman worldu = world as BulletWorldUnman;
+    return new BulletShapeUnman(
+                    BSAPICPP.CreateConvexHullShape2(worldu.ptr, indicesCount, indices, verticesCount, vertices),
+                    BSPhysicsShapeType.SHAPE_CONVEXHULL);
+}
+
 public override BulletShape BuildNativeShape(BulletWorld world, ShapeData shapeData)
 {
     BulletWorldUnman worldu = world as BulletWorldUnman;
@@ -356,7 +385,7 @@ public override BulletShape DuplicateCollisionShape(BulletWorld world, BulletSha
 {
     BulletWorldUnman worldu = world as BulletWorldUnman;
     BulletShapeUnman srcShapeu = srcShape as BulletShapeUnman;
-    return new BulletShapeUnman(BSAPICPP.DuplicateCollisionShape2(worldu.ptr, srcShapeu.ptr, id), srcShape.type);
+    return new BulletShapeUnman(BSAPICPP.DuplicateCollisionShape2(worldu.ptr, srcShapeu.ptr, id), srcShape.shapeType);
 }
 
 public override bool DeleteCollisionShape(BulletWorld world, BulletShape shape)
@@ -1407,11 +1436,24 @@ public static extern IntPtr CreateMeshShape2(IntPtr world,
                 int verticesCount, [MarshalAs(UnmanagedType.LPArray)] float[] vertices );
 
 [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
+public static extern IntPtr CreateGImpactShape2(IntPtr world,
+                int indicesCount, [MarshalAs(UnmanagedType.LPArray)] int[] indices,
+                int verticesCount, [MarshalAs(UnmanagedType.LPArray)] float[] vertices );
+
+[DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
 public static extern IntPtr CreateHullShape2(IntPtr world,
                 int hullCount, [MarshalAs(UnmanagedType.LPArray)] float[] hulls);
 
 [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
-public static extern IntPtr BuildHullShapeFromMesh2(IntPtr world, IntPtr meshShape);
+public static extern IntPtr BuildHullShapeFromMesh2(IntPtr world, IntPtr meshShape, HACDParams parms);
+
+[DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
+public static extern IntPtr BuildConvexHullShapeFromMesh2(IntPtr world, IntPtr meshShape);
+
+[DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
+public static extern IntPtr CreateConvexHullShape2(IntPtr world,
+                int indicesCount, [MarshalAs(UnmanagedType.LPArray)] int[] indices,
+                int verticesCount, [MarshalAs(UnmanagedType.LPArray)] float[] vertices );
 
 [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
 public static extern IntPtr BuildNativeShape2(IntPtr world, ShapeData shapeData);
@@ -1476,7 +1518,7 @@ public static extern void DestroyObject2(IntPtr sim, IntPtr obj);
 public static extern IntPtr CreateGroundPlaneShape2(uint id, float height, float collisionMargin);
 
 [DllImport("BulletSim", CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]
-public static extern IntPtr CreateTerrainShape2(uint id, Vector3 size, float minHeight, float maxHeight, 
+public static extern IntPtr CreateTerrainShape2(uint id, Vector3 size, float minHeight, float maxHeight,
                                             [MarshalAs(UnmanagedType.LPArray)] float[] heightMap,
                                             float scaleFactor, float collisionMargin);
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
index 6fc10e9..2a820be 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSAPIXNA.cs
@@ -81,11 +81,11 @@ private sealed class BulletBodyXNA : BulletBody
 private sealed class BulletShapeXNA : BulletShape
 {
     public CollisionShape shape;
-    public BulletShapeXNA(CollisionShape xx, BSPhysicsShapeType typ) 
+    public BulletShapeXNA(CollisionShape xx, BSPhysicsShapeType typ)
         : base()
     {
         shape = xx;
-        type = typ;
+        shapeType = typ;
     }
     public override bool HasPhysicalShape
     {
@@ -97,7 +97,7 @@ private sealed class BulletShapeXNA : BulletShape
     }
     public override BulletShape Clone()
     {
-        return new BulletShapeXNA(shape, type);
+        return new BulletShapeXNA(shape, shapeType);
     }
     public override bool ReferenceSame(BulletShape other)
     {
@@ -137,8 +137,8 @@ private sealed class BulletConstraintXNA : BulletConstraint
     internal int LastEntityProperty = 0;
 
     internal EntityProperties[] UpdatedObjects;
-    internal Dictionary<uint, GhostObject> specialCollisionObjects; 
-    
+    internal Dictionary<uint, GhostObject> specialCollisionObjects;
+
     private static int m_collisionsThisFrame;
     private BSScene PhysicsScene { get; set; }
 
@@ -151,7 +151,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
     }
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     /// <param name="p"></param>
     /// <param name="p_2"></param>
@@ -174,7 +174,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
         DiscreteDynamicsWorld world = (pWorld as BulletWorldXNA).world;
         TypedConstraint constraint = (pConstraint as BulletConstraintXNA).constrain;
         world.AddConstraint(constraint, pDisableCollisionsBetweenLinkedObjects);
-        
+
         return true;
 
     }
@@ -300,7 +300,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
     public override bool GetForceUpdateAllAabbs(BulletWorld pWorld) {
         DiscreteDynamicsWorld world = (pWorld as BulletWorldXNA).world;
         return world.GetForceUpdateAllAabbs();
-        
+
     }
     public override void SetForceUpdateAllAabbs(BulletWorld pWorld, bool pForce)
     {
@@ -404,7 +404,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
         IndexedMatrix mat = IndexedMatrix.CreateFromQuaternion(vquaternion);
         mat._origin = vposition;
         collisionObject.SetWorldTransform(mat);
-        
+
     }
 
     public override Vector3 GetPosition(BulletBody pCollisionObject)
@@ -457,7 +457,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
     {
         CollisionObject collisionObject = (pCollisionObject as BulletBodyXNA).rigidBody;
         collisionObject.Activate(pforceactivation);
-        
+
     }
 
     public override Quaternion GetOrientation(BulletBody pCollisionObject)
@@ -486,7 +486,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
     {
         CollisionObject collisionObject = (pCollisionObject as BulletBodyXNA).rigidBody;
         return collisionObject.GetCcdSweptSphereRadius();
-        
+
     }
 
     public override IntPtr GetUserPointer(BulletBody pCollisionObject)
@@ -559,8 +559,8 @@ private sealed class BulletConstraintXNA : BulletConstraint
     }
 
 
-    public override BulletConstraint Create6DofConstraint(BulletWorld pWorld, BulletBody pBody1, BulletBody pBody2, 
-                                    Vector3 pframe1, Quaternion pframe1rot, Vector3 pframe2, Quaternion pframe2rot, 
+    public override BulletConstraint Create6DofConstraint(BulletWorld pWorld, BulletBody pBody1, BulletBody pBody2,
+                                    Vector3 pframe1, Quaternion pframe1rot, Vector3 pframe2, Quaternion pframe2rot,
                                     bool puseLinearReferenceFrameA, bool pdisableCollisionsBetweenLinkedBodies)
 
     {
@@ -604,7 +604,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
     }
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     /// <param name="pWorld"></param>
     /// <param name="pBody1"></param>
@@ -824,7 +824,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
     {
         RigidBody body = (pBody as BulletBodyXNA).rigidBody;
         float angularDamping = body.GetAngularDamping();
-        body.SetDamping(lin_damping, angularDamping); 
+        body.SetDamping(lin_damping, angularDamping);
     }
 
     public override float GetLinearDamping(BulletBody pBody)
@@ -907,7 +907,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
         RigidBody bo = co as RigidBody;
         if (bo == null)
         {
-            
+
             if (world.IsInWorld(co))
             {
                 world.RemoveCollisionObject(co);
@@ -915,7 +915,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
         }
         else
         {
-            
+
             if (world.IsInWorld(bo))
             {
                 world.RemoveRigidBody(bo);
@@ -947,7 +947,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
 
         // TODO:  Turn this from a reference copy to a Value Copy.
         BulletShapeXNA shape2 = new BulletShapeXNA(shape1, BSShapeTypeFromBroadPhaseNativeType(shape1.GetShapeType()));
-        
+
         return shape2;
     }
 
@@ -957,7 +957,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
         return false;
     }
     //(sim.ptr, shape.ptr, prim.LocalID, prim.RawPosition, prim.RawOrientation);
-               
+
     public override BulletBody CreateBodyFromShape(BulletWorld pWorld, BulletShape pShape, uint pLocalID, Vector3 pRawPosition, Quaternion pRawOrientation)
     {
         CollisionWorld world = (pWorld as BulletWorldXNA).world;
@@ -993,11 +993,11 @@ private sealed class BulletConstraintXNA : BulletConstraint
             m_startWorldTransform = IndexedMatrix.Identity;
         */
         body.SetUserPointer(pLocalID);
-        
+
         return new BulletBodyXNA(pLocalID, body);
     }
 
-    
+
     public override BulletBody CreateBodyWithDefaultMotionState( BulletShape pShape, uint pLocalID, Vector3 pRawPosition, Quaternion pRawOrientation)
     {
 
@@ -1025,7 +1025,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
     public override Vector3 GetAnisotripicFriction(BulletConstraint pconstrain)
     {
 
-        /* TODO */ 
+        /* TODO */
         return Vector3.Zero;
     }
     public override Vector3 SetAnisotripicFriction(BulletConstraint pconstrain, Vector3 frict) { /* TODO */ return Vector3.Zero; }
@@ -1035,7 +1035,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
     {
         CollisionObject collisionObject = (pCollisionObject as BulletBodyXNA).rigidBody;
         return collisionObject.IsStaticObject();
-        
+
     }
     public override bool IsKinematicObject(BulletBody pCollisionObject)
     {
@@ -1098,10 +1098,10 @@ private sealed class BulletConstraintXNA : BulletConstraint
         return new BulletWorldXNA(1, PhysicsScene, BSAPIXNA.Initialize2(worldExtent, configparms, maxCollisions, ref collisionArray, maxUpdates, ref updateArray, null));
     }
 
-    private static DiscreteDynamicsWorld Initialize2(Vector3 worldExtent, 
+    private static DiscreteDynamicsWorld Initialize2(Vector3 worldExtent,
                         ConfigurationParameters[] o,
                         int mMaxCollisionsPerFrame, ref CollisionDesc[] collisionArray,
-                        int mMaxUpdatesPerFrame, ref EntityProperties[] updateArray, 
+                        int mMaxUpdatesPerFrame, ref EntityProperties[] updateArray,
                         object mDebugLogCallbackHandle)
     {
         CollisionWorld.WorldData.ParamData p = new CollisionWorld.WorldData.ParamData();
@@ -1138,9 +1138,9 @@ private sealed class BulletConstraintXNA : BulletConstraint
         p.avatarCapsuleDepth = BSParam.AvatarCapsuleDepth;
         p.avatarCapsuleHeight = BSParam.AvatarCapsuleHeight;
         p.avatarContactProcessingThreshold = BSParam.AvatarContactProcessingThreshold;
-       
+
         p.vehicleAngularDamping = BSParam.VehicleAngularDamping;
-        
+
         p.maxPersistantManifoldPoolSize = o[0].maxPersistantManifoldPoolSize;
         p.maxCollisionAlgorithmPoolSize = o[0].maxCollisionAlgorithmPoolSize;
         p.shouldDisableContactPoolDynamicAllocation = o[0].shouldDisableContactPoolDynamicAllocation;
@@ -1160,7 +1160,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
         p.linkConstraintSolverIterations = BSParam.LinkConstraintSolverIterations;
         p.physicsLoggingFrames = o[0].physicsLoggingFrames;
         DefaultCollisionConstructionInfo ccci = new DefaultCollisionConstructionInfo();
-        
+
         DefaultCollisionConfiguration cci = new DefaultCollisionConfiguration();
         CollisionDispatcher m_dispatcher = new CollisionDispatcher(cci);
 
@@ -1221,6 +1221,50 @@ private sealed class BulletConstraintXNA : BulletConstraint
         //BSParam.TerrainImplementation = 0;
         world.SetGravity(new IndexedVector3(0,0,p.gravity));
 
+        // Turn off Pooling since globals and pooling are bad for threading.
+        BulletGlobals.VoronoiSimplexSolverPool.SetPoolingEnabled(false);
+        BulletGlobals.SubSimplexConvexCastPool.SetPoolingEnabled(false);
+        BulletGlobals.ManifoldPointPool.SetPoolingEnabled(false);
+        BulletGlobals.CastResultPool.SetPoolingEnabled(false);
+        BulletGlobals.SphereShapePool.SetPoolingEnabled(false);
+        BulletGlobals.DbvtNodePool.SetPoolingEnabled(false);
+        BulletGlobals.SingleRayCallbackPool.SetPoolingEnabled(false);
+        BulletGlobals.SubSimplexClosestResultPool.SetPoolingEnabled(false);
+        BulletGlobals.GjkPairDetectorPool.SetPoolingEnabled(false);
+        BulletGlobals.DbvtTreeColliderPool.SetPoolingEnabled(false);
+        BulletGlobals.SingleSweepCallbackPool.SetPoolingEnabled(false);
+        BulletGlobals.BroadphaseRayTesterPool.SetPoolingEnabled(false);
+        BulletGlobals.ClosestNotMeConvexResultCallbackPool.SetPoolingEnabled(false);
+        BulletGlobals.GjkEpaPenetrationDepthSolverPool.SetPoolingEnabled(false);
+        BulletGlobals.ContinuousConvexCollisionPool.SetPoolingEnabled(false);
+        BulletGlobals.DbvtStackDataBlockPool.SetPoolingEnabled(false);
+
+        BulletGlobals.BoxBoxCollisionAlgorithmPool.SetPoolingEnabled(false);
+        BulletGlobals.CompoundCollisionAlgorithmPool.SetPoolingEnabled(false);
+        BulletGlobals.ConvexConcaveCollisionAlgorithmPool.SetPoolingEnabled(false);
+        BulletGlobals.ConvexConvexAlgorithmPool.SetPoolingEnabled(false);
+        BulletGlobals.ConvexPlaneAlgorithmPool.SetPoolingEnabled(false);
+        BulletGlobals.SphereBoxCollisionAlgorithmPool.SetPoolingEnabled(false);
+        BulletGlobals.SphereSphereCollisionAlgorithmPool.SetPoolingEnabled(false);
+        BulletGlobals.SphereTriangleCollisionAlgorithmPool.SetPoolingEnabled(false);
+        BulletGlobals.GImpactCollisionAlgorithmPool.SetPoolingEnabled(false);
+        BulletGlobals.GjkEpaSolver2MinkowskiDiffPool.SetPoolingEnabled(false);
+        BulletGlobals.PersistentManifoldPool.SetPoolingEnabled(false);
+        BulletGlobals.ManifoldResultPool.SetPoolingEnabled(false);
+        BulletGlobals.GJKPool.SetPoolingEnabled(false);
+        BulletGlobals.GIM_ShapeRetrieverPool.SetPoolingEnabled(false);
+        BulletGlobals.TriangleShapePool.SetPoolingEnabled(false);
+        BulletGlobals.SphereTriangleDetectorPool.SetPoolingEnabled(false);
+        BulletGlobals.CompoundLeafCallbackPool.SetPoolingEnabled(false);
+        BulletGlobals.GjkConvexCastPool.SetPoolingEnabled(false);
+        BulletGlobals.LocalTriangleSphereCastCallbackPool.SetPoolingEnabled(false);
+        BulletGlobals.BridgeTriangleRaycastCallbackPool.SetPoolingEnabled(false);
+        BulletGlobals.BridgeTriangleConcaveRaycastCallbackPool.SetPoolingEnabled(false);
+        BulletGlobals.BridgeTriangleConvexcastCallbackPool.SetPoolingEnabled(false);
+        BulletGlobals.MyNodeOverlapCallbackPool.SetPoolingEnabled(false);
+        BulletGlobals.ClosestRayResultCallbackPool.SetPoolingEnabled(false);
+        BulletGlobals.DebugDrawcallbackPool.SetPoolingEnabled(false);
+
         return world;
     }
     //m_constraint.ptr, ConstraintParams.BT_CONSTRAINT_STOP_CFM, cfm, ConstraintParamAxis.AXIS_ALL
@@ -1263,7 +1307,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
             }
         }
         return ret;
-        
+
     }
 
     public override float GetAngularMotionDisc(BulletShape pShape)
@@ -1353,10 +1397,10 @@ private sealed class BulletConstraintXNA : BulletConstraint
         CollisionShape shape = (pShape as BulletShapeXNA).shape;
         gObj.SetCollisionShape(shape);
         gObj.SetUserPointer(pLocalID);
-        
+
         if (specialCollisionObjects.ContainsKey(pLocalID))
             specialCollisionObjects[pLocalID] = gObj;
-        else 
+        else
             specialCollisionObjects.Add(pLocalID, gObj);
 
         // TODO: Add to Special CollisionObjects!
@@ -1447,8 +1491,8 @@ private sealed class BulletConstraintXNA : BulletConstraint
         return new BulletShapeXNA(ret, BSShapeTypeFromBroadPhaseNativeType(ret.GetShapeType()));
     }
 
-    public override BulletShape GetChildShapeFromCompoundShapeIndex(BulletShape cShape, int indx) { 
-        
+    public override BulletShape GetChildShapeFromCompoundShapeIndex(BulletShape cShape, int indx) {
+
         if (cShape == null)
             return null;
         CompoundShape compoundShape = (cShape as BulletShapeXNA).shape as CompoundShape;
@@ -1456,7 +1500,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
         BulletShape retShape = new BulletShapeXNA(shape, BSShapeTypeFromBroadPhaseNativeType(shape.GetShapeType()));
 
 
-        return retShape; 
+        return retShape;
     }
 
     public BSPhysicsShapeType BSShapeTypeFromBroadPhaseNativeType(BroadphaseNativeTypes pin)
@@ -1475,7 +1519,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
                 ret =  BSPhysicsShapeType.SHAPE_UNKNOWN;
                 break;
             case BroadphaseNativeTypes.CONVEX_TRIANGLEMESH_SHAPE_PROXYTYPE:
-                ret =  BSPhysicsShapeType.SHAPE_MESH;
+                ret =  BSPhysicsShapeType.SHAPE_CONVEXHULL;
                 break;
             case BroadphaseNativeTypes.CONVEX_HULL_SHAPE_PROXYTYPE:
                 ret =  BSPhysicsShapeType.SHAPE_HULL;
@@ -1503,7 +1547,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
                 ret =  BSPhysicsShapeType.SHAPE_CONE;
                 break;
             case BroadphaseNativeTypes.CONVEX_SHAPE_PROXYTYPE:
-                ret =  BSPhysicsShapeType.SHAPE_UNKNOWN;
+                ret =  BSPhysicsShapeType.SHAPE_CONVEXHULL;
                 break;
             case BroadphaseNativeTypes.CYLINDER_SHAPE_PROXYTYPE:
                 ret =  BSPhysicsShapeType.SHAPE_CYLINDER;
@@ -1547,7 +1591,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
                 break;
             ///Used for GIMPACT Trimesh integration
             case BroadphaseNativeTypes.GIMPACT_SHAPE_PROXYTYPE:
-                ret =  BSPhysicsShapeType.SHAPE_MESH;
+                ret =  BSPhysicsShapeType.SHAPE_GIMPACT;
                 break;
             ///Multimaterial mesh
             case BroadphaseNativeTypes.MULTIMATERIAL_TRIANGLE_MESH_PROXYTYPE:
@@ -1598,8 +1642,8 @@ private sealed class BulletConstraintXNA : BulletConstraint
         return new BulletShapeXNA(m_planeshape, BSPhysicsShapeType.SHAPE_GROUNDPLANE);
     }
 
-    public override BulletConstraint Create6DofSpringConstraint(BulletWorld pWorld, BulletBody pBody1, BulletBody pBody2, 
-                                    Vector3 pframe1, Quaternion pframe1rot, Vector3 pframe2, Quaternion pframe2rot, 
+    public override BulletConstraint Create6DofSpringConstraint(BulletWorld pWorld, BulletBody pBody1, BulletBody pBody2,
+                                    Vector3 pframe1, Quaternion pframe1rot, Vector3 pframe2, Quaternion pframe2rot,
                                     bool puseLinearReferenceFrameA, bool pdisableCollisionsBetweenLinkedBodies)
 
     {
@@ -1745,7 +1789,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
     {
         DiscreteDynamicsWorld world = (pWorld as BulletWorldXNA).world;
         CompoundShape compoundshape = new CompoundShape(false);
-        
+
         compoundshape.SetMargin(world.WorldSettings.Params.collisionMargin);
         int ii = 1;
 
@@ -1761,7 +1805,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
             int ender = ((ii + 4) + (vertexCount*3));
             for (int iii = ii + 4; iii < ender; iii+=3)
             {
-               
+
                 virts.Add(new IndexedVector3(pConvHulls[iii], pConvHulls[iii + 1], pConvHulls[iii +2]));
             }
             ConvexHullShape convexShape = new ConvexHullShape(virts, vertexCount);
@@ -1769,26 +1813,35 @@ private sealed class BulletConstraintXNA : BulletConstraint
             compoundshape.AddChildShape(ref childTrans, convexShape);
             ii += (vertexCount*3 + 4);
         }
-        
+
         return new BulletShapeXNA(compoundshape, BSPhysicsShapeType.SHAPE_HULL);
     }
 
-    public override BulletShape BuildHullShapeFromMesh(BulletWorld world, BulletShape meshShape)
+    public override BulletShape BuildHullShapeFromMesh(BulletWorld world, BulletShape meshShape, HACDParams parms)
     {
         /* TODO */ return null;
+    }
 
+    public override BulletShape BuildConvexHullShapeFromMesh(BulletWorld world, BulletShape meshShape)
+    {
+        /* TODO */ return null;
+    }
+
+    public override BulletShape CreateConvexHullShape(BulletWorld pWorld, int pIndicesCount, int[] indices, int pVerticesCount, float[] verticesAsFloats)
+    {
+        /* TODO */ return null;
     }
 
     public override BulletShape CreateMeshShape(BulletWorld pWorld, int pIndicesCount, int[] indices, int pVerticesCount, float[] verticesAsFloats)
     {
         //DumpRaw(indices,verticesAsFloats,pIndicesCount,pVerticesCount);
-        
+
         for (int iter = 0; iter < pVerticesCount; iter++)
         {
             if (verticesAsFloats[iter] > 0 && verticesAsFloats[iter] < 0.0001) verticesAsFloats[iter] = 0;
             if (verticesAsFloats[iter] < 0 && verticesAsFloats[iter] > -0.0001) verticesAsFloats[iter] = 0;
         }
-        
+
         ObjectArray<int> indicesarr = new ObjectArray<int>(indices);
         ObjectArray<float> vertices = new ObjectArray<float>(verticesAsFloats);
         DumpRaw(indicesarr,vertices,pIndicesCount,pVerticesCount);
@@ -1802,7 +1855,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
         mesh.m_vertexStride = 3;
         mesh.m_vertexType = PHY_ScalarType.PHY_FLOAT;
         mesh.m_triangleIndexStride = 3;
-        
+
         TriangleIndexVertexArray tribuilder = new TriangleIndexVertexArray();
         tribuilder.AddIndexedMesh(mesh, PHY_ScalarType.PHY_INTEGER);
         BvhTriangleMeshShape meshShape = new BvhTriangleMeshShape(tribuilder, true,true);
@@ -1811,9 +1864,14 @@ private sealed class BulletConstraintXNA : BulletConstraint
         return new BulletShapeXNA(meshShape, BSPhysicsShapeType.SHAPE_MESH);
 
     }
+    public override BulletShape CreateGImpactShape(BulletWorld pWorld, int pIndicesCount, int[] indices, int pVerticesCount, float[] verticesAsFloats)
+    {
+        // TODO:
+        return null;
+    }
     public static void DumpRaw(ObjectArray<int>indices, ObjectArray<float> vertices, int pIndicesCount,int pVerticesCount )
     {
-        
+
         String fileName = "objTest3.raw";
         String completePath = System.IO.Path.Combine(Util.configDir(), fileName);
         StreamWriter sw = new StreamWriter(completePath);
@@ -1839,7 +1897,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
             string s = vertices[indices[i * 3]].ToString("0.0000");
             s += " " + vertices[indices[i * 3 + 1]].ToString("0.0000");
             s += " " + vertices[indices[i * 3 + 2]].ToString("0.0000");
-        
+
             sw.Write(s + "\n");
         }
 
@@ -1861,7 +1919,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
         mesh.m_vertexStride = 3;
         mesh.m_vertexType = PHY_ScalarType.PHY_FLOAT;
         mesh.m_triangleIndexStride = 3;
-        
+
         TriangleIndexVertexArray tribuilder = new TriangleIndexVertexArray();
         tribuilder.AddIndexedMesh(mesh, PHY_ScalarType.PHY_INTEGER);
 
@@ -1892,7 +1950,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
             sw.Close();
     }
 
-    public override BulletShape CreateTerrainShape(uint id, Vector3 size, float minHeight, float maxHeight, float[] heightMap, 
+    public override BulletShape CreateTerrainShape(uint id, Vector3 size, float minHeight, float maxHeight, float[] heightMap,
                                                                 float scaleFactor, float collisionMargin)
     {
         const int upAxis = 2;
@@ -1900,7 +1958,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
                                                                            heightMap,  scaleFactor,
                                                                            minHeight, maxHeight, upAxis,
                                                                             false);
-        terrainShape.SetMargin(collisionMargin + 0.5f);
+        terrainShape.SetMargin(collisionMargin);
         terrainShape.SetUseDiamondSubdivision(true);
         terrainShape.SetUserPointer(id);
         return new BulletShapeXNA(terrainShape, BSPhysicsShapeType.SHAPE_TERRAIN);
@@ -1934,14 +1992,14 @@ private sealed class BulletConstraintXNA : BulletConstraint
         /* TODO */
         updatedEntityCount = 0;
         collidersCount = 0;
-        
+
 
         int ret = PhysicsStep2(world,timeStep,maxSubSteps,fixedTimeStep,out updatedEntityCount,out world.physicsScene.m_updateArray, out collidersCount, out world.physicsScene.m_collisionArray);
 
         return ret;
     }
 
-    private int PhysicsStep2(BulletWorld pWorld, float timeStep, int m_maxSubSteps, float m_fixedTimeStep, 
+    private int PhysicsStep2(BulletWorld pWorld, float timeStep, int m_maxSubSteps, float m_fixedTimeStep,
                     out int updatedEntityCount, out EntityProperties[] updatedEntities,
                     out int collidersCount, out CollisionDesc[] colliders)
     {
@@ -1950,24 +2008,24 @@ private sealed class BulletConstraintXNA : BulletConstraint
         return epic;
     }
 
-    private int PhysicsStepint(BulletWorld pWorld,float timeStep, int m_maxSubSteps, float m_fixedTimeStep, out int updatedEntityCount, 
+    private int PhysicsStepint(BulletWorld pWorld,float timeStep, int m_maxSubSteps, float m_fixedTimeStep, out int updatedEntityCount,
         out  EntityProperties[] updatedEntities, out int collidersCount, out CollisionDesc[] colliders, int maxCollisions, int maxUpdates)
     {
         int numSimSteps = 0;
         Array.Clear(UpdatedObjects, 0, UpdatedObjects.Length);
         Array.Clear(UpdatedCollisions, 0, UpdatedCollisions.Length);
         LastEntityProperty=0;
-        
+
 
 
 
 
 
         LastCollisionDesc=0;
-       
+
         updatedEntityCount = 0;
         collidersCount = 0;
-        
+
 
         if (pWorld is BulletWorldXNA)
         {
@@ -2024,7 +2082,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
 
             collidersCount = LastCollisionDesc;
             colliders = UpdatedCollisions;
-                
+
 
         }
         else
@@ -2032,15 +2090,15 @@ private sealed class BulletConstraintXNA : BulletConstraint
             //if (updatedEntities is null)
             //updatedEntities = new List<BulletXNA.EntityProperties>();
             //updatedEntityCount = 0;
-            
-            
+
+
             //collidersCount = 0;
-           
+
             updatedEntities = new EntityProperties[0];
 
-            
+
             colliders = new CollisionDesc[0];
-        
+
         }
         return numSimSteps;
     }
@@ -2048,7 +2106,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
     {
         IOverlappingPairCache cache = obj.GetOverlappingPairCache();
         ObjectArray<BroadphasePair> pairs = cache.GetOverlappingPairArray();
-        
+
         DiscreteDynamicsWorld world = (PhysicsScene.World as BulletWorldXNA).world;
         PersistentManifoldArray manifoldArray = new PersistentManifoldArray();
         BroadphasePair collisionPair;
@@ -2060,7 +2118,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
         ManifoldPoint pt;
 
         int numPairs = pairs.Count;
-        
+
         for (int i = 0; i < numPairs; i++)
         {
             manifoldArray.Clear();
@@ -2069,7 +2127,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
             collisionPair = world.GetPairCache().FindPair(pairs[i].m_pProxy0, pairs[i].m_pProxy1);
             if (collisionPair == null)
                 continue;
-            
+
             collisionPair.m_algorithm.GetAllContactManifolds(manifoldArray);
             for (int j = 0; j < manifoldArray.Count; j++)
             {
@@ -2092,7 +2150,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
     }
     private static void RecordCollision(BSAPIXNA world, CollisionObject objA, CollisionObject objB, IndexedVector3 contact, IndexedVector3 norm, float penetration)
     {
-       
+
         IndexedVector3 contactNormal = norm;
         if ((objA.GetCollisionFlags() & BulletXNA.BulletCollision.CollisionFlags.BS_WANTS_COLLISIONS) == 0 &&
             (objB.GetCollisionFlags() & BulletXNA.BulletCollision.CollisionFlags.BS_WANTS_COLLISIONS) == 0)
@@ -2162,11 +2220,11 @@ private sealed class BulletConstraintXNA : BulletConstraint
             if (NotMe is BulletBodyXNA && NotMe.HasPhysicalBody)
             {
                 CollisionObject AvoidBody = (NotMe as BulletBodyXNA).body;
-                
+
                 IndexedVector3 rOrigin = new IndexedVector3(_RayOrigin.X, _RayOrigin.Y, _RayOrigin.Z);
                 IndexedVector3 rEnd = new IndexedVector3(_RayOrigin.X, _RayOrigin.Y, _RayOrigin.Z - pRayHeight);
                 using (
-                    ClosestNotMeRayResultCallback rayCallback = 
+                    ClosestNotMeRayResultCallback rayCallback =
                                             new ClosestNotMeRayResultCallback(rOrigin, rEnd, AvoidBody)
                     )
                 {
@@ -2182,9 +2240,9 @@ private sealed class BulletConstraintXNA : BulletConstraint
         return false;
     }
 }
-  
 
-   
+
+
 
     public class SimMotionState : DefaultMotionState
     {
@@ -2277,12 +2335,12 @@ private sealed class BulletConstraintXNA : BulletConstraint
                 m_lastProperties = m_properties;
                 if (m_world.LastEntityProperty < m_world.UpdatedObjects.Length)
                     m_world.UpdatedObjects[m_world.LastEntityProperty++]=(m_properties);
-                
+
                 //(*m_updatesThisFrame)[m_properties.ID] = &m_properties;
             }
-                
-                
-                
+
+
+
 
         }
         public override void SetRigidBody(RigidBody body)
@@ -2305,7 +2363,7 @@ private sealed class BulletConstraintXNA : BulletConstraint
             (((v1.Z - nEpsilon) < v2.Z) && (v2.Z < (v1.Z + nEpsilon))) &&
             (((v1.W - nEpsilon) < v2.W) && (v2.W < (v1.W + nEpsilon)));
         }
-        
+
     }
 }
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
new file mode 100755
index 0000000..68bc1b9
--- /dev/null
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorAvatarMove.cs
@@ -0,0 +1,409 @@
+/*
+ * 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 copyrightD
+ *       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.Linq;
+using System.Text;
+
+using OpenSim.Region.Physics.Manager;
+
+using OMV = OpenMetaverse;
+
+namespace OpenSim.Region.Physics.BulletSPlugin
+{
+public class BSActorAvatarMove : BSActor
+{
+    BSVMotor m_velocityMotor;
+
+    // Set to true if we think we're going up stairs.
+    //    This state is remembered because collisions will turn on and off as we go up stairs.
+    int m_walkingUpStairs;
+    // The amount the step up is applying. Used to smooth stair walking.
+    float m_lastStepUp;
+
+    // Jumping happens over several frames. If use applies up force while colliding, start the
+    //    jump and allow the jump to continue for this number of frames.
+    int m_jumpFrames = 0;
+    float m_jumpVelocity = 0f;
+
+    public BSActorAvatarMove(BSScene physicsScene, BSPhysObject pObj, string actorName)
+        : base(physicsScene, pObj, actorName)
+    {
+        m_velocityMotor = null;
+        m_walkingUpStairs = 0;
+        m_physicsScene.DetailLog("{0},BSActorAvatarMove,constructor", m_controllingPrim.LocalID);
+    }
+
+    // BSActor.isActive
+    public override bool isActive
+    {
+        get { return Enabled && m_controllingPrim.IsPhysicallyActive; }
+    }
+
+    // Release any connections and resources used by the actor.
+    // BSActor.Dispose()
+    public override void Dispose()
+    {
+        base.SetEnabled(false);
+        // Now that turned off, remove any state we have in the scene.
+        Refresh();
+    }
+
+    // Called when physical parameters (properties set in Bullet) need to be re-applied.
+    // Called at taint-time.
+    // BSActor.Refresh()
+    public override void Refresh()
+    {
+        m_physicsScene.DetailLog("{0},BSActorAvatarMove,refresh", m_controllingPrim.LocalID);
+
+        // If the object is physically active, add the hoverer prestep action
+        if (isActive)
+        {
+            ActivateAvatarMove();
+        }
+        else
+        {
+            DeactivateAvatarMove();
+        }
+    }
+
+    // The object's physical representation is being rebuilt so pick up any physical dependencies (constraints, ...).
+    //     Register a prestep action to restore physical requirements before the next simulation step.
+    // Called at taint-time.
+    // BSActor.RemoveDependencies()
+    public override void RemoveDependencies()
+    {
+        // Nothing to do for the hoverer since it is all software at pre-step action time.
+    }
+
+    // Usually called when target velocity changes to set the current velocity and the target
+    //     into the movement motor.
+    public void SetVelocityAndTarget(OMV.Vector3 vel, OMV.Vector3 targ, bool inTaintTime)
+    {
+        m_physicsScene.TaintedObject(inTaintTime, "BSActorAvatarMove.setVelocityAndTarget", delegate()
+        {
+            if (m_velocityMotor != null)
+            {
+                m_velocityMotor.Reset();
+                m_velocityMotor.SetTarget(targ);
+                m_velocityMotor.SetCurrent(vel);
+                m_velocityMotor.Enabled = true;
+            }
+        });
+    }
+
+    // If a hover motor has not been created, create one and start the hovering.
+    private void ActivateAvatarMove()
+    {
+        if (m_velocityMotor == null)
+        {
+            // Infinite decay and timescale values so motor only changes current to target values.
+            m_velocityMotor = new BSVMotor("BSCharacter.Velocity",
+                                                0.2f,                       // time scale
+                                                BSMotor.Infinite,           // decay time scale
+                                                1f                          // efficiency
+            );
+            // _velocityMotor.PhysicsScene = PhysicsScene; // DEBUG DEBUG so motor will output detail log messages.
+            SetVelocityAndTarget(m_controllingPrim.RawVelocity, m_controllingPrim.TargetVelocity, true /* inTaintTime */);
+
+            m_physicsScene.BeforeStep += Mover;
+            m_controllingPrim.OnPreUpdateProperty += Process_OnPreUpdateProperty;
+
+            m_walkingUpStairs = 0;
+        }
+    }
+
+    private void DeactivateAvatarMove()
+    {
+        if (m_velocityMotor != null)
+        {
+            m_controllingPrim.OnPreUpdateProperty -= Process_OnPreUpdateProperty;
+            m_physicsScene.BeforeStep -= Mover;
+            m_velocityMotor = null;
+        }
+    }
+
+    // Called just before the simulation step. Update the vertical position for hoverness.
+    private void Mover(float timeStep)
+    {
+        // Don't do movement while the object is selected.
+        if (!isActive)
+            return;
+
+        // TODO: Decide if the step parameters should be changed depending on the avatar's
+        //     state (flying, colliding, ...). There is code in ODE to do this.
+
+        // COMMENTARY: when the user is making the avatar walk, except for falling, the velocity
+        //   specified for the avatar is the one that should be used. For falling, if the avatar
+        //   is not flying and is not colliding then it is presumed to be falling and the Z
+        //   component is not fooled with (thus allowing gravity to do its thing).
+        // When the avatar is standing, though, the user has specified a velocity of zero and
+        //   the avatar should be standing. But if the avatar is pushed by something in the world
+        //   (raising elevator platform, moving vehicle, ...) the avatar should be allowed to
+        //   move. Thus, the velocity cannot be forced to zero. The problem is that small velocity
+        //   errors can creap in and the avatar will slowly float off in some direction.
+        // So, the problem is that, when an avatar is standing, we cannot tell creaping error
+        //   from real pushing.
+        // The code below uses whether the collider is static or moving to decide whether to zero motion.
+
+        m_velocityMotor.Step(timeStep);
+        m_controllingPrim.IsStationary = false;
+
+        // If we're not supposed to be moving, make sure things are zero.
+        if (m_velocityMotor.ErrorIsZero() && m_velocityMotor.TargetValue == OMV.Vector3.Zero)
+        {
+            // The avatar shouldn't be moving
+            m_velocityMotor.Zero();
+
+            if (m_controllingPrim.IsColliding)
+            {
+                // If we are colliding with a stationary object, presume we're standing and don't move around
+                if (!m_controllingPrim.ColliderIsMoving && !m_controllingPrim.ColliderIsVolumeDetect)
+                {
+                    m_physicsScene.DetailLog("{0},BSCharacter.MoveMotor,collidingWithStationary,zeroingMotion", m_controllingPrim.LocalID);
+                    m_controllingPrim.IsStationary = true;
+                    m_controllingPrim.ZeroMotion(true /* inTaintTime */);
+                }
+
+                // Standing has more friction on the ground
+                if (m_controllingPrim.Friction != BSParam.AvatarStandingFriction)
+                {
+                    m_controllingPrim.Friction = BSParam.AvatarStandingFriction;
+                    m_physicsScene.PE.SetFriction(m_controllingPrim.PhysBody, m_controllingPrim.Friction);
+                }
+            }
+            else
+            {
+                if (m_controllingPrim.Flying)
+                {
+                    // Flying and not colliding and velocity nearly zero.
+                    m_controllingPrim.ZeroMotion(true /* inTaintTime */);
+                }
+            }
+
+            m_physicsScene.DetailLog("{0},BSCharacter.MoveMotor,taint,stopping,target={1},colliding={2}",
+                            m_controllingPrim.LocalID, m_velocityMotor.TargetValue, m_controllingPrim.IsColliding);
+        }
+        else
+        {
+            // Supposed to be moving.
+            OMV.Vector3 stepVelocity = m_velocityMotor.CurrentValue;
+
+            if (m_controllingPrim.Friction != BSParam.AvatarFriction)
+            {
+                // Probably starting to walk. Set friction to moving friction.
+                m_controllingPrim.Friction = BSParam.AvatarFriction;
+                m_physicsScene.PE.SetFriction(m_controllingPrim.PhysBody, m_controllingPrim.Friction);
+            }
+
+            if (!m_controllingPrim.Flying && !m_controllingPrim.IsColliding)
+            {
+                stepVelocity.Z = m_controllingPrim.RawVelocity.Z;
+            }
+
+
+            // Colliding and not flying with an upward force. The avatar must be trying to jump.
+            if (!m_controllingPrim.Flying && m_controllingPrim.IsColliding && stepVelocity.Z > 0)
+            {
+                // We allow the upward force to happen for this many frames.
+                m_jumpFrames = BSParam.AvatarJumpFrames;
+                m_jumpVelocity = stepVelocity.Z;
+            }
+
+            // The case where the avatar is not colliding and is not flying is special.
+            // The avatar is either falling or jumping and the user can be applying force to the avatar
+            //     (force in some direction or force up or down).
+            // If the avatar has negative Z velocity and is not colliding, presume we're falling and keep the velocity.
+            // If the user is trying to apply upward force but we're not colliding, assume the avatar
+            //     is trying to jump and don't apply the upward force if not touching the ground any more.
+            if (!m_controllingPrim.Flying && !m_controllingPrim.IsColliding)
+            {
+                // If upward velocity is being applied, this must be a jump and only allow that to go on so long
+                if (m_jumpFrames > 0)
+                {
+                    // Since not touching the ground, only apply upward force for so long.
+                    m_jumpFrames--;
+                    stepVelocity.Z = m_jumpVelocity;
+                }
+                else
+                {
+                    // Since we're not affected by anything, whatever vertical motion the avatar has, continue that.
+                    stepVelocity.Z = m_controllingPrim.RawVelocity.Z;
+                }
+                // DetailLog("{0},BSCharacter.MoveMotor,taint,overrideStepZWithWorldZ,stepVel={1}", LocalID, stepVelocity);
+            }
+
+            // 'stepVelocity' is now the speed we'd like the avatar to move in. Turn that into an instantanous force.
+            OMV.Vector3 moveForce = (stepVelocity - m_controllingPrim.RawVelocity) * m_controllingPrim.Mass;
+
+            // Add special movement force to allow avatars to walk up stepped surfaces.
+            moveForce += WalkUpStairs();
+
+            m_physicsScene.DetailLog("{0},BSCharacter.MoveMotor,move,stepVel={1},vel={2},mass={3},moveForce={4}",
+                            m_controllingPrim.LocalID, stepVelocity, m_controllingPrim.RawVelocity, m_controllingPrim.Mass, moveForce);
+            m_physicsScene.PE.ApplyCentralImpulse(m_controllingPrim.PhysBody, moveForce);
+        }
+    }
+
+    // Called just as the property update is received from the physics engine.
+    // Do any mode necessary for avatar movement.
+    private void Process_OnPreUpdateProperty(ref EntityProperties entprop)
+    {
+        // Don't change position if standing on a stationary object.
+        if (m_controllingPrim.IsStationary)
+        {
+            entprop.Position = m_controllingPrim.RawPosition;
+            m_physicsScene.PE.SetTranslation(m_controllingPrim.PhysBody, entprop.Position, entprop.Rotation);
+        }
+
+    }
+
+    // Decide if the character is colliding with a low object and compute a force to pop the
+    //    avatar up so it can walk up and over the low objects.
+    private OMV.Vector3 WalkUpStairs()
+    {
+        OMV.Vector3 ret = OMV.Vector3.Zero;
+
+        m_physicsScene.DetailLog("{0},BSCharacter.WalkUpStairs,IsColliding={1},flying={2},targSpeed={3},collisions={4},avHeight={5}",
+                        m_controllingPrim.LocalID, m_controllingPrim.IsColliding, m_controllingPrim.Flying,
+                        m_controllingPrim.TargetVelocitySpeed, m_controllingPrim.CollisionsLastTick.Count, m_controllingPrim.Size.Z);
+
+        // Check for stairs climbing if colliding, not flying and moving forward
+        if ( m_controllingPrim.IsColliding
+                    && !m_controllingPrim.Flying
+                    && m_controllingPrim.TargetVelocitySpeed > 0.1f )
+        {
+            // The range near the character's feet where we will consider stairs
+            // float nearFeetHeightMin = m_controllingPrim.RawPosition.Z - (m_controllingPrim.Size.Z / 2f) + 0.05f;
+            // Note: there is a problem with the computation of the capsule height. Thus RawPosition is off
+            //    from the height. Revisit size and this computation when height is scaled properly.
+            float nearFeetHeightMin = m_controllingPrim.RawPosition.Z - (m_controllingPrim.Size.Z / 2f) - 0.05f;
+            float nearFeetHeightMax = nearFeetHeightMin + BSParam.AvatarStepHeight;
+
+            // Look for a collision point that is near the character's feet and is oriented the same as the charactor is.
+            // Find the highest 'good' collision.
+            OMV.Vector3 highestTouchPosition = OMV.Vector3.Zero;
+            foreach (KeyValuePair<uint, ContactPoint> kvp in m_controllingPrim.CollisionsLastTick.m_objCollisionList)
+            {
+                // Don't care about collisions with the terrain
+                if (kvp.Key > m_physicsScene.TerrainManager.HighestTerrainID)
+                {
+                    BSPhysObject collisionObject;
+                    if (m_physicsScene.PhysObjects.TryGetValue(kvp.Key, out collisionObject))
+                    {
+                        if (!collisionObject.IsVolumeDetect)
+                        {
+                            OMV.Vector3 touchPosition = kvp.Value.Position;
+                            m_physicsScene.DetailLog("{0},BSCharacter.WalkUpStairs,min={1},max={2},touch={3}",
+                                            m_controllingPrim.LocalID, nearFeetHeightMin, nearFeetHeightMax, touchPosition);
+                            if (touchPosition.Z >= nearFeetHeightMin && touchPosition.Z <= nearFeetHeightMax)
+                            {
+                                // This contact is within the 'near the feet' range.
+                                // The normal should be our contact point to the object so it is pointing away
+                                //    thus the difference between our facing orientation and the normal should be small.
+                                OMV.Vector3 directionFacing = OMV.Vector3.UnitX * m_controllingPrim.RawOrientation;
+                                OMV.Vector3 touchNormal = OMV.Vector3.Normalize(kvp.Value.SurfaceNormal);
+                                float diff = Math.Abs(OMV.Vector3.Distance(directionFacing, touchNormal));
+                                if (diff < BSParam.AvatarStepApproachFactor)
+                                {
+                                    if (highestTouchPosition.Z < touchPosition.Z)
+                                        highestTouchPosition = touchPosition;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            m_walkingUpStairs = 0;
+            // If there is a good step sensing, move the avatar over the step.
+            if (highestTouchPosition != OMV.Vector3.Zero)
+            {
+                // Remember that we are going up stairs. This is needed because collisions
+                //    will stop when we move up so this smoothes out that effect.
+                m_walkingUpStairs = BSParam.AvatarStepSmoothingSteps;
+
+                m_lastStepUp = highestTouchPosition.Z - nearFeetHeightMin;
+                ret = ComputeStairCorrection(m_lastStepUp);
+                m_physicsScene.DetailLog("{0},BSCharacter.WalkUpStairs,touchPos={1},nearFeetMin={2},ret={3}",
+                        m_controllingPrim.LocalID, highestTouchPosition, nearFeetHeightMin, ret);
+            }
+        }
+        else
+        {
+            // If we used to be going up stairs but are not now, smooth the case where collision goes away while
+            //    we are bouncing up the stairs.
+            if (m_walkingUpStairs > 0)
+            {
+                m_walkingUpStairs--;
+                ret = ComputeStairCorrection(m_lastStepUp);
+            }
+        }
+
+        return ret;
+    }
+
+    private OMV.Vector3 ComputeStairCorrection(float stepUp)
+    {
+        OMV.Vector3 ret = OMV.Vector3.Zero;
+        OMV.Vector3 displacement = OMV.Vector3.Zero;
+
+        if (stepUp > 0f)
+        {
+            // Found the stairs contact point. Push up a little to raise the character.
+            if (BSParam.AvatarStepForceFactor > 0f)
+            {
+                float upForce = stepUp * m_controllingPrim.Mass * BSParam.AvatarStepForceFactor;
+                ret = new OMV.Vector3(0f, 0f, upForce);
+            }
+
+            // Also move the avatar up for the new height
+            if (BSParam.AvatarStepUpCorrectionFactor > 0f)
+            {
+                // Move the avatar up related to the height of the collision
+                displacement = new OMV.Vector3(0f, 0f, stepUp * BSParam.AvatarStepUpCorrectionFactor);
+                m_controllingPrim.ForcePosition = m_controllingPrim.RawPosition + displacement;
+            }
+            else
+            {
+                if (BSParam.AvatarStepUpCorrectionFactor < 0f)
+                {
+                    // Move the avatar up about the specified step height
+                    displacement = new OMV.Vector3(0f, 0f, BSParam.AvatarStepHeight);
+                    m_controllingPrim.ForcePosition = m_controllingPrim.RawPosition + displacement;
+                }
+            }
+            m_physicsScene.DetailLog("{0},BSCharacter.WalkUpStairs.ComputeStairCorrection,disp={1},force={2}",
+                                        m_controllingPrim.LocalID, displacement, ret);
+
+        }
+        return ret;
+    }
+}
+}
+
+
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
new file mode 100755
index 0000000..8a79809
--- /dev/null
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorHover.cs
@@ -0,0 +1,173 @@
+/*
+ * 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 copyrightD
+ *       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.Linq;
+using System.Text;
+
+using OpenSim.Region.Physics.Manager;
+
+using OMV = OpenMetaverse;
+
+namespace OpenSim.Region.Physics.BulletSPlugin
+{
+public class BSActorHover : BSActor
+{
+    private BSFMotor m_hoverMotor;
+
+    public BSActorHover(BSScene physicsScene, BSPhysObject pObj, string actorName)
+        : base(physicsScene, pObj, actorName)
+    {
+        m_hoverMotor = null;
+        m_physicsScene.DetailLog("{0},BSActorHover,constructor", m_controllingPrim.LocalID);
+    }
+
+    // BSActor.isActive
+    public override bool isActive
+    {
+        get { return Enabled; }
+    }
+
+    // Release any connections and resources used by the actor.
+    // BSActor.Dispose()
+    public override void Dispose()
+    {
+        Enabled = false;
+    }
+
+    // Called when physical parameters (properties set in Bullet) need to be re-applied.
+    // Called at taint-time.
+    // BSActor.Refresh()
+    public override void Refresh()
+    {
+        m_physicsScene.DetailLog("{0},BSActorHover,refresh", m_controllingPrim.LocalID);
+
+        // If not active any more, turn me off
+        if (!m_controllingPrim.HoverActive)
+        {
+            SetEnabled(false);
+        }
+
+        // If the object is physically active, add the hoverer prestep action
+        if (isActive)
+        {
+            ActivateHover();
+        }
+        else
+        {
+            DeactivateHover();
+        }
+    }
+
+    // The object's physical representation is being rebuilt so pick up any physical dependencies (constraints, ...).
+    //     Register a prestep action to restore physical requirements before the next simulation step.
+    // Called at taint-time.
+    // BSActor.RemoveDependencies()
+    public override void RemoveDependencies()
+    {
+        // Nothing to do for the hoverer since it is all software at pre-step action time.
+    }
+
+    // If a hover motor has not been created, create one and start the hovering.
+    private void ActivateHover()
+    {
+        if (m_hoverMotor == null)
+        {
+            // Turning the target on
+            m_hoverMotor = new BSFMotor("BSActorHover",
+                                        m_controllingPrim.HoverTau,               // timeScale
+                                        BSMotor.Infinite,           // decay time scale
+                                        1f                          // efficiency
+            );
+            m_hoverMotor.SetTarget(ComputeCurrentHoverHeight());
+            m_hoverMotor.SetCurrent(m_controllingPrim.RawPosition.Z);
+            m_hoverMotor.PhysicsScene = m_physicsScene; // DEBUG DEBUG so motor will output detail log messages.
+
+            m_physicsScene.BeforeStep += Hoverer;
+        }
+    }
+
+    private void DeactivateHover()
+    {
+        if (m_hoverMotor != null)
+        {
+            m_physicsScene.BeforeStep -= Hoverer;
+            m_hoverMotor = null;
+        }
+    }
+
+    // Called just before the simulation step. Update the vertical position for hoverness.
+    private void Hoverer(float timeStep)
+    {
+        // Don't do hovering while the object is selected.
+        if (!isActive)
+            return;
+
+        m_hoverMotor.SetCurrent(m_controllingPrim.RawPosition.Z);
+        m_hoverMotor.SetTarget(ComputeCurrentHoverHeight());
+        float targetHeight = m_hoverMotor.Step(timeStep);
+
+        // 'targetHeight' is where we'd like the Z of the prim to be at this moment.
+        // Compute the amount of force to push us there.
+        float moveForce = (targetHeight - m_controllingPrim.RawPosition.Z) * m_controllingPrim.RawMass;
+        // Undo anything the object thinks it's doing at the moment
+        moveForce = -m_controllingPrim.RawVelocity.Z * m_controllingPrim.Mass;
+
+        m_physicsScene.PE.ApplyCentralImpulse(m_controllingPrim.PhysBody, new OMV.Vector3(0f, 0f, moveForce));
+        m_physicsScene.DetailLog("{0},BSPrim.Hover,move,targHt={1},moveForce={2},mass={3}",
+                        m_controllingPrim.LocalID, targetHeight, moveForce, m_controllingPrim.RawMass);
+    }
+
+    // Based on current position, determine what we should be hovering at now.
+    // Must recompute often. What if we walked offa cliff>
+    private float ComputeCurrentHoverHeight()
+    {
+        float ret = m_controllingPrim.HoverHeight;
+        float groundHeight = m_physicsScene.TerrainManager.GetTerrainHeightAtXYZ(m_controllingPrim.RawPosition);
+
+        switch (m_controllingPrim.HoverType)
+        {
+            case PIDHoverType.Ground:
+                ret = groundHeight + m_controllingPrim.HoverHeight;
+                break;
+            case PIDHoverType.GroundAndWater:
+                float waterHeight = m_physicsScene.TerrainManager.GetWaterLevelAtXYZ(m_controllingPrim.RawPosition);
+                if (groundHeight > waterHeight)
+                {
+                    ret = groundHeight + m_controllingPrim.HoverHeight;
+                }
+                else
+                {
+                    ret = waterHeight + m_controllingPrim.HoverHeight;
+                }
+                break;
+        }
+        return ret;
+    }
+}
+}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
new file mode 100755
index 0000000..8b0fdeb
--- /dev/null
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs
@@ -0,0 +1,187 @@
+/*
+ * 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 copyrightD
+ *       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.Linq;
+using System.Text;
+
+using OMV = OpenMetaverse;
+
+namespace OpenSim.Region.Physics.BulletSPlugin
+{
+public class BSActorLockAxis : BSActor
+{
+    BSConstraint LockAxisConstraint = null;
+
+    public BSActorLockAxis(BSScene physicsScene, BSPhysObject pObj, string actorName)
+        : base(physicsScene, pObj, actorName)
+    {
+        m_physicsScene.DetailLog("{0},BSActorLockAxis,constructor", m_controllingPrim.LocalID);
+        LockAxisConstraint = null;
+    }
+
+    // BSActor.isActive
+    public override bool isActive
+    {
+        get { return Enabled && m_controllingPrim.IsPhysicallyActive; }
+    }
+
+    // Release any connections and resources used by the actor.
+    // BSActor.Dispose()
+    public override void Dispose()
+    {
+        RemoveAxisLockConstraint();
+    }
+
+    // Called when physical parameters (properties set in Bullet) need to be re-applied.
+    // Called at taint-time.
+    // BSActor.Refresh()
+    public override void Refresh()
+    {
+        m_physicsScene.DetailLog("{0},BSActorLockAxis,refresh,lockedAxis={1},enabled={2},pActive={3}",
+                                    m_controllingPrim.LocalID, m_controllingPrim.LockedAngularAxis, Enabled, m_controllingPrim.IsPhysicallyActive);
+        // If all the axis are free, we don't need to exist
+        if (m_controllingPrim.LockedAngularAxis == m_controllingPrim.LockedAxisFree)
+        {
+            Enabled = false;
+        }
+
+        // If the object is physically active, add the axis locking constraint
+        if (isActive)
+        {
+            AddAxisLockConstraint();
+        }
+        else
+        {
+            RemoveAxisLockConstraint();
+        }
+    }
+
+    // The object's physical representation is being rebuilt so pick up any physical dependencies (constraints, ...).
+    //     Register a prestep action to restore physical requirements before the next simulation step.
+    // Called at taint-time.
+    // BSActor.RemoveDependencies()
+    public override void RemoveDependencies()
+    {
+        if (LockAxisConstraint != null)
+        {
+            // If a constraint is set up, remove it from the physical scene
+            RemoveAxisLockConstraint();
+            // Schedule a call before the next simulation step to restore the constraint.
+            m_physicsScene.PostTaintObject("BSActorLockAxis:" + ActorName, m_controllingPrim.LocalID, delegate()
+            {
+                Refresh();
+            });
+        }
+    }
+
+    private void AddAxisLockConstraint()
+    {
+        if (LockAxisConstraint == null)
+        {
+            // Lock that axis by creating a 6DOF constraint that has one end in the world and
+            //    the other in the object.
+            // http://www.bulletphysics.org/Bullet/phpBB3/viewtopic.php?p=20817
+            // http://www.bulletphysics.org/Bullet/phpBB3/viewtopic.php?p=26380
+
+            // Remove any existing axis constraint (just to be sure)
+            RemoveAxisLockConstraint();
+
+            BSConstraint6Dof axisConstrainer = new BSConstraint6Dof(m_physicsScene.World, m_controllingPrim.PhysBody,
+                                OMV.Vector3.Zero, OMV.Quaternion.Identity,
+                                false /* useLinearReferenceFrameB */, true /* disableCollisionsBetweenLinkedBodies */);
+            LockAxisConstraint = axisConstrainer;
+            m_physicsScene.Constraints.AddConstraint(LockAxisConstraint);
+
+            // The constraint is tied to the world and oriented to the prim.
+
+            // Free to move linearly in the region
+            OMV.Vector3 linearLow = OMV.Vector3.Zero;
+            OMV.Vector3 linearHigh = m_physicsScene.TerrainManager.DefaultRegionSize;
+            if (m_controllingPrim.LockedLinearAxis.X != BSPhysObject.FreeAxis)
+            {
+                linearLow.X = m_controllingPrim.RawPosition.X;
+                linearHigh.X = m_controllingPrim.RawPosition.X;
+            }
+            if (m_controllingPrim.LockedLinearAxis.Y != BSPhysObject.FreeAxis)
+            {
+                linearLow.Y = m_controllingPrim.RawPosition.Y;
+                linearHigh.Y = m_controllingPrim.RawPosition.Y;
+            }
+            if (m_controllingPrim.LockedLinearAxis.Z != BSPhysObject.FreeAxis)
+            {
+                linearLow.Z = m_controllingPrim.RawPosition.Z;
+                linearHigh.Z = m_controllingPrim.RawPosition.Z;
+            }
+            axisConstrainer.SetLinearLimits(linearLow, linearHigh);
+
+            // Angular with some axis locked
+            float fPI = (float)Math.PI;
+            OMV.Vector3 angularLow = new OMV.Vector3(-fPI, -fPI, -fPI);
+            OMV.Vector3 angularHigh = new OMV.Vector3(fPI, fPI, fPI);
+            if (m_controllingPrim.LockedAngularAxis.X != BSPhysObject.FreeAxis)
+            {
+                angularLow.X = 0f;
+                angularHigh.X = 0f;
+            }
+            if (m_controllingPrim.LockedAngularAxis.Y != BSPhysObject.FreeAxis)
+            {
+                angularLow.Y = 0f;
+                angularHigh.Y = 0f;
+            }
+            if (m_controllingPrim.LockedAngularAxis.Z != BSPhysObject.FreeAxis)
+            {
+                angularLow.Z = 0f;
+                angularHigh.Z = 0f;
+            }
+            if (!axisConstrainer.SetAngularLimits(angularLow, angularHigh))
+            {
+                m_physicsScene.DetailLog("{0},BSActorLockAxis.AddAxisLockConstraint,failedSetAngularLimits", m_controllingPrim.LocalID);
+            }
+
+            m_physicsScene.DetailLog("{0},BSActorLockAxis.AddAxisLockConstraint,create,linLow={1},linHi={2},angLow={3},angHi={4}",
+                                        m_controllingPrim.LocalID, linearLow, linearHigh, angularLow, angularHigh);
+
+            // Constants from one of the posts mentioned above and used in Bullet's ConstraintDemo.
+            axisConstrainer.TranslationalLimitMotor(true /* enable */, 5.0f, 0.1f);
+
+            axisConstrainer.RecomputeConstraintVariables(m_controllingPrim.RawMass);
+        }
+    }
+
+    private void RemoveAxisLockConstraint()
+    {
+        if (LockAxisConstraint != null)
+        {
+            m_physicsScene.Constraints.RemoveAndDestroyConstraint(LockAxisConstraint);
+            LockAxisConstraint = null;
+            m_physicsScene.DetailLog("{0},BSActorLockAxis.RemoveAxisLockConstraint,destroyingConstraint", m_controllingPrim.LocalID);
+        }
+    }
+}
+}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
new file mode 100755
index 0000000..bdf4bc0
--- /dev/null
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorMoveToTarget.cs
@@ -0,0 +1,219 @@
+/*
+ * 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 copyrightD
+ *       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.Linq;
+using System.Text;
+
+using OpenSim.Region.Physics.Manager;
+
+using OMV = OpenMetaverse;
+
+namespace OpenSim.Region.Physics.BulletSPlugin
+{
+public class BSActorMoveToTarget : BSActor
+{
+    private BSVMotor m_targetMotor;
+
+    public BSActorMoveToTarget(BSScene physicsScene, BSPhysObject pObj, string actorName)
+        : base(physicsScene, pObj, actorName)
+    {
+        m_targetMotor = null;
+        m_physicsScene.DetailLog("{0},BSActorMoveToTarget,constructor", m_controllingPrim.LocalID);
+    }
+
+    // BSActor.isActive
+    public override bool isActive
+    {
+        // MoveToTarget only works on physical prims
+        get { return Enabled && m_controllingPrim.IsPhysicallyActive; }
+    }
+
+    // Release any connections and resources used by the actor.
+    // BSActor.Dispose()
+    public override void Dispose()
+    {
+        Enabled = false;
+    }
+
+    // Called when physical parameters (properties set in Bullet) need to be re-applied.
+    // Called at taint-time.
+    // BSActor.Refresh()
+    public override void Refresh()
+    {
+        m_physicsScene.DetailLog("{0},BSActorMoveToTarget,refresh,enabled={1},active={2},target={3},tau={4}",
+            m_controllingPrim.LocalID, Enabled, m_controllingPrim.MoveToTargetActive,
+            m_controllingPrim.MoveToTargetTarget, m_controllingPrim.MoveToTargetTau );
+
+        // If not active any more...
+        if (!m_controllingPrim.MoveToTargetActive)
+        {
+            Enabled = false;
+        }
+
+        if (isActive)
+        {
+            ActivateMoveToTarget();
+        }
+        else
+        {
+            DeactivateMoveToTarget();
+        }
+    }
+
+    // The object's physical representation is being rebuilt so pick up any physical dependencies (constraints, ...).
+    //     Register a prestep action to restore physical requirements before the next simulation step.
+    // Called at taint-time.
+    // BSActor.RemoveDependencies()
+    public override void RemoveDependencies()
+    {
+        // Nothing to do for the moveToTarget since it is all software at pre-step action time.
+    }
+
+    // If a hover motor has not been created, create one and start the hovering.
+    private void ActivateMoveToTarget()
+    {
+        if (m_targetMotor == null)
+        {
+            // We're taking over after this.
+            m_controllingPrim.ZeroMotion(true);
+
+            /* Someday use the PID controller
+            m_targetMotor = new BSPIDVMotor("BSActorMoveToTarget-" + m_controllingPrim.LocalID.ToString());
+            m_targetMotor.TimeScale = m_controllingPrim.MoveToTargetTau;
+            m_targetMotor.Efficiency = 1f;
+             */
+            m_targetMotor = new BSVMotor("BSActorMoveToTarget-" + m_controllingPrim.LocalID.ToString(),
+                                        m_controllingPrim.MoveToTargetTau,  // timeScale
+                                        BSMotor.Infinite,                   // decay time scale
+                                        1f                                  // efficiency
+            );
+            m_targetMotor.PhysicsScene = m_physicsScene; // DEBUG DEBUG so motor will output detail log messages.
+            m_targetMotor.SetTarget(m_controllingPrim.MoveToTargetTarget);
+            m_targetMotor.SetCurrent(m_controllingPrim.RawPosition);
+
+            // m_physicsScene.BeforeStep += Mover;
+            m_physicsScene.BeforeStep += Mover2;
+        }
+        else
+        {
+            // If already allocated, make sure the target and other paramters are current
+            m_targetMotor.SetTarget(m_controllingPrim.MoveToTargetTarget);
+            m_targetMotor.SetCurrent(m_controllingPrim.RawPosition);
+        }
+    }
+
+    private void DeactivateMoveToTarget()
+    {
+        if (m_targetMotor != null)
+        {
+            // m_physicsScene.BeforeStep -= Mover;
+            m_physicsScene.BeforeStep -= Mover2;
+            m_targetMotor = null;
+        }
+    }
+
+    // Origional mover that set the objects position to move to the target.
+    // The problem was that gravity would keep trying to push the object down so
+    //    the overall downward velocity would increase to infinity.
+    // Called just before the simulation step.
+    private void Mover(float timeStep)
+    {
+        // Don't do hovering while the object is selected.
+        if (!isActive)
+            return;
+
+        OMV.Vector3 origPosition = m_controllingPrim.RawPosition;     // DEBUG DEBUG (for printout below)
+
+        // 'movePosition' is where we'd like the prim to be at this moment.
+        OMV.Vector3 movePosition = m_controllingPrim.RawPosition + m_targetMotor.Step(timeStep);
+
+        // If we are very close to our target, turn off the movement motor.
+        if (m_targetMotor.ErrorIsZero())
+        {
+            m_physicsScene.DetailLog("{0},BSActorMoveToTarget.Mover,zeroMovement,movePos={1},pos={2},mass={3}",
+                                    m_controllingPrim.LocalID, movePosition, m_controllingPrim.RawPosition, m_controllingPrim.Mass);
+            m_controllingPrim.ForcePosition = m_targetMotor.TargetValue;
+            m_controllingPrim.ForceVelocity = OMV.Vector3.Zero;
+            // Setting the position does not cause the physics engine to generate a property update. Force it.
+            m_physicsScene.PE.PushUpdate(m_controllingPrim.PhysBody);
+        }
+        else
+        {
+            m_controllingPrim.ForcePosition = movePosition;
+            // Setting the position does not cause the physics engine to generate a property update. Force it.
+            m_physicsScene.PE.PushUpdate(m_controllingPrim.PhysBody);
+        }
+        m_physicsScene.DetailLog("{0},BSActorMoveToTarget.Mover,move,fromPos={1},movePos={2}",
+                                        m_controllingPrim.LocalID, origPosition, movePosition);
+    }
+
+    // Version of mover that applies forces to move the physical object to the target.
+    // Also overcomes gravity so the object doesn't just drop to the ground.
+    // Called just before the simulation step.
+    private void Mover2(float timeStep)
+    {
+        // Don't do hovering while the object is selected.
+        if (!isActive)
+            return;
+
+        OMV.Vector3 origPosition = m_controllingPrim.RawPosition;     // DEBUG DEBUG (for printout below)
+        OMV.Vector3 addedForce = OMV.Vector3.Zero;
+
+        // CorrectionVector is the movement vector required this step
+        OMV.Vector3 correctionVector = m_targetMotor.Step(timeStep, m_controllingPrim.RawPosition);
+
+        // If we are very close to our target, turn off the movement motor.
+        if (m_targetMotor.ErrorIsZero())
+        {
+            m_physicsScene.DetailLog("{0},BSActorMoveToTarget.Mover3,zeroMovement,pos={1},mass={2}",
+                                    m_controllingPrim.LocalID, m_controllingPrim.RawPosition, m_controllingPrim.Mass);
+            m_controllingPrim.ForcePosition = m_targetMotor.TargetValue;
+            m_controllingPrim.ForceVelocity = OMV.Vector3.Zero;
+            // Setting the position does not cause the physics engine to generate a property update. Force it.
+            m_physicsScene.PE.PushUpdate(m_controllingPrim.PhysBody);
+        }
+        else
+        {
+            // First force to move us there -- the motor return a timestep scaled value.
+            addedForce = correctionVector / timeStep;
+            // Remove the existing velocity (only the moveToTarget force counts)
+            addedForce -= m_controllingPrim.RawVelocity;
+            // Overcome gravity. 
+            addedForce -= m_controllingPrim.Gravity;
+
+            // Add enough force to overcome the mass of the object
+            addedForce *= m_controllingPrim.Mass;
+
+            m_controllingPrim.AddForce(addedForce, false /* pushForce */, true /* inTaintTime */);
+        }
+        m_physicsScene.DetailLog("{0},BSActorMoveToTarget.Mover3,move,fromPos={1},addedForce={2}",
+                                        m_controllingPrim.LocalID, origPosition, addedForce);
+    }
+}
+}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs
new file mode 100755
index 0000000..96fa0b6
--- /dev/null
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetForce.cs
@@ -0,0 +1,137 @@
+/*
+ * 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 copyrightD
+ *       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.Linq;
+using System.Text;
+
+using OpenSim.Region.Physics.Manager;
+
+using OMV = OpenMetaverse;
+
+namespace OpenSim.Region.Physics.BulletSPlugin
+{
+public class BSActorSetForce : BSActor
+{
+    BSFMotor m_forceMotor;
+
+    public BSActorSetForce(BSScene physicsScene, BSPhysObject pObj, string actorName)
+        : base(physicsScene, pObj, actorName)
+    {
+        m_forceMotor = null;
+        m_physicsScene.DetailLog("{0},BSActorSetForce,constructor", m_controllingPrim.LocalID);
+    }
+
+    // BSActor.isActive
+    public override bool isActive
+    {
+        get { return Enabled && m_controllingPrim.IsPhysicallyActive; }
+    }
+
+    // Release any connections and resources used by the actor.
+    // BSActor.Dispose()
+    public override void Dispose()
+    {
+        Enabled = false;
+    }
+
+    // Called when physical parameters (properties set in Bullet) need to be re-applied.
+    // Called at taint-time.
+    // BSActor.Refresh()
+    public override void Refresh()
+    {
+        m_physicsScene.DetailLog("{0},BSActorSetForce,refresh", m_controllingPrim.LocalID);
+
+        // If not active any more, get rid of me (shouldn't ever happen, but just to be safe)
+        if (m_controllingPrim.RawForce == OMV.Vector3.Zero)
+        {
+            m_physicsScene.DetailLog("{0},BSActorSetForce,refresh,notSetForce,removing={1}", m_controllingPrim.LocalID, ActorName);
+            Enabled = false;
+            return;
+        }
+
+        // If the object is physically active, add the hoverer prestep action
+        if (isActive)
+        {
+            ActivateSetForce();
+        }
+        else
+        {
+            DeactivateSetForce();
+        }
+    }
+
+    // The object's physical representation is being rebuilt so pick up any physical dependencies (constraints, ...).
+    //     Register a prestep action to restore physical requirements before the next simulation step.
+    // Called at taint-time.
+    // BSActor.RemoveDependencies()
+    public override void RemoveDependencies()
+    {
+        // Nothing to do for the hoverer since it is all software at pre-step action time.
+    }
+
+    // If a hover motor has not been created, create one and start the hovering.
+    private void ActivateSetForce()
+    {
+        if (m_forceMotor == null)
+        {
+            // A fake motor that might be used someday
+            m_forceMotor = new BSFMotor("setForce", 1f, 1f, 1f);
+
+            m_physicsScene.BeforeStep += Mover;
+        }
+    }
+
+    private void DeactivateSetForce()
+    {
+        if (m_forceMotor != null)
+        {
+            m_physicsScene.BeforeStep -= Mover;
+            m_forceMotor = null;
+        }
+    }
+
+    // Called just before the simulation step. Update the vertical position for hoverness.
+    private void Mover(float timeStep)
+    {
+        // Don't do force while the object is selected.
+        if (!isActive)
+            return;
+
+        m_physicsScene.DetailLog("{0},BSActorSetForce,preStep,force={1}", m_controllingPrim.LocalID, m_controllingPrim.RawForce);
+        if (m_controllingPrim.PhysBody.HasPhysicalBody)
+        {
+            m_physicsScene.PE.ApplyCentralForce(m_controllingPrim.PhysBody, m_controllingPrim.RawForce);
+            m_controllingPrim.ActivateIfPhysical(false);
+        }
+
+        // TODO:
+    }
+}
+}
+
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
new file mode 100755
index 0000000..65098e1
--- /dev/null
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorSetTorque.cs
@@ -0,0 +1,138 @@
+/*
+ * 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 copyrightD
+ *       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.Linq;
+using System.Text;
+
+using OpenSim.Region.Physics.Manager;
+
+using OMV = OpenMetaverse;
+
+namespace OpenSim.Region.Physics.BulletSPlugin
+{
+public class BSActorSetTorque : BSActor
+{
+    BSFMotor m_torqueMotor;
+
+    public BSActorSetTorque(BSScene physicsScene, BSPhysObject pObj, string actorName)
+        : base(physicsScene, pObj, actorName)
+    {
+        m_torqueMotor = null;
+        m_physicsScene.DetailLog("{0},BSActorSetTorque,constructor", m_controllingPrim.LocalID);
+    }
+
+    // BSActor.isActive
+    public override bool isActive
+    {
+        get { return Enabled && m_controllingPrim.IsPhysicallyActive; }
+    }
+
+    // Release any connections and resources used by the actor.
+    // BSActor.Dispose()
+    public override void Dispose()
+    {
+        Enabled = false;
+    }
+
+    // Called when physical parameters (properties set in Bullet) need to be re-applied.
+    // Called at taint-time.
+    // BSActor.Refresh()
+    public override void Refresh()
+    {
+        m_physicsScene.DetailLog("{0},BSActorSetTorque,refresh,torque={1}", m_controllingPrim.LocalID, m_controllingPrim.RawTorque);
+
+        // If not active any more, get rid of me (shouldn't ever happen, but just to be safe)
+        if (m_controllingPrim.RawTorque == OMV.Vector3.Zero)
+        {
+            m_physicsScene.DetailLog("{0},BSActorSetTorque,refresh,notSetTorque,disabling={1}", m_controllingPrim.LocalID, ActorName);
+            Enabled = false;
+            return;
+        }
+
+        // If the object is physically active, add the hoverer prestep action
+        if (isActive)
+        {
+            ActivateSetTorque();
+        }
+        else
+        {
+            DeactivateSetTorque();
+        }
+    }
+
+    // The object's physical representation is being rebuilt so pick up any physical dependencies (constraints, ...).
+    //     Register a prestep action to restore physical requirements before the next simulation step.
+    // Called at taint-time.
+    // BSActor.RemoveDependencies()
+    public override void RemoveDependencies()
+    {
+        // Nothing to do for the hoverer since it is all software at pre-step action time.
+    }
+
+    // If a hover motor has not been created, create one and start the hovering.
+    private void ActivateSetTorque()
+    {
+        if (m_torqueMotor == null)
+        {
+            // A fake motor that might be used someday
+            m_torqueMotor = new BSFMotor("setTorque", 1f, 1f, 1f);
+
+            m_physicsScene.BeforeStep += Mover;
+        }
+    }
+
+    private void DeactivateSetTorque()
+    {
+        if (m_torqueMotor != null)
+        {
+            m_physicsScene.BeforeStep -= Mover;
+            m_torqueMotor = null;
+        }
+    }
+
+    // Called just before the simulation step. Update the vertical position for hoverness.
+    private void Mover(float timeStep)
+    {
+        // Don't do force while the object is selected.
+        if (!isActive)
+            return;
+
+        m_physicsScene.DetailLog("{0},BSActorSetTorque,preStep,force={1}", m_controllingPrim.LocalID, m_controllingPrim.RawTorque);
+        if (m_controllingPrim.PhysBody.HasPhysicalBody)
+        {
+            m_controllingPrim.AddAngularForce(m_controllingPrim.RawTorque, false, true);
+            m_controllingPrim.ActivateIfPhysical(false);
+        }
+
+        // TODO:
+    }
+}
+}
+
+
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
new file mode 100755
index 0000000..e0ccc50
--- /dev/null
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSActors.cs
@@ -0,0 +1,156 @@
+/*
+ * 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 copyrightD
+ *       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;
+
+namespace OpenSim.Region.Physics.BulletSPlugin
+{
+public class BSActorCollection
+{
+    private BSScene m_physicsScene { get; set; }
+    private Dictionary<string, BSActor> m_actors;
+
+    public BSActorCollection(BSScene physicsScene)
+    {
+        m_physicsScene = physicsScene;
+        m_actors = new Dictionary<string, BSActor>();
+    }
+    public void Add(string name, BSActor actor)
+    {
+        lock (m_actors)
+        {
+            if (!m_actors.ContainsKey(name))
+            {
+                m_actors[name] = actor;
+            }
+        }
+    }
+    public bool RemoveAndRelease(string name)
+    {
+        bool ret = false;
+        lock (m_actors)
+        {
+            if (m_actors.ContainsKey(name))
+            {
+                BSActor beingRemoved = m_actors[name];
+                m_actors.Remove(name);
+                beingRemoved.Dispose();
+                ret = true;
+            }
+        }
+        return ret;
+    }
+    public void Clear()
+    {
+        lock (m_actors)
+        {
+            ForEachActor(a => a.Dispose());
+            m_actors.Clear();
+        }
+    }
+    public void Dispose()
+    {
+        Clear();
+    }
+    public bool HasActor(string name)
+    {
+        return m_actors.ContainsKey(name);
+    }
+    public bool TryGetActor(string actorName, out BSActor theActor)
+    {
+        return m_actors.TryGetValue(actorName, out theActor);
+    }
+    public void ForEachActor(Action<BSActor> act)
+    {
+        lock (m_actors)
+        {
+            foreach (KeyValuePair<string, BSActor> kvp in m_actors)
+                act(kvp.Value);
+        }
+    }
+
+    public void Enable(bool enabl)
+    {
+        ForEachActor(a => a.SetEnabled(enabl));
+    }
+    public void Refresh()
+    {
+        ForEachActor(a => a.Refresh());
+    }
+    public void RemoveDependencies()
+    {
+        ForEachActor(a => a.RemoveDependencies());
+    }
+}
+
+// =============================================================================
+/// <summary>
+/// Each physical object can have 'actors' who are pushing the object around.
+/// This can be used for hover, locking axis, making vehicles, etc.
+/// Each physical object can have multiple actors acting on it.
+///
+/// An actor usually registers itself with physics scene events (pre-step action)
+/// and modifies the parameters on the host physical object.
+/// </summary>
+public abstract class BSActor
+{
+    protected BSScene m_physicsScene { get; private set; }
+    protected BSPhysObject m_controllingPrim { get; private set; }
+    public virtual bool Enabled { get; set; }
+    public string ActorName { get; private set; }
+
+    public BSActor(BSScene physicsScene, BSPhysObject pObj, string actorName)
+    {
+        m_physicsScene = physicsScene;
+        m_controllingPrim = pObj;
+        ActorName = actorName;
+        Enabled = true;
+    }
+
+    // Return 'true' if activily updating the prim
+    public virtual bool isActive
+    {
+        get { return Enabled; }
+    }
+
+    // Turn the actor on an off. Only used by ActorCollection to set all enabled/disabled.
+    // Anyone else should assign true/false to 'Enabled'.
+    public void SetEnabled(bool setEnabled)
+    {
+        Enabled = setEnabled;
+    }
+    // Release any connections and resources used by the actor.
+    public abstract void Dispose();
+    // Called when physical parameters (properties set in Bullet) need to be re-applied.
+    public abstract void Refresh();
+    // The object's physical representation is being rebuilt so pick up any physical dependencies (constraints, ...).
+    //     Register a prestep action to restore physical requirements before the next simulation step.
+    public abstract void RemoveDependencies();
+
+}
+}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
index 5765b0d..6cdc112 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
@@ -70,6 +70,8 @@ public enum BSPhysicsShapeType
         SHAPE_COMPOUND  = 22,
         SHAPE_HEIGHTMAP = 23,
     SHAPE_AVATAR    = 24,
+    SHAPE_CONVEXHULL= 25,
+    SHAPE_GIMPACT   = 26,
 };
 
 // The native shapes have predefined shape hash keys
@@ -191,6 +193,21 @@ public struct ConfigurationParameters
     public const float numericFalse = 0f;
 }
 
+// Parameters passed for the conversion of a mesh to a hull using Bullet's HACD library.
+[StructLayout(LayoutKind.Sequential)]
+public struct HACDParams
+{
+                                            // usual default values
+        public float maxVerticesPerHull;                // 100
+        public float minClusters;                               // 2
+        public float compacityWeight;                   // 0.1
+        public float volumeWeight;                              // 0.0
+        public float concavity;                             // 100
+        public float addExtraDistPoints;                // false
+        public float addNeighboursDistPoints;   // false
+        public float addFacesPoints;                    // false
+        public float shouldAdjustCollisionMargin;       // false
+}
 
 // The states a bullet collision object can have
 public enum ActivationState : uint
@@ -282,7 +299,7 @@ public abstract class BSAPITemplate
 {
 // Returns the name of the underlying Bullet engine
 public abstract string BulletEngineName { get; }
-public abstract string BulletEngineVersion { get; protected set;} 
+public abstract string BulletEngineVersion { get; protected set;}
 
 // Initialization and simulation
 public abstract BulletWorld Initialize(Vector3 maxPosition, ConfigurationParameters parms,
@@ -305,10 +322,20 @@ public abstract BulletShape CreateMeshShape(BulletWorld world,
                 int indicesCount, int[] indices,
                 int verticesCount, float[] vertices );
 
+public abstract BulletShape CreateGImpactShape(BulletWorld world,
+                int indicesCount, int[] indices,
+                int verticesCount, float[] vertices );
+
 public abstract BulletShape CreateHullShape(BulletWorld world,
                 int hullCount, float[] hulls);
 
-public abstract BulletShape BuildHullShapeFromMesh(BulletWorld world, BulletShape meshShape);
+public abstract BulletShape BuildHullShapeFromMesh(BulletWorld world, BulletShape meshShape, HACDParams parms);
+
+public abstract BulletShape BuildConvexHullShapeFromMesh(BulletWorld world, BulletShape meshShape);
+
+public abstract BulletShape CreateConvexHullShape(BulletWorld world,
+                int indicesCount, int[] indices,
+                int verticesCount, float[] vertices );
 
 public abstract BulletShape BuildNativeShape(BulletWorld world, ShapeData shapeData);
 
@@ -351,7 +378,7 @@ public abstract void DestroyObject(BulletWorld sim, BulletBody obj);
 // =====================================================================================
 public abstract BulletShape CreateGroundPlaneShape(UInt32 id, float height, float collisionMargin);
 
-public abstract BulletShape CreateTerrainShape(UInt32 id, Vector3 size, float minHeight, float maxHeight, float[] heightMap, 
+public abstract BulletShape CreateTerrainShape(UInt32 id, Vector3 size, float minHeight, float maxHeight, float[] heightMap,
                                                                 float scaleFactor, float collisionMargin);
 
 // =====================================================================================
@@ -366,7 +393,7 @@ public abstract BulletConstraint Create6DofConstraintToPoint(BulletWorld world,
                     bool useLinearReferenceFrameA, bool disableCollisionsBetweenLinkedBodies);
 
 public abstract BulletConstraint Create6DofConstraintFixed(BulletWorld world, BulletBody obj1,
-                    Vector3 frameInBloc, Quaternion frameInBrot, 
+                    Vector3 frameInBloc, Quaternion frameInBrot,
                     bool useLinearReferenceFrameB, bool disableCollisionsBetweenLinkedBodies);
 
 public abstract BulletConstraint Create6DofSpringConstraint(BulletWorld world, BulletBody obj1, BulletBody obj2,
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index 90c2d9c..291dfcd 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -43,15 +43,10 @@ public sealed class BSCharacter : BSPhysObject
     private OMV.Vector3 _size;
     private bool _grabbed;
     private bool _selected;
-    private OMV.Vector3 _position;
     private float _mass;
     private float _avatarVolume;
-    private OMV.Vector3 _force;
-    private OMV.Vector3 _velocity;
-    private OMV.Vector3 _torque;
     private float _collisionScore;
     private OMV.Vector3 _acceleration;
-    private OMV.Quaternion _orientation;
     private int _physicsActorType;
     private bool _isPhysical;
     private bool _flying;
@@ -62,28 +57,25 @@ public sealed class BSCharacter : BSPhysObject
     private bool _kinematic;
     private float _buoyancy;
 
-    private BSVMotor _velocityMotor;
+    private BSActorAvatarMove m_moveActor;
+    private const string AvatarMoveActorName = "BSCharacter.AvatarMove";
 
     private OMV.Vector3 _PIDTarget;
     private bool _usePID;
     private float _PIDTau;
-    private bool _useHoverPID;
-    private float _PIDHoverHeight;
-    private PIDHoverType _PIDHoverType;
-    private float _PIDHoverTao;
 
     public BSCharacter(uint localID, String avName, BSScene parent_scene, OMV.Vector3 pos, OMV.Vector3 size, bool isFlying)
             : base(parent_scene, localID, avName, "BSCharacter")
     {
         _physicsActorType = (int)ActorTypes.Agent;
-        _position = pos;
+        RawPosition = pos;
 
         _flying = isFlying;
-        _orientation = OMV.Quaternion.Identity;
-        _velocity = OMV.Vector3.Zero;
+        RawOrientation = OMV.Quaternion.Identity;
+        RawVelocity = OMV.Vector3.Zero;
         _buoyancy = ComputeBuoyancyFromFlying(isFlying);
         Friction = BSParam.AvatarStandingFriction;
-        Density = BSParam.AvatarDensity / BSParam.DensityScaleFactor;
+        Density = BSParam.AvatarDensity;
 
         // Old versions of ScenePresence passed only the height. If width and/or depth are zero,
         //     replace with the default values.
@@ -97,19 +89,26 @@ public sealed class BSCharacter : BSPhysObject
         // set _avatarVolume and _mass based on capsule size, _density and Scale
         ComputeAvatarVolumeAndMass();
 
-        SetupMovementMotor();
-
-        DetailLog("{0},BSCharacter.create,call,size={1},scale={2},density={3},volume={4},mass={5}",
-                            LocalID, _size, Scale, Density, _avatarVolume, RawMass);
+        DetailLog("{0},BSCharacter.create,call,size={1},scale={2},density={3},volume={4},mass={5},pos={6}",
+                            LocalID, _size, Scale, Density, _avatarVolume, RawMass, pos);
 
         // do actual creation in taint time
-        PhysicsScene.TaintedObject("BSCharacter.create", delegate()
+        PhysScene.TaintedObject("BSCharacter.create", delegate()
         {
             DetailLog("{0},BSCharacter.create,taint", LocalID);
             // New body and shape into PhysBody and PhysShape
-            PhysicsScene.Shapes.GetBodyAndShape(true, PhysicsScene.World, this);
+            PhysScene.Shapes.GetBodyAndShape(true, PhysScene.World, this);
+
+            // The avatar's movement is controlled by this motor that speeds up and slows down
+            //    the avatar seeking to reach the motor's target speed.
+            // This motor runs as a prestep action for the avatar so it will keep the avatar
+            //    standing as well as moving. Destruction of the avatar will destroy the pre-step action.
+            m_moveActor = new BSActorAvatarMove(PhysScene, this, AvatarMoveActorName);
+            PhysicalActors.Add(AvatarMoveActorName, m_moveActor);
 
             SetPhysicalProperties();
+
+            IsInitialized = true;
         });
         return;
     }
@@ -117,217 +116,68 @@ public sealed class BSCharacter : BSPhysObject
     // called when this character is being destroyed and the resources should be released
     public override void Destroy()
     {
+        IsInitialized = false;
+
         base.Destroy();
 
         DetailLog("{0},BSCharacter.Destroy", LocalID);
-        PhysicsScene.TaintedObject("BSCharacter.destroy", delegate()
+        PhysScene.TaintedObject("BSCharacter.destroy", delegate()
         {
-            PhysicsScene.Shapes.DereferenceBody(PhysBody, null /* bodyCallback */);
+            PhysScene.Shapes.DereferenceBody(PhysBody, null /* bodyCallback */);
             PhysBody.Clear();
-            PhysicsScene.Shapes.DereferenceShape(PhysShape, null /* bodyCallback */);
-            PhysShape.Clear();
+            PhysShape.Dereference(PhysScene);
+            PhysShape = new BSShapeNull();
         });
     }
 
     private void SetPhysicalProperties()
     {
-        PhysicsScene.PE.RemoveObjectFromWorld(PhysicsScene.World, PhysBody);
+        PhysScene.PE.RemoveObjectFromWorld(PhysScene.World, PhysBody);
 
         ZeroMotion(true);
-        ForcePosition = _position;
+        ForcePosition = RawPosition;
 
         // Set the velocity
-        _velocityMotor.Reset();
-        _velocityMotor.SetTarget(_velocity);
-        _velocityMotor.SetCurrent(_velocity);
-        ForceVelocity = _velocity;
+        if (m_moveActor != null)
+            m_moveActor.SetVelocityAndTarget(RawVelocity, RawVelocity, false);
+
+        ForceVelocity = RawVelocity;
 
         // This will enable or disable the flying buoyancy of the avatar.
         // Needs to be reset especially when an avatar is recreated after crossing a region boundry.
         Flying = _flying;
 
-        PhysicsScene.PE.SetRestitution(PhysBody, BSParam.AvatarRestitution);
-        PhysicsScene.PE.SetMargin(PhysShape, PhysicsScene.Params.collisionMargin);
-        PhysicsScene.PE.SetLocalScaling(PhysShape, Scale);
-        PhysicsScene.PE.SetContactProcessingThreshold(PhysBody, BSParam.ContactProcessingThreshold);
+        PhysScene.PE.SetRestitution(PhysBody, BSParam.AvatarRestitution);
+        PhysScene.PE.SetMargin(PhysShape.physShapeInfo, PhysScene.Params.collisionMargin);
+        PhysScene.PE.SetLocalScaling(PhysShape.physShapeInfo, Scale);
+        PhysScene.PE.SetContactProcessingThreshold(PhysBody, BSParam.ContactProcessingThreshold);
         if (BSParam.CcdMotionThreshold > 0f)
         {
-            PhysicsScene.PE.SetCcdMotionThreshold(PhysBody, BSParam.CcdMotionThreshold);
-            PhysicsScene.PE.SetCcdSweptSphereRadius(PhysBody, BSParam.CcdSweptSphereRadius);
+            PhysScene.PE.SetCcdMotionThreshold(PhysBody, BSParam.CcdMotionThreshold);
+            PhysScene.PE.SetCcdSweptSphereRadius(PhysBody, BSParam.CcdSweptSphereRadius);
         }
 
         UpdatePhysicalMassProperties(RawMass, false);
 
         // Make so capsule does not fall over
-        PhysicsScene.PE.SetAngularFactorV(PhysBody, OMV.Vector3.Zero);
+        PhysScene.PE.SetAngularFactorV(PhysBody, OMV.Vector3.Zero);
+
+        // The avatar mover sets some parameters.
+        PhysicalActors.Refresh();
 
-        PhysicsScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.CF_CHARACTER_OBJECT);
+        PhysScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.CF_CHARACTER_OBJECT);
 
-        PhysicsScene.PE.AddObjectToWorld(PhysicsScene.World, PhysBody);
+        PhysScene.PE.AddObjectToWorld(PhysScene.World, PhysBody);
 
         // PhysicsScene.PE.ForceActivationState(PhysBody, ActivationState.ACTIVE_TAG);
-        PhysicsScene.PE.ForceActivationState(PhysBody, ActivationState.DISABLE_DEACTIVATION);
-        PhysicsScene.PE.UpdateSingleAabb(PhysicsScene.World, PhysBody);
+        PhysScene.PE.ForceActivationState(PhysBody, ActivationState.DISABLE_DEACTIVATION);
+        PhysScene.PE.UpdateSingleAabb(PhysScene.World, PhysBody);
 
         // Do this after the object has been added to the world
         PhysBody.collisionType = CollisionType.Avatar;
-        PhysBody.ApplyCollisionMask(PhysicsScene);
-    }
-
-    // The avatar's movement is controlled by this motor that speeds up and slows down
-    //    the avatar seeking to reach the motor's target speed.
-    // This motor runs as a prestep action for the avatar so it will keep the avatar
-    //    standing as well as moving. Destruction of the avatar will destroy the pre-step action.
-    private void SetupMovementMotor()
-    {
-        // Infinite decay and timescale values so motor only changes current to target values.
-        _velocityMotor = new BSVMotor("BSCharacter.Velocity", 
-                                            0.2f,                       // time scale
-                                            BSMotor.Infinite,           // decay time scale
-                                            BSMotor.InfiniteVector,     // friction timescale
-                                            1f                          // efficiency
-        );
-        // _velocityMotor.PhysicsScene = PhysicsScene; // DEBUG DEBUG so motor will output detail log messages.
-
-        RegisterPreStepAction("BSCharactor.Movement", LocalID, delegate(float timeStep)
-        {
-            // TODO: Decide if the step parameters should be changed depending on the avatar's
-            //     state (flying, colliding, ...). There is code in ODE to do this.
-
-            // COMMENTARY: when the user is making the avatar walk, except for falling, the velocity
-            //   specified for the avatar is the one that should be used. For falling, if the avatar
-            //   is not flying and is not colliding then it is presumed to be falling and the Z
-            //   component is not fooled with (thus allowing gravity to do its thing).
-            // When the avatar is standing, though, the user has specified a velocity of zero and
-            //   the avatar should be standing. But if the avatar is pushed by something in the world
-            //   (raising elevator platform, moving vehicle, ...) the avatar should be allowed to
-            //   move. Thus, the velocity cannot be forced to zero. The problem is that small velocity
-            //   errors can creap in and the avatar will slowly float off in some direction.
-            // So, the problem is that, when an avatar is standing, we cannot tell creaping error
-            //   from real pushing.
-            // The code below uses whether the collider is static or moving to decide whether to zero motion.
-
-            _velocityMotor.Step(timeStep);
-
-            // If we're not supposed to be moving, make sure things are zero.
-            if (_velocityMotor.ErrorIsZero() && _velocityMotor.TargetValue == OMV.Vector3.Zero)
-            {
-                // The avatar shouldn't be moving
-                _velocityMotor.Zero();
-
-                if (IsColliding)
-                {
-                    // If we are colliding with a stationary object, presume we're standing and don't move around
-                    if (!ColliderIsMoving)
-                    {
-                        DetailLog("{0},BSCharacter.MoveMotor,collidingWithStationary,zeroingMotion", LocalID);
-                        ZeroMotion(true /* inTaintTime */);
-                    }
-
-                    // Standing has more friction on the ground
-                    if (Friction != BSParam.AvatarStandingFriction)
-                    {
-                        Friction = BSParam.AvatarStandingFriction;
-                        PhysicsScene.PE.SetFriction(PhysBody, Friction);
-                    }
-                }
-                else
-                {
-                    if (Flying)
-                    {
-                        // Flying and not collising and velocity nearly zero.
-                        ZeroMotion(true /* inTaintTime */);
-                    }
-                }
-
-                DetailLog("{0},BSCharacter.MoveMotor,taint,stopping,target={1},colliding={2}", LocalID, _velocityMotor.TargetValue, IsColliding);
-            }
-            else
-            {
-                // Supposed to be moving.
-                OMV.Vector3 stepVelocity = _velocityMotor.CurrentValue;
-
-                if (Friction != BSParam.AvatarFriction)
-                {
-                    // Probably starting up walking. Set friction to moving friction.
-                    Friction = BSParam.AvatarFriction;
-                    PhysicsScene.PE.SetFriction(PhysBody, Friction);
-                }
-
-                // If falling, we keep the world's downward vector no matter what the other axis specify.
-                // The check for _velocity.Z < 0 makes jumping work (temporary upward force).
-                if (!Flying && !IsColliding)
-                {
-                    if (_velocity.Z < 0)
-                        stepVelocity.Z = _velocity.Z;
-                    // DetailLog("{0},BSCharacter.MoveMotor,taint,overrideStepZWithWorldZ,stepVel={1}", LocalID, stepVelocity);
-                }
-
-                // 'stepVelocity' is now the speed we'd like the avatar to move in. Turn that into an instantanous force.
-                OMV.Vector3 moveForce = (stepVelocity - _velocity) * Mass;
-
-                // Should we check for move force being small and forcing velocity to zero?
-
-                // Add special movement force to allow avatars to walk up stepped surfaces.
-                moveForce += WalkUpStairs();
-
-                DetailLog("{0},BSCharacter.MoveMotor,move,stepVel={1},vel={2},mass={3},moveForce={4}", LocalID, stepVelocity, _velocity, Mass, moveForce);
-                PhysicsScene.PE.ApplyCentralImpulse(PhysBody, moveForce);
-            }
-        });
+        PhysBody.ApplyCollisionMask(PhysScene);
     }
 
-    // Decide if the character is colliding with a low object and compute a force to pop the
-    //    avatar up so it can walk up and over the low objects.
-    private OMV.Vector3 WalkUpStairs()
-    {
-        OMV.Vector3 ret = OMV.Vector3.Zero;
-
-        // This test is done if moving forward, not flying and is colliding with something.
-        // DetailLog("{0},BSCharacter.WalkUpStairs,IsColliding={1},flying={2},targSpeed={3},collisions={4}",
-        //                 LocalID, IsColliding, Flying, TargetSpeed, CollisionsLastTick.Count);
-        if (IsColliding && !Flying && TargetVelocitySpeed > 0.1f /* && ForwardSpeed < 0.1f */)
-        {
-            // The range near the character's feet where we will consider stairs
-            float nearFeetHeightMin = RawPosition.Z - (Size.Z / 2f) + 0.05f;
-            float nearFeetHeightMax = nearFeetHeightMin + BSParam.AvatarStepHeight;
-
-            // Look for a collision point that is near the character's feet and is oriented the same as the charactor is
-            foreach (KeyValuePair<uint, ContactPoint> kvp in CollisionsLastTick.m_objCollisionList)
-            {
-                // Don't care about collisions with the terrain
-                if (kvp.Key > PhysicsScene.TerrainManager.HighestTerrainID)
-                {
-                    OMV.Vector3 touchPosition = kvp.Value.Position;
-                    // DetailLog("{0},BSCharacter.WalkUpStairs,min={1},max={2},touch={3}",
-                    //                 LocalID, nearFeetHeightMin, nearFeetHeightMax, touchPosition);
-                    if (touchPosition.Z >= nearFeetHeightMin && touchPosition.Z <= nearFeetHeightMax)
-                    {
-                        // This contact is within the 'near the feet' range.
-                        // The normal should be our contact point to the object so it is pointing away
-                        //    thus the difference between our facing orientation and the normal should be small.
-                        OMV.Vector3 directionFacing = OMV.Vector3.UnitX * RawOrientation;
-                        OMV.Vector3 touchNormal = OMV.Vector3.Normalize(kvp.Value.SurfaceNormal);
-                        float diff = Math.Abs(OMV.Vector3.Distance(directionFacing, touchNormal));
-                        if (diff < BSParam.AvatarStepApproachFactor)
-                        {
-                            // Found the stairs contact point. Push up a little to raise the character.
-                            float upForce = (touchPosition.Z - nearFeetHeightMin) * Mass * BSParam.AvatarStepForceFactor;
-                            ret = new OMV.Vector3(0f, 0f, upForce);
-
-                            // Also move the avatar up for the new height
-                            OMV.Vector3 displacement = new OMV.Vector3(0f, 0f, BSParam.AvatarStepHeight / 2f);
-                            ForcePosition = RawPosition + displacement;
-                        }
-                        DetailLog("{0},BSCharacter.WalkUpStairs,touchPos={1},nearFeetMin={2},faceDir={3},norm={4},diff={5},ret={6}",
-                                LocalID, touchPosition, nearFeetHeightMin, directionFacing, touchNormal, diff, ret);
-                    }
-                }
-            }
-        }
-
-        return ret;
-    }
 
     public override void RequestPhysicsterseUpdate()
     {
@@ -344,6 +194,10 @@ public sealed class BSCharacter : BSPhysObject
         }
 
         set {
+            // This is how much the avatar size is changing. Positive means getting bigger.
+            // The avatar altitude must be adjusted for this change.
+            float heightChange = value.Z - _size.Z;
+
             _size = value;
             // Old versions of ScenePresence passed only the height. If width and/or depth are zero,
             //     replace with the default values.
@@ -355,14 +209,18 @@ public sealed class BSCharacter : BSPhysObject
             DetailLog("{0},BSCharacter.setSize,call,size={1},scale={2},density={3},volume={4},mass={5}",
                             LocalID, _size, Scale, Density, _avatarVolume, RawMass);
 
-            PhysicsScene.TaintedObject("BSCharacter.setSize", delegate()
+            PhysScene.TaintedObject("BSCharacter.setSize", delegate()
             {
-                if (PhysBody.HasPhysicalBody && PhysShape.HasPhysicalShape)
+                if (PhysBody.HasPhysicalBody && PhysShape.physShapeInfo.HasPhysicalShape)
                 {
-                    PhysicsScene.PE.SetLocalScaling(PhysShape, Scale);
+                    PhysScene.PE.SetLocalScaling(PhysShape.physShapeInfo, Scale);
                     UpdatePhysicalMassProperties(RawMass, true);
+
+                    // Adjust the avatar's position to account for the increase/decrease in size
+                    ForcePosition = new OMV.Vector3(RawPosition.X, RawPosition.Y, RawPosition.Z + heightChange / 2f);
+
                     // Make sure this change appears as a property update event
-                    PhysicsScene.PE.PushUpdate(PhysBody);
+                    PhysScene.PE.PushUpdate(PhysBody);
                 }
             });
 
@@ -373,11 +231,6 @@ public sealed class BSCharacter : BSPhysObject
     {
         set { BaseShape = value; }
     }
-    // I want the physics engine to make an avatar capsule
-    public override BSPhysicsShapeType PreferredPhysicalShape
-    {
-        get {return BSPhysicsShapeType.SHAPE_CAPSULE; }
-    }
 
     public override bool Grabbed {
         set { _grabbed = value; }
@@ -399,29 +252,29 @@ public sealed class BSCharacter : BSPhysObject
     // Called at taint time!
     public override void ZeroMotion(bool inTaintTime)
     {
-        _velocity = OMV.Vector3.Zero;
+        RawVelocity = OMV.Vector3.Zero;
         _acceleration = OMV.Vector3.Zero;
         _rotationalVelocity = OMV.Vector3.Zero;
 
         // Zero some other properties directly into the physics engine
-        PhysicsScene.TaintedObject(inTaintTime, "BSCharacter.ZeroMotion", delegate()
+        PhysScene.TaintedObject(inTaintTime, "BSCharacter.ZeroMotion", delegate()
         {
             if (PhysBody.HasPhysicalBody)
-                PhysicsScene.PE.ClearAllForces(PhysBody);
+                PhysScene.PE.ClearAllForces(PhysBody);
         });
     }
     public override void ZeroAngularMotion(bool inTaintTime)
     {
         _rotationalVelocity = OMV.Vector3.Zero;
 
-        PhysicsScene.TaintedObject(inTaintTime, "BSCharacter.ZeroMotion", delegate()
+        PhysScene.TaintedObject(inTaintTime, "BSCharacter.ZeroMotion", delegate()
         {
             if (PhysBody.HasPhysicalBody)
             {
-                PhysicsScene.PE.SetInterpolationAngularVelocity(PhysBody, OMV.Vector3.Zero);
-                PhysicsScene.PE.SetAngularVelocity(PhysBody, OMV.Vector3.Zero);
+                PhysScene.PE.SetInterpolationAngularVelocity(PhysBody, OMV.Vector3.Zero);
+                PhysScene.PE.SetAngularVelocity(PhysBody, OMV.Vector3.Zero);
                 // The next also get rid of applied linear force but the linear velocity is untouched.
-                PhysicsScene.PE.ClearForces(PhysBody);
+                PhysScene.PE.ClearForces(PhysBody);
             }
         });
     }
@@ -429,38 +282,33 @@ public sealed class BSCharacter : BSPhysObject
 
     public override void LockAngularMotion(OMV.Vector3 axis) { return; }
 
-    public override OMV.Vector3 RawPosition
-    {
-        get { return _position; }
-        set { _position = value; }
-    }
     public override OMV.Vector3 Position {
         get {
             // Don't refetch the position because this function is called a zillion times
-            // _position = PhysicsScene.PE.GetObjectPosition(Scene.World, LocalID);
-            return _position;
+            // RawPosition = PhysicsScene.PE.GetObjectPosition(Scene.World, LocalID);
+            return RawPosition;
         }
         set {
-            _position = value;
+            RawPosition = value;
 
-            PhysicsScene.TaintedObject("BSCharacter.setPosition", delegate()
+            PhysScene.TaintedObject("BSCharacter.setPosition", delegate()
             {
-                DetailLog("{0},BSCharacter.SetPosition,taint,pos={1},orient={2}", LocalID, _position, _orientation);
+                DetailLog("{0},BSCharacter.SetPosition,taint,pos={1},orient={2}", LocalID, RawPosition, RawOrientation);
                 PositionSanityCheck();
-                ForcePosition = _position;
+                ForcePosition = RawPosition;
             });
         }
     }
     public override OMV.Vector3 ForcePosition {
         get {
-            _position = PhysicsScene.PE.GetPosition(PhysBody);
-            return _position;
+            RawPosition = PhysScene.PE.GetPosition(PhysBody);
+            return RawPosition;
         }
         set {
-            _position = value;
+            RawPosition = value;
             if (PhysBody.HasPhysicalBody)
             {
-                PhysicsScene.PE.SetTranslation(PhysBody, _position, _orientation);
+                PhysScene.PE.SetTranslation(PhysBody, RawPosition, RawOrientation);
             }
         }
     }
@@ -474,30 +322,30 @@ public sealed class BSCharacter : BSPhysObject
         bool ret = false;
 
         // TODO: check for out of bounds
-        if (!PhysicsScene.TerrainManager.IsWithinKnownTerrain(RawPosition))
+        if (!PhysScene.TerrainManager.IsWithinKnownTerrain(RawPosition))
         {
             // The character is out of the known/simulated area.
             // Force the avatar position to be within known. ScenePresence will use the position
             //    plus the velocity to decide if the avatar is moving out of the region.
-            RawPosition = PhysicsScene.TerrainManager.ClampPositionIntoKnownTerrain(RawPosition);
+            RawPosition = PhysScene.TerrainManager.ClampPositionIntoKnownTerrain(RawPosition);
             DetailLog("{0},BSCharacter.PositionSanityCheck,notWithinKnownTerrain,clampedPos={1}", LocalID, RawPosition);
             return true;
         }
 
         // If below the ground, move the avatar up
-        float terrainHeight = PhysicsScene.TerrainManager.GetTerrainHeightAtXYZ(RawPosition);
+        float terrainHeight = PhysScene.TerrainManager.GetTerrainHeightAtXYZ(RawPosition);
         if (Position.Z < terrainHeight)
         {
-            DetailLog("{0},BSCharacter.PositionSanityCheck,adjustForUnderGround,pos={1},terrain={2}", LocalID, _position, terrainHeight);
-            _position.Z = terrainHeight + BSParam.AvatarBelowGroundUpCorrectionMeters;
+            DetailLog("{0},BSCharacter.PositionSanityCheck,adjustForUnderGround,pos={1},terrain={2}", LocalID, RawPosition, terrainHeight);
+            RawPosition = new OMV.Vector3(RawPosition.X, RawPosition.Y, terrainHeight + BSParam.AvatarBelowGroundUpCorrectionMeters);
             ret = true;
         }
         if ((CurrentCollisionFlags & CollisionFlags.BS_FLOATS_ON_WATER) != 0)
         {
-            float waterHeight = PhysicsScene.TerrainManager.GetWaterLevelAtXYZ(_position);
+            float waterHeight = PhysScene.TerrainManager.GetWaterLevelAtXYZ(RawPosition);
             if (Position.Z < waterHeight)
             {
-                _position.Z = waterHeight;
+                RawPosition = new OMV.Vector3(RawPosition.X, RawPosition.Y, waterHeight);
                 ret = true;
             }
         }
@@ -515,10 +363,10 @@ public sealed class BSCharacter : BSPhysObject
         {
             // The new position value must be pushed into the physics engine but we can't
             //    just assign to "Position" because of potential call loops.
-            PhysicsScene.TaintedObject(inTaintTime, "BSCharacter.PositionSanityCheck", delegate()
+            PhysScene.TaintedObject(inTaintTime, "BSCharacter.PositionSanityCheck", delegate()
             {
-                DetailLog("{0},BSCharacter.PositionSanityCheck,taint,pos={1},orient={2}", LocalID, _position, _orientation);
-                ForcePosition = _position;
+                DetailLog("{0},BSCharacter.PositionSanityCheck,taint,pos={1},orient={2}", LocalID, RawPosition, RawOrientation);
+                ForcePosition = RawPosition;
             });
             ret = true;
         }
@@ -528,25 +376,25 @@ public sealed class BSCharacter : BSPhysObject
     public override float Mass { get { return _mass; } }
 
     // used when we only want this prim's mass and not the linkset thing
-    public override float RawMass { 
+    public override float RawMass {
         get {return _mass; }
     }
     public override void UpdatePhysicalMassProperties(float physMass, bool inWorld)
     {
-        OMV.Vector3 localInertia = PhysicsScene.PE.CalculateLocalInertia(PhysShape, physMass);
-        PhysicsScene.PE.SetMassProps(PhysBody, physMass, localInertia);
+        OMV.Vector3 localInertia = PhysScene.PE.CalculateLocalInertia(PhysShape.physShapeInfo, physMass);
+        PhysScene.PE.SetMassProps(PhysBody, physMass, localInertia);
     }
 
     public override OMV.Vector3 Force {
-        get { return _force; }
+        get { return RawForce; }
         set {
-            _force = value;
+            RawForce = value;
             // m_log.DebugFormat("{0}: Force = {1}", LogHeader, _force);
-            PhysicsScene.TaintedObject("BSCharacter.SetForce", delegate()
+            PhysScene.TaintedObject("BSCharacter.SetForce", delegate()
             {
-                DetailLog("{0},BSCharacter.setForce,taint,force={1}", LocalID, _force);
+                DetailLog("{0},BSCharacter.setForce,taint,force={1}", LocalID, RawForce);
                 if (PhysBody.HasPhysicalBody)
-                    PhysicsScene.PE.SetObjectForce(PhysBody, _force);
+                    PhysScene.PE.SetObjectForce(PhysBody, RawForce);
             });
         }
     }
@@ -560,6 +408,7 @@ public sealed class BSCharacter : BSPhysObject
 
     // Allows the detection of collisions with inherently non-physical prims. see llVolumeDetect for more
     public override void SetVolumeDetect(int param) { return; }
+    public override bool IsVolumeDetect { get { return false; } }
 
     public override OMV.Vector3 GeometricCenter { get { return OMV.Vector3.Zero; } }
     public override OMV.Vector3 CenterOfMass { get { return OMV.Vector3.Zero; } }
@@ -569,61 +418,49 @@ public sealed class BSCharacter : BSPhysObject
     {
         get
         {
-            return m_targetVelocity;
+            return base.m_targetVelocity;
         }
         set
         {
             DetailLog("{0},BSCharacter.setTargetVelocity,call,vel={1}", LocalID, value);
             m_targetVelocity = value;
             OMV.Vector3 targetVel = value;
-            if (_setAlwaysRun)
+            if (_setAlwaysRun && !_flying)
                 targetVel *= new OMV.Vector3(BSParam.AvatarAlwaysRunFactor, BSParam.AvatarAlwaysRunFactor, 0f);
 
-            PhysicsScene.TaintedObject("BSCharacter.setTargetVelocity", delegate()
-            {
-                _velocityMotor.Reset();
-                _velocityMotor.SetTarget(targetVel);
-                _velocityMotor.SetCurrent(_velocity);
-                _velocityMotor.Enabled = true;
-            });
+            if (m_moveActor != null)
+                m_moveActor.SetVelocityAndTarget(RawVelocity, targetVel, false /* inTaintTime */);
         }
     }
-    public override OMV.Vector3 RawVelocity
-    {
-        get { return _velocity; }
-        set { _velocity = value; }
-    }
     // Directly setting velocity means this is what the user really wants now.
     public override OMV.Vector3 Velocity {
-        get { return _velocity; }
+        get { return RawVelocity; }
         set {
-            _velocity = value;
-            // m_log.DebugFormat("{0}: set velocity = {1}", LogHeader, _velocity);
-            PhysicsScene.TaintedObject("BSCharacter.setVelocity", delegate()
+            RawVelocity = value;
+            // m_log.DebugFormat("{0}: set velocity = {1}", LogHeader, RawVelocity);
+            PhysScene.TaintedObject("BSCharacter.setVelocity", delegate()
             {
-                _velocityMotor.Reset();
-                _velocityMotor.SetCurrent(_velocity);
-                _velocityMotor.SetTarget(_velocity);
-                _velocityMotor.Enabled = false;
+                if (m_moveActor != null)
+                    m_moveActor.SetVelocityAndTarget(RawVelocity, RawVelocity, true /* inTaintTime */);
 
-                DetailLog("{0},BSCharacter.setVelocity,taint,vel={1}", LocalID, _velocity);
-                ForceVelocity = _velocity;
+                DetailLog("{0},BSCharacter.setVelocity,taint,vel={1}", LocalID, RawVelocity);
+                ForceVelocity = RawVelocity;
             });
         }
     }
     public override OMV.Vector3 ForceVelocity {
-        get { return _velocity; }
+        get { return RawVelocity; }
         set {
-            PhysicsScene.AssertInTaintTime("BSCharacter.ForceVelocity");
+            PhysScene.AssertInTaintTime("BSCharacter.ForceVelocity");
 
-            _velocity = value;
-            PhysicsScene.PE.SetLinearVelocity(PhysBody, _velocity);
-            PhysicsScene.PE.Activate(PhysBody, true);
+            RawVelocity = value;
+            PhysScene.PE.SetLinearVelocity(PhysBody, RawVelocity);
+            PhysScene.PE.Activate(PhysBody, true);
         }
     }
     public override OMV.Vector3 Torque {
-        get { return _torque; }
-        set { _torque = value;
+        get { return RawTorque; }
+        set { RawTorque = value;
         }
     }
     public override float CollisionScore {
@@ -635,22 +472,27 @@ public sealed class BSCharacter : BSPhysObject
         get { return _acceleration; }
         set { _acceleration = value; }
     }
-    public override OMV.Quaternion RawOrientation
-    {
-        get { return _orientation; }
-        set { _orientation = value; }
-    }
     public override OMV.Quaternion Orientation {
-        get { return _orientation; }
+        get { return RawOrientation; }
         set {
             // Orientation is set zillions of times when an avatar is walking. It's like
             //      the viewer doesn't trust us.
-            if (_orientation != value)
+            if (RawOrientation != value)
             {
-                _orientation = value;
-                PhysicsScene.TaintedObject("BSCharacter.setOrientation", delegate()
+                RawOrientation = value;
+                PhysScene.TaintedObject("BSCharacter.setOrientation", delegate()
                 {
-                    ForceOrientation = _orientation;
+                    // Bullet assumes we know what we are doing when forcing orientation
+                    //    so it lets us go against all the rules and just compensates for them later.
+                    // This forces rotation to be only around the Z axis and doesn't change any of the other axis.
+                    // This keeps us from flipping the capsule over which the veiwer does not understand.
+                    float oRoll, oPitch, oYaw;
+                    RawOrientation.GetEulerAngles(out oRoll, out oPitch, out oYaw);
+                    OMV.Quaternion trimmedOrientation = OMV.Quaternion.CreateFromEulers(0f, 0f, oYaw);
+                    // DetailLog("{0},BSCharacter.setOrientation,taint,val={1},valDir={2},conv={3},convDir={4}",
+                    //                 LocalID, RawOrientation, OMV.Vector3.UnitX * RawOrientation,
+                    //                 trimmedOrientation, OMV.Vector3.UnitX * trimmedOrientation);
+                    ForceOrientation = trimmedOrientation;
                 });
             }
         }
@@ -660,16 +502,16 @@ public sealed class BSCharacter : BSPhysObject
     {
         get
         {
-            _orientation = PhysicsScene.PE.GetOrientation(PhysBody);
-            return _orientation;
+            RawOrientation = PhysScene.PE.GetOrientation(PhysBody);
+            return RawOrientation;
         }
         set
         {
-            _orientation = value;
+            RawOrientation = value;
             if (PhysBody.HasPhysicalBody)
             {
-                // _position = PhysicsScene.PE.GetPosition(BSBody);
-                PhysicsScene.PE.SetTranslation(PhysBody, _position, _orientation);
+                // RawPosition = PhysicsScene.PE.GetPosition(BSBody);
+                PhysScene.PE.SetTranslation(PhysBody, RawPosition, RawOrientation);
             }
         }
     }
@@ -718,14 +560,14 @@ public sealed class BSCharacter : BSPhysObject
     public override bool FloatOnWater {
         set {
             _floatOnWater = value;
-            PhysicsScene.TaintedObject("BSCharacter.setFloatOnWater", delegate()
+            PhysScene.TaintedObject("BSCharacter.setFloatOnWater", delegate()
             {
                 if (PhysBody.HasPhysicalBody)
                 {
                     if (_floatOnWater)
-                        CurrentCollisionFlags = PhysicsScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.BS_FLOATS_ON_WATER);
+                        CurrentCollisionFlags = PhysScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.BS_FLOATS_ON_WATER);
                     else
-                        CurrentCollisionFlags = PhysicsScene.PE.RemoveFromCollisionFlags(PhysBody, CollisionFlags.BS_FLOATS_ON_WATER);
+                        CurrentCollisionFlags = PhysScene.PE.RemoveFromCollisionFlags(PhysBody, CollisionFlags.BS_FLOATS_ON_WATER);
                 }
             });
         }
@@ -746,7 +588,7 @@ public sealed class BSCharacter : BSPhysObject
     public override float Buoyancy {
         get { return _buoyancy; }
         set { _buoyancy = value;
-            PhysicsScene.TaintedObject("BSCharacter.setBuoyancy", delegate()
+            PhysScene.TaintedObject("BSCharacter.setBuoyancy", delegate()
             {
                 DetailLog("{0},BSCharacter.setBuoyancy,taint,buoy={1}", LocalID, _buoyancy);
                 ForceBuoyancy = _buoyancy;
@@ -755,8 +597,8 @@ public sealed class BSCharacter : BSPhysObject
     }
     public override float ForceBuoyancy {
         get { return _buoyancy; }
-        set { 
-            PhysicsScene.AssertInTaintTime("BSCharacter.ForceBuoyancy");
+        set {
+            PhysScene.AssertInTaintTime("BSCharacter.ForceBuoyancy");
 
             _buoyancy = value;
             DetailLog("{0},BSCharacter.setForceBuoyancy,taint,buoy={1}", LocalID, _buoyancy);
@@ -764,7 +606,7 @@ public sealed class BSCharacter : BSPhysObject
             float  grav = BSParam.Gravity * (1f - _buoyancy);
             Gravity = new OMV.Vector3(0f, 0f, grav);
             if (PhysBody.HasPhysicalBody)
-                PhysicsScene.PE.SetGravity(PhysBody, Gravity);
+                PhysScene.PE.SetGravity(PhysBody, Gravity);
         }
     }
 
@@ -779,46 +621,25 @@ public sealed class BSCharacter : BSPhysObject
         set { _PIDTau = value; }
     }
 
-    // Used for llSetHoverHeight and maybe vehicle height
-    // Hover Height will override MoveTo target's Z
-    public override bool PIDHoverActive {
-        set { _useHoverPID = value; }
-    }
-    public override float PIDHoverHeight {
-        set { _PIDHoverHeight = value; }
-    }
-    public override PIDHoverType PIDHoverType {
-        set { _PIDHoverType = value; }
-    }
-    public override float PIDHoverTau {
-        set { _PIDHoverTao = value; }
-    }
-
-    // For RotLookAt
-    public override OMV.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 AddForce(OMV.Vector3 force, bool pushforce)
     {
         // Since this force is being applied in only one step, make this a force per second.
-        OMV.Vector3 addForce = force / PhysicsScene.LastTimeStep;
+        OMV.Vector3 addForce = force / PhysScene.LastTimeStep;
         AddForce(addForce, pushforce, false);
     }
-    private void AddForce(OMV.Vector3 force, bool pushforce, bool inTaintTime) {
+    public override void AddForce(OMV.Vector3 force, bool pushforce, bool inTaintTime) {
         if (force.IsFinite())
         {
             OMV.Vector3 addForce = Util.ClampV(force, BSParam.MaxAddForceMagnitude);
             // DetailLog("{0},BSCharacter.addForce,call,force={1}", LocalID, addForce);
 
-            PhysicsScene.TaintedObject(inTaintTime, "BSCharacter.AddForce", delegate()
+            PhysScene.TaintedObject(inTaintTime, "BSCharacter.AddForce", delegate()
             {
                 // Bullet adds this central force to the total force for this tick
                 // DetailLog("{0},BSCharacter.addForce,taint,force={1}", LocalID, addForce);
                 if (PhysBody.HasPhysicalBody)
                 {
-                    PhysicsScene.PE.ApplyCentralForce(PhysBody, addForce);
+                    PhysScene.PE.ApplyCentralForce(PhysBody, addForce);
                 }
             });
         }
@@ -829,7 +650,7 @@ public sealed class BSCharacter : BSPhysObject
         }
     }
 
-    public override void AddAngularForce(OMV.Vector3 force, bool pushforce) {
+    public override void AddAngularForce(OMV.Vector3 force, bool pushforce, bool inTaintTime) {
     }
     public override void SetMomentum(OMV.Vector3 momentum) {
     }
@@ -837,14 +658,14 @@ public sealed class BSCharacter : BSPhysObject
     private OMV.Vector3 ComputeAvatarScale(OMV.Vector3 size)
     {
         OMV.Vector3 newScale;
-        
+
         // Bullet's capsule total height is the "passed height + radius * 2";
-        // The base capsule is 1 diameter and 2 height (passed radius=0.5, passed height = 1)
+        // The base capsule is 1 unit in diameter and 2 units in height (passed radius=0.5, passed height = 1)
         // The number we pass in for 'scaling' is the multiplier to get that base
         //     shape to be the size desired.
         // So, when creating the scale for the avatar height, we take the passed height
         //     (size.Z) and remove the caps.
-        // Another oddity of the Bullet capsule implementation is that it presumes the Y
+        // An oddity of the Bullet capsule implementation is that it presumes the Y
         //     dimension is the radius of the capsule. Even though some of the code allows
         //     for a asymmetrical capsule, other parts of the code presume it is cylindrical.
 
@@ -852,8 +673,27 @@ public sealed class BSCharacter : BSPhysObject
         newScale.X = size.X / 2f;
         newScale.Y = size.Y / 2f;
 
+        float heightAdjust = BSParam.AvatarHeightMidFudge;
+        if (BSParam.AvatarHeightLowFudge != 0f || BSParam.AvatarHeightHighFudge != 0f)
+        {
+            // An avatar is between 1.61 and 2.12 meters. Midpoint is 1.87m.
+            // The "times 4" relies on the fact that the difference from the midpoint to the extremes is exactly 0.25
+            float midHeightOffset = size.Z - 1.87f;
+            if (midHeightOffset < 0f)
+            {
+                // Small avatar. Add the adjustment based on the distance from midheight
+                heightAdjust += -1f * midHeightOffset * 4f * BSParam.AvatarHeightLowFudge;
+            }
+            else
+            {
+                // Large avatar. Add the adjustment based on the distance from midheight
+                heightAdjust += midHeightOffset * 4f * BSParam.AvatarHeightHighFudge;
+            }
+        }
         // The total scale height is the central cylindar plus the caps on the two ends.
-        newScale.Z = (size.Z + (Math.Min(size.X, size.Y) * 2)) / 2f;
+        newScale.Z = (size.Z + (Math.Min(size.X, size.Y) * 2) + heightAdjust) / 2f;
+        // m_log.DebugFormat("{0} ComputeAvatarScale: size={1},adj={2},scale={3}", LogHeader, size, heightAdjust, newScale);
+
         // If smaller than the endcaps, just fake like we're almost that small
         if (newScale.Z < 0)
             newScale.Z = 0.1f;
@@ -882,15 +722,18 @@ public sealed class BSCharacter : BSPhysObject
     // the world that things have changed.
     public override void UpdateProperties(EntityProperties entprop)
     {
-        _position = entprop.Position;
-        _orientation = entprop.Rotation;
+        // Let anyone (like the actors) modify the updated properties before they are pushed into the object and the simulator.
+        TriggerPreUpdatePropertyAction(ref entprop);
+
+        RawPosition = entprop.Position;
+        RawOrientation = entprop.Rotation;
 
         // Smooth velocity. OpenSimulator is VERY sensitive to changes in velocity of the avatar
         //    and will send agent updates to the clients if velocity changes by more than
         //    0.001m/s. Bullet introduces a lot of jitter in the velocity which causes many
         //    extra updates.
-        if (!entprop.Velocity.ApproxEquals(_velocity, 0.1f))
-            _velocity = entprop.Velocity;
+        if (!entprop.Velocity.ApproxEquals(RawVelocity, 0.1f))
+            RawVelocity = entprop.Velocity;
 
         _acceleration = entprop.Acceleration;
         _rotationalVelocity = entprop.RotationalVelocity;
@@ -898,8 +741,8 @@ public sealed class BSCharacter : BSPhysObject
         // Do some sanity checking for the avatar. Make sure it's above ground and inbounds.
         if (PositionSanityCheck(true))
         {
-            DetailLog("{0},BSCharacter.UpdateProperties,updatePosForSanity,pos={1}", LocalID, _position);
-            entprop.Position = _position;
+            DetailLog("{0},BSCharacter.UpdateProperties,updatePosForSanity,pos={1}", LocalID, RawPosition);
+            entprop.Position = RawPosition;
         }
 
         // remember the current and last set values
@@ -910,10 +753,10 @@ public sealed class BSCharacter : BSPhysObject
         // Linkset.UpdateProperties(UpdatedProperties.EntPropUpdates, this);
 
         // Avatars don't report their changes the usual way. Changes are checked for in the heartbeat loop.
-        // base.RequestPhysicsterseUpdate();
+        // PhysScene.PostUpdate(this);
 
         DetailLog("{0},BSCharacter.UpdateProperties,call,pos={1},orient={2},vel={3},accel={4},rotVel={5}",
-                LocalID, _position, _orientation, _velocity, _acceleration, _rotationalVelocity);
+                LocalID, RawPosition, RawOrientation, RawVelocity, _acceleration, _rotationalVelocity);
     }
 }
 }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs
index b813974..42b5c49 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs
@@ -85,7 +85,9 @@ public abstract class BSConstraint : IDisposable
     {
         bool ret = false;
         if (m_enabled)
+        {
             ret = PhysicsScene.PE.SetAngularLimits(m_constraint, low, high);
+        }
         return ret;
     }
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint6Dof.cs b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint6Dof.cs
index 476a0e5..d0949f5 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint6Dof.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint6Dof.cs
@@ -97,14 +97,14 @@ public sealed class BSConstraint6Dof : BSConstraint
 
     // A 6 Dof constraint that is fixed in the world and constrained to a on-the-fly created static object
     public BSConstraint6Dof(BulletWorld world, BulletBody obj1, Vector3 frameInBloc, Quaternion frameInBrot,
-                    bool useLinearReferenceFrameA, bool disableCollisionsBetweenLinkedBodies)
+                    bool useLinearReferenceFrameB, bool disableCollisionsBetweenLinkedBodies)
         : base(world)
     {
         m_body1 = obj1;
         m_body2 = obj1; // Look out for confusion down the road
         m_constraint = PhysicsScene.PE.Create6DofConstraintFixed(m_world, m_body1,
                                 frameInBloc, frameInBrot,
-                                useLinearReferenceFrameA, disableCollisionsBetweenLinkedBodies);
+                                useLinearReferenceFrameB, disableCollisionsBetweenLinkedBodies);
         m_enabled = true;
         world.physicsScene.DetailLog("{0},BS6DofConstraint,createFixed,wID={1},rID={2},rBody={3}",
                             BSScene.DetailLogZero, world.worldID, obj1.ID, obj1.AddrString);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraintHinge.cs b/OpenSim/Region/Physics/BulletSPlugin/BSConstraintHinge.cs
index 7714a03..ed89f63 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSConstraintHinge.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSConstraintHinge.cs
@@ -45,7 +45,7 @@ public sealed class BSConstraintHinge : BSConstraint
         m_body1 = obj1;
         m_body2 = obj2;
         m_constraint = PhysicsScene.PE.CreateHingeConstraint(world, obj1, obj2,
-                                pivotInA, pivotInB, axisInA, axisInB, 
+                                pivotInA, pivotInB, axisInA, axisInB,
                                 useLinearReferenceFrameA, disableCollisionsBetweenLinkedBodies);
         m_enabled = true;
     }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
index 65df741..f0d17d3 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
@@ -40,13 +40,14 @@ using OpenSim.Region.Physics.Manager;
 
 namespace OpenSim.Region.Physics.BulletSPlugin
 {
-    public sealed class BSDynamics
+    public sealed class BSDynamics : BSActor
     {
         private static string LogHeader = "[BULLETSIM VEHICLE]";
 
-        private BSScene PhysicsScene { get; set; }
         // the prim this dynamic controller belongs to
-        private BSPrim Prim { get; set; }
+        private BSPrimLinkable ControllingPrim { get; set; }
+
+        private bool m_haveRegisteredForSceneEvents;
 
         // mass of the vehicle fetched each time we're calles
         private float m_vehicleMass;
@@ -124,38 +125,24 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         static readonly float PIOverFour = ((float)Math.PI) / 4f;
         static readonly float PIOverTwo = ((float)Math.PI) / 2f;
 
-        // For debugging, flags to turn on and off individual corrections.
-        public bool enableAngularVerticalAttraction;
-        public bool enableAngularDeflection;
-        public bool enableAngularBanking;
-
-        public BSDynamics(BSScene myScene, BSPrim myPrim)
+        public BSDynamics(BSScene myScene, BSPrim myPrim, string actorName)
+            : base(myScene, myPrim, actorName)
         {
-            PhysicsScene = myScene;
-            Prim = myPrim;
             Type = Vehicle.TYPE_NONE;
-            SetupVehicleDebugging();
-        }
+            m_haveRegisteredForSceneEvents = false;
 
-        // Stopgap debugging enablement. Allows source level debugging but still checking
-        //    in changes by making enablement of debugging flags from INI file.
-        public void SetupVehicleDebugging()
-        {
-            enableAngularVerticalAttraction = true;
-            enableAngularDeflection = false;
-            enableAngularBanking = true;
-            if (BSParam.VehicleDebuggingEnabled)
+            ControllingPrim = myPrim as BSPrimLinkable;
+            if (ControllingPrim == null)
             {
-                enableAngularVerticalAttraction = true;
-                enableAngularDeflection = false;
-                enableAngularBanking = false;
+                // THIS CANNOT HAPPEN!!
             }
+            VDetailLog("{0},Creation", ControllingPrim.LocalID);
         }
 
         // Return 'true' if this vehicle is doing vehicle things
         public bool IsActive
         {
-            get { return (Type != Vehicle.TYPE_NONE && Prim.IsPhysicallyActive); }
+            get { return (Type != Vehicle.TYPE_NONE && ControllingPrim.IsPhysicallyActive); }
         }
 
         // Return 'true' if this a vehicle that should be sitting on the ground
@@ -167,11 +154,11 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         #region Vehicle parameter setting
         public void ProcessFloatVehicleParam(Vehicle pParam, float pValue)
         {
-            VDetailLog("{0},ProcessFloatVehicleParam,param={1},val={2}", Prim.LocalID, pParam, pValue);
+            VDetailLog("{0},ProcessFloatVehicleParam,param={1},val={2}", ControllingPrim.LocalID, pParam, pValue);
             switch (pParam)
             {
                 case Vehicle.ANGULAR_DEFLECTION_EFFICIENCY:
-                    m_angularDeflectionEfficiency = Math.Max(pValue, 0.01f);
+                    m_angularDeflectionEfficiency = ClampInRange(0f, pValue, 1f);
                     break;
                 case Vehicle.ANGULAR_DEFLECTION_TIMESCALE:
                     m_angularDeflectionTimescale = Math.Max(pValue, 0.01f);
@@ -195,7 +182,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                     break;
                 case Vehicle.BUOYANCY:
                     m_VehicleBuoyancy = ClampInRange(-1f, pValue, 1f);
-                    m_VehicleGravity = Prim.ComputeGravity(m_VehicleBuoyancy);
+                    m_VehicleGravity = ControllingPrim.ComputeGravity(m_VehicleBuoyancy);
                     break;
                 case Vehicle.HOVER_EFFICIENCY:
                     m_VhoverEfficiency = ClampInRange(0f, pValue, 1f);
@@ -207,7 +194,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                     m_VhoverTimescale = Math.Max(pValue, 0.01f);
                     break;
                 case Vehicle.LINEAR_DEFLECTION_EFFICIENCY:
-                    m_linearDeflectionEfficiency = Math.Max(pValue, 0.01f);
+                    m_linearDeflectionEfficiency = ClampInRange(0f, pValue, 1f);
                     break;
                 case Vehicle.LINEAR_DEFLECTION_TIMESCALE:
                     m_linearDeflectionTimescale = Math.Max(pValue, 0.01f);
@@ -233,7 +220,6 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                 // set all of the components to the same value
                 case Vehicle.ANGULAR_FRICTION_TIMESCALE:
                     m_angularFrictionTimescale = new Vector3(pValue, pValue, pValue);
-                    m_angularMotor.FrictionTimescale = m_angularFrictionTimescale;
                     break;
                 case Vehicle.ANGULAR_MOTOR_DIRECTION:
                     m_angularMotorDirection = new Vector3(pValue, pValue, pValue);
@@ -242,7 +228,6 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                     break;
                 case Vehicle.LINEAR_FRICTION_TIMESCALE:
                     m_linearFrictionTimescale = new Vector3(pValue, pValue, pValue);
-                    m_linearMotor.FrictionTimescale = m_linearFrictionTimescale;
                     break;
                 case Vehicle.LINEAR_MOTOR_DIRECTION:
                     m_linearMotorDirection = new Vector3(pValue, pValue, pValue);
@@ -258,12 +243,11 @@ namespace OpenSim.Region.Physics.BulletSPlugin
 
         internal void ProcessVectorVehicleParam(Vehicle pParam, Vector3 pValue)
         {
-            VDetailLog("{0},ProcessVectorVehicleParam,param={1},val={2}", Prim.LocalID, pParam, pValue);
+            VDetailLog("{0},ProcessVectorVehicleParam,param={1},val={2}", ControllingPrim.LocalID, pParam, pValue);
             switch (pParam)
             {
                 case Vehicle.ANGULAR_FRICTION_TIMESCALE:
                     m_angularFrictionTimescale = new Vector3(pValue.X, pValue.Y, pValue.Z);
-                    m_angularMotor.FrictionTimescale = m_angularFrictionTimescale;
                     break;
                 case Vehicle.ANGULAR_MOTOR_DIRECTION:
                     // Limit requested angular speed to 2 rps= 4 pi rads/sec
@@ -276,7 +260,6 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                     break;
                 case Vehicle.LINEAR_FRICTION_TIMESCALE:
                     m_linearFrictionTimescale = new Vector3(pValue.X, pValue.Y, pValue.Z);
-                    m_linearMotor.FrictionTimescale = m_linearFrictionTimescale;
                     break;
                 case Vehicle.LINEAR_MOTOR_DIRECTION:
                     m_linearMotorDirection = new Vector3(pValue.X, pValue.Y, pValue.Z);
@@ -294,7 +277,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
 
         internal void ProcessRotationVehicleParam(Vehicle pParam, Quaternion pValue)
         {
-            VDetailLog("{0},ProcessRotationalVehicleParam,param={1},val={2}", Prim.LocalID, pParam, pValue);
+            VDetailLog("{0},ProcessRotationalVehicleParam,param={1},val={2}", ControllingPrim.LocalID, pParam, pValue);
             switch (pParam)
             {
                 case Vehicle.REFERENCE_FRAME:
@@ -308,7 +291,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
 
         internal void ProcessVehicleFlags(int pParam, bool remove)
         {
-            VDetailLog("{0},ProcessVehicleFlags,param={1},remove={2}", Prim.LocalID, pParam, remove);
+            VDetailLog("{0},ProcessVehicleFlags,param={1},remove={2}", ControllingPrim.LocalID, pParam, remove);
             VehicleFlag parm = (VehicleFlag)pParam;
             if (pParam == -1)
                 m_flags = (VehicleFlag)0;
@@ -323,7 +306,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
 
         public void ProcessTypeChange(Vehicle pType)
         {
-            VDetailLog("{0},ProcessTypeChange,type={1}", Prim.LocalID, pType);
+            VDetailLog("{0},ProcessTypeChange,type={1}", ControllingPrim.LocalID, pType);
             // Set Defaults For Type
             Type = pType;
             switch (pType)
@@ -557,34 +540,40 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                     break;
             }
 
-            // Update any physical parameters based on this type.
-            Refresh();
+            m_linearMotor = new BSVMotor("LinearMotor", m_linearMotorTimescale, m_linearMotorDecayTimescale, 1f);
+            // m_linearMotor.PhysicsScene = m_physicsScene;  // DEBUG DEBUG DEBUG (enables detail logging)
 
-            m_linearMotor = new BSVMotor("LinearMotor", m_linearMotorTimescale,
-                                m_linearMotorDecayTimescale, m_linearFrictionTimescale,
-                                1f);
-            m_linearMotor.PhysicsScene = PhysicsScene;  // DEBUG DEBUG DEBUG (enables detail logging)
-
-            m_angularMotor = new BSVMotor("AngularMotor", m_angularMotorTimescale,
-                                m_angularMotorDecayTimescale, m_angularFrictionTimescale,
-                                1f);
-            m_angularMotor.PhysicsScene = PhysicsScene;  // DEBUG DEBUG DEBUG (enables detail logging)
+            m_angularMotor = new BSVMotor("AngularMotor", m_angularMotorTimescale, m_angularMotorDecayTimescale, 1f);
+            // m_angularMotor.PhysicsScene = m_physicsScene;  // DEBUG DEBUG DEBUG (enables detail logging)
 
             /*  Not implemented
             m_verticalAttractionMotor = new BSVMotor("VerticalAttraction", m_verticalAttractionTimescale,
                                 BSMotor.Infinite, BSMotor.InfiniteVector,
                                 m_verticalAttractionEfficiency);
             // Z goes away and we keep X and Y
-            m_verticalAttractionMotor.FrictionTimescale = new Vector3(BSMotor.Infinite, BSMotor.Infinite, 0.1f);
             m_verticalAttractionMotor.PhysicsScene = PhysicsScene;  // DEBUG DEBUG DEBUG (enables detail logging)
              */
+
+            if (this.Type == Vehicle.TYPE_NONE)
+            {
+                UnregisterForSceneEvents();
+            }
+            else
+            {
+                RegisterForSceneEvents();
+            }
+
+            // Update any physical parameters based on this type.
+            Refresh();
         }
         #endregion // Vehicle parameter setting
 
-        public void Refresh()
+        // BSActor.Refresh()
+        public override void Refresh()
         {
             // If asking for a refresh, reset the physical parameters before the next simulation step.
-            PhysicsScene.PostTaintObject("BSDynamics.Refresh", Prim.LocalID, delegate()
+            // Called whether active or not since the active state may be updated before the next step.
+            m_physicsScene.PostTaintObject("BSDynamics.Refresh", ControllingPrim.LocalID, delegate()
             {
                 SetPhysicalParameters();
             });
@@ -597,49 +586,98 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             if (IsActive)
             {
                 // Remember the mass so we don't have to fetch it every step
-                m_vehicleMass = Prim.TotalMass;
+                m_vehicleMass = ControllingPrim.TotalMass;
 
                 // Friction affects are handled by this vehicle code
-                PhysicsScene.PE.SetFriction(Prim.PhysBody, BSParam.VehicleFriction);
-                PhysicsScene.PE.SetRestitution(Prim.PhysBody, BSParam.VehicleRestitution);
+                // m_physicsScene.PE.SetFriction(ControllingPrim.PhysBody, BSParam.VehicleFriction);
+                // m_physicsScene.PE.SetRestitution(ControllingPrim.PhysBody, BSParam.VehicleRestitution);
+                ControllingPrim.Linkset.SetPhysicalFriction(BSParam.VehicleFriction);
+                ControllingPrim.Linkset.SetPhysicalRestitution(BSParam.VehicleRestitution);
 
                 // Moderate angular movement introduced by Bullet.
                 // TODO: possibly set AngularFactor and LinearFactor for the type of vehicle.
                 //     Maybe compute linear and angular factor and damping from params.
-                PhysicsScene.PE.SetAngularDamping(Prim.PhysBody, BSParam.VehicleAngularDamping);
-                PhysicsScene.PE.SetLinearFactor(Prim.PhysBody, BSParam.VehicleLinearFactor);
-                PhysicsScene.PE.SetAngularFactorV(Prim.PhysBody, BSParam.VehicleAngularFactor);
+                m_physicsScene.PE.SetAngularDamping(ControllingPrim.PhysBody, BSParam.VehicleAngularDamping);
+                m_physicsScene.PE.SetLinearFactor(ControllingPrim.PhysBody, BSParam.VehicleLinearFactor);
+                m_physicsScene.PE.SetAngularFactorV(ControllingPrim.PhysBody, BSParam.VehicleAngularFactor);
 
                 // Vehicles report collision events so we know when it's on the ground
-                PhysicsScene.PE.AddToCollisionFlags(Prim.PhysBody, CollisionFlags.BS_VEHICLE_COLLISIONS);
+                // m_physicsScene.PE.AddToCollisionFlags(ControllingPrim.PhysBody, CollisionFlags.BS_VEHICLE_COLLISIONS);
+                ControllingPrim.Linkset.AddToPhysicalCollisionFlags(CollisionFlags.BS_VEHICLE_COLLISIONS);
 
-                Prim.Inertia = PhysicsScene.PE.CalculateLocalInertia(Prim.PhysShape, m_vehicleMass);
-                PhysicsScene.PE.SetMassProps(Prim.PhysBody, m_vehicleMass, Prim.Inertia);
-                PhysicsScene.PE.UpdateInertiaTensor(Prim.PhysBody);
+                // Vector3 inertia = m_physicsScene.PE.CalculateLocalInertia(ControllingPrim.PhysShape.physShapeInfo, m_vehicleMass);
+                // ControllingPrim.Inertia = inertia * BSParam.VehicleInertiaFactor;
+                // m_physicsScene.PE.SetMassProps(ControllingPrim.PhysBody, m_vehicleMass, ControllingPrim.Inertia);
+                // m_physicsScene.PE.UpdateInertiaTensor(ControllingPrim.PhysBody);
+                ControllingPrim.Linkset.ComputeAndSetLocalInertia(BSParam.VehicleInertiaFactor, m_vehicleMass);
 
                 // Set the gravity for the vehicle depending on the buoyancy
                 // TODO: what should be done if prim and vehicle buoyancy differ?
-                m_VehicleGravity = Prim.ComputeGravity(m_VehicleBuoyancy);
+                m_VehicleGravity = ControllingPrim.ComputeGravity(m_VehicleBuoyancy);
                 // The actual vehicle gravity is set to zero in Bullet so we can do all the application of same.
-                PhysicsScene.PE.SetGravity(Prim.PhysBody, Vector3.Zero);
+                // m_physicsScene.PE.SetGravity(ControllingPrim.PhysBody, Vector3.Zero);
+                ControllingPrim.Linkset.SetPhysicalGravity(Vector3.Zero);
 
                 VDetailLog("{0},BSDynamics.SetPhysicalParameters,mass={1},inert={2},vehGrav={3},aDamp={4},frict={5},rest={6},lFact={7},aFact={8}",
-                        Prim.LocalID, m_vehicleMass, Prim.Inertia, m_VehicleGravity,
+                        ControllingPrim.LocalID, m_vehicleMass, ControllingPrim.Inertia, m_VehicleGravity,
                         BSParam.VehicleAngularDamping, BSParam.VehicleFriction, BSParam.VehicleRestitution,
                         BSParam.VehicleLinearFactor, BSParam.VehicleAngularFactor
                         );
             }
             else
             {
-                if (Prim.PhysBody.HasPhysicalBody)
-                    PhysicsScene.PE.RemoveFromCollisionFlags(Prim.PhysBody, CollisionFlags.BS_VEHICLE_COLLISIONS);
+                if (ControllingPrim.PhysBody.HasPhysicalBody)
+                    m_physicsScene.PE.RemoveFromCollisionFlags(ControllingPrim.PhysBody, CollisionFlags.BS_VEHICLE_COLLISIONS);
+                // ControllingPrim.Linkset.RemoveFromPhysicalCollisionFlags(CollisionFlags.BS_VEHICLE_COLLISIONS);
             }
         }
 
-        public bool RemoveBodyDependencies(BSPhysObject prim)
+        // BSActor.RemoveBodyDependencies
+        public override void RemoveDependencies()
         {
             Refresh();
-            return IsActive;
+        }
+
+        // BSActor.Release()
+        public override void Dispose()
+        {
+            VDetailLog("{0},Dispose", ControllingPrim.LocalID);
+            UnregisterForSceneEvents();
+            Type = Vehicle.TYPE_NONE;
+            Enabled = false;
+            return;
+        }
+
+        private void RegisterForSceneEvents()
+        {
+            if (!m_haveRegisteredForSceneEvents)
+            {
+                m_physicsScene.BeforeStep += this.Step;
+                m_physicsScene.AfterStep += this.PostStep;
+                ControllingPrim.OnPreUpdateProperty += this.PreUpdateProperty;
+                m_haveRegisteredForSceneEvents = true;
+            }
+        }
+
+        private void UnregisterForSceneEvents()
+        {
+            if (m_haveRegisteredForSceneEvents)
+            {
+                m_physicsScene.BeforeStep -= this.Step;
+                m_physicsScene.AfterStep -= this.PostStep;
+                ControllingPrim.OnPreUpdateProperty -= this.PreUpdateProperty;
+                m_haveRegisteredForSceneEvents = false;
+            }
+        }
+
+        private void PreUpdateProperty(ref EntityProperties entprop)
+        {
+            // A temporary kludge to suppress the rotational effects introduced on vehicles by Bullet
+            // TODO: handle physics introduced by Bullet with computed vehicle physics.
+            if (IsActive)
+            {
+                entprop.RotationalVelocity = Vector3.Zero;
+            }
         }
 
         #region Known vehicle value functions
@@ -661,7 +699,6 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         private Vector3 m_knownRotationalVelocity;
         private Vector3 m_knownRotationalForce;
         private Vector3 m_knownRotationalImpulse;
-        private Vector3 m_knownForwardVelocity;    // vehicle relative forward speed
 
         private const int m_knownChangedPosition           = 1 << 0;
         private const int m_knownChangedVelocity           = 1 << 1;
@@ -673,7 +710,6 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         private const int m_knownChangedRotationalImpulse  = 1 << 7;
         private const int m_knownChangedTerrainHeight      = 1 << 8;
         private const int m_knownChangedWaterLevel         = 1 << 9;
-        private const int m_knownChangedForwardVelocity    = 1 <<10;
 
         public void ForgetKnownVehicleProperties()
         {
@@ -686,14 +722,14 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             if (m_knownChanged != 0)
             {
                 if ((m_knownChanged & m_knownChangedPosition) != 0)
-                    Prim.ForcePosition = m_knownPosition;
+                    ControllingPrim.ForcePosition = m_knownPosition;
 
                 if ((m_knownChanged & m_knownChangedOrientation) != 0)
-                    Prim.ForceOrientation = m_knownOrientation;
+                    ControllingPrim.ForceOrientation = m_knownOrientation;
 
                 if ((m_knownChanged & m_knownChangedVelocity) != 0)
                 {
-                    Prim.ForceVelocity = m_knownVelocity;
+                    ControllingPrim.ForceVelocity = m_knownVelocity;
                     // Fake out Bullet by making it think the velocity is the same as last time.
                     // Bullet does a bunch of smoothing for changing parameters.
                     //    Since the vehicle is demanding this setting, we override Bullet's smoothing
@@ -702,41 +738,41 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                 }
 
                 if ((m_knownChanged & m_knownChangedForce) != 0)
-                    Prim.AddForce((Vector3)m_knownForce, false /*pushForce*/, true /*inTaintTime*/);
+                    ControllingPrim.AddForce((Vector3)m_knownForce, false /*pushForce*/, true /*inTaintTime*/);
 
                 if ((m_knownChanged & m_knownChangedForceImpulse) != 0)
-                    Prim.AddForceImpulse((Vector3)m_knownForceImpulse, false /*pushforce*/, true /*inTaintTime*/);
+                    ControllingPrim.AddForceImpulse((Vector3)m_knownForceImpulse, false /*pushforce*/, true /*inTaintTime*/);
 
                 if ((m_knownChanged & m_knownChangedRotationalVelocity) != 0)
                 {
-                    Prim.ForceRotationalVelocity = m_knownRotationalVelocity;
+                    ControllingPrim.ForceRotationalVelocity = m_knownRotationalVelocity;
                     // PhysicsScene.PE.SetInterpolationAngularVelocity(Prim.PhysBody, m_knownRotationalVelocity);
                 }
 
                 if ((m_knownChanged & m_knownChangedRotationalImpulse) != 0)
-                    Prim.ApplyTorqueImpulse((Vector3)m_knownRotationalImpulse, true /*inTaintTime*/);
+                    ControllingPrim.ApplyTorqueImpulse((Vector3)m_knownRotationalImpulse, true /*inTaintTime*/);
 
                 if ((m_knownChanged & m_knownChangedRotationalForce) != 0)
                 {
-                    Prim.AddAngularForce((Vector3)m_knownRotationalForce, false /*pushForce*/, true /*inTaintTime*/);
+                    ControllingPrim.AddAngularForce((Vector3)m_knownRotationalForce, false /*pushForce*/, true /*inTaintTime*/);
                 }
 
                 // If we set one of the values (ie, the physics engine didn't do it) we must force
                 //      an UpdateProperties event to send the changes up to the simulator.
-                PhysicsScene.PE.PushUpdate(Prim.PhysBody);
+                m_physicsScene.PE.PushUpdate(ControllingPrim.PhysBody);
             }
             m_knownChanged = 0;
         }
 
         // Since the computation of terrain height can be a little involved, this routine
         //    is used to fetch the height only once for each vehicle simulation step.
-        Vector3 lastRememberedHeightPos;
+        Vector3 lastRememberedHeightPos = new Vector3(-1, -1, -1);
         private float GetTerrainHeight(Vector3 pos)
         {
             if ((m_knownHas & m_knownChangedTerrainHeight) == 0 || pos != lastRememberedHeightPos)
             {
                 lastRememberedHeightPos = pos;
-                m_knownTerrainHeight = Prim.PhysicsScene.TerrainManager.GetTerrainHeightAtXYZ(pos);
+                m_knownTerrainHeight = ControllingPrim.PhysScene.TerrainManager.GetTerrainHeightAtXYZ(pos);
                 m_knownHas |= m_knownChangedTerrainHeight;
             }
             return m_knownTerrainHeight;
@@ -744,14 +780,16 @@ namespace OpenSim.Region.Physics.BulletSPlugin
 
         // Since the computation of water level can be a little involved, this routine
         //    is used ot fetch the level only once for each vehicle simulation step.
+        Vector3 lastRememberedWaterHeightPos = new Vector3(-1, -1, -1);
         private float GetWaterLevel(Vector3 pos)
         {
-            if ((m_knownHas & m_knownChangedWaterLevel) == 0)
+            if ((m_knownHas & m_knownChangedWaterLevel) == 0 || pos != lastRememberedWaterHeightPos)
             {
-                m_knownWaterLevel = Prim.PhysicsScene.TerrainManager.GetWaterLevelAtXYZ(pos);
+                lastRememberedWaterHeightPos = pos;
+                m_knownWaterLevel = ControllingPrim.PhysScene.TerrainManager.GetWaterLevelAtXYZ(pos);
                 m_knownHas |= m_knownChangedWaterLevel;
             }
-            return (float)m_knownWaterLevel;
+            return m_knownWaterLevel;
         }
 
         private Vector3 VehiclePosition
@@ -760,7 +798,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             {
                 if ((m_knownHas & m_knownChangedPosition) == 0)
                 {
-                    m_knownPosition = Prim.ForcePosition;
+                    m_knownPosition = ControllingPrim.ForcePosition;
                     m_knownHas |= m_knownChangedPosition;
                 }
                 return m_knownPosition;
@@ -779,7 +817,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             {
                 if ((m_knownHas & m_knownChangedOrientation) == 0)
                 {
-                    m_knownOrientation = Prim.ForceOrientation;
+                    m_knownOrientation = ControllingPrim.ForceOrientation;
                     m_knownHas |= m_knownChangedOrientation;
                 }
                 return m_knownOrientation;
@@ -798,7 +836,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             {
                 if ((m_knownHas & m_knownChangedVelocity) == 0)
                 {
-                    m_knownVelocity = Prim.ForceVelocity;
+                    m_knownVelocity = ControllingPrim.ForceVelocity;
                     m_knownHas |= m_knownChangedVelocity;
                 }
                 return m_knownVelocity;
@@ -839,7 +877,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             {
                 if ((m_knownHas & m_knownChangedRotationalVelocity) == 0)
                 {
-                    m_knownRotationalVelocity = Prim.ForceRotationalVelocity;
+                    m_knownRotationalVelocity = ControllingPrim.ForceRotationalVelocity;
                     m_knownHas |= m_knownChangedRotationalVelocity;
                 }
                 return (Vector3)m_knownRotationalVelocity;
@@ -877,14 +915,10 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         {
             get
             {
-                if ((m_knownHas & m_knownChangedForwardVelocity) == 0)
-                {
-                    m_knownForwardVelocity = VehicleVelocity * Quaternion.Inverse(Quaternion.Normalize(VehicleOrientation));
-                    m_knownHas |= m_knownChangedForwardVelocity;
-                }
-                return m_knownForwardVelocity;
+                return VehicleVelocity * Quaternion.Inverse(Quaternion.Normalize(VehicleOrientation));
             }
         }
+
         private float VehicleForwardSpeed
         {
             get
@@ -914,11 +948,11 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             //      for the physics engine to note the changes so an UpdateProperties event will happen.
             PushKnownChanged();
 
-            if (PhysicsScene.VehiclePhysicalLoggingEnabled)
-                PhysicsScene.PE.DumpRigidBody(PhysicsScene.World, Prim.PhysBody);
+            if (m_physicsScene.VehiclePhysicalLoggingEnabled)
+                m_physicsScene.PE.DumpRigidBody(m_physicsScene.World, ControllingPrim.PhysBody);
 
             VDetailLog("{0},BSDynamics.Step,done,pos={1}, force={2},velocity={3},angvel={4}",
-                    Prim.LocalID, VehiclePosition, m_knownForce, VehicleVelocity, VehicleRotationalVelocity);
+                    ControllingPrim.LocalID, VehiclePosition, m_knownForce, VehicleVelocity, VehicleRotationalVelocity);
         }
 
         // Called after the simulation step
@@ -926,8 +960,8 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         {
             if (!IsActive) return;
 
-            if (PhysicsScene.VehiclePhysicalLoggingEnabled)
-                PhysicsScene.PE.DumpRigidBody(PhysicsScene.World, Prim.PhysBody);
+            if (m_physicsScene.VehiclePhysicalLoggingEnabled)
+                m_physicsScene.PE.DumpRigidBody(m_physicsScene.World, ControllingPrim.PhysBody);
         }
 
         // Apply the effect of the linear motor and other linear motions (like hover and float).
@@ -935,6 +969,8 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         {
             ComputeLinearVelocity(pTimestep);
 
+            ComputeLinearDeflection(pTimestep);
+
             ComputeLinearTerrainHeightCorrection(pTimestep);
 
             ComputeLinearHover(pTimestep);
@@ -950,11 +986,17 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             {
                 Vector3 vel = VehicleVelocity;
                 if ((m_flags & (VehicleFlag.NO_X)) != 0)
+                {
                     vel.X = 0;
+                }
                 if ((m_flags & (VehicleFlag.NO_Y)) != 0)
+                {
                     vel.Y = 0;
+                }
                 if ((m_flags & (VehicleFlag.NO_Z)) != 0)
+                {
                     vel.Z = 0;
+                }
                 VehicleVelocity = vel;
             }
 
@@ -966,13 +1008,13 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                 Vector3 origVelW = VehicleVelocity;         // DEBUG DEBUG
                 VehicleVelocity /= VehicleVelocity.Length();
                 VehicleVelocity *= BSParam.VehicleMaxLinearVelocity;
-                VDetailLog("{0},  MoveLinear,clampMax,origVelW={1},lenSq={2},maxVelSq={3},,newVelW={4}", 
-                            Prim.LocalID, origVelW, newVelocityLengthSq, BSParam.VehicleMaxLinearVelocitySquared, VehicleVelocity);
+                VDetailLog("{0},  MoveLinear,clampMax,origVelW={1},lenSq={2},maxVelSq={3},,newVelW={4}",
+                            ControllingPrim.LocalID, origVelW, newVelocityLengthSq, BSParam.VehicleMaxLinearVelocitySquared, VehicleVelocity);
             }
             else if (newVelocityLengthSq < 0.001f)
                 VehicleVelocity = Vector3.Zero;
 
-            VDetailLog("{0},  MoveLinear,done,isColl={1},newVel={2}", Prim.LocalID, Prim.IsColliding, VehicleVelocity );
+            VDetailLog("{0},  MoveLinear,done,isColl={1},newVel={2}", ControllingPrim.LocalID, ControllingPrim.HasSomeCollision, VehicleVelocity );
 
         } // end MoveLinear()
 
@@ -980,9 +1022,13 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         {
             // Step the motor from the current value. Get the correction needed this step.
             Vector3 origVelW = VehicleVelocity;             // DEBUG
-            Vector3 currentVelV = VehicleVelocity * Quaternion.Inverse(VehicleOrientation);
+            Vector3 currentVelV = VehicleForwardVelocity;
             Vector3 linearMotorCorrectionV = m_linearMotor.Step(pTimestep, currentVelV);
 
+            // Friction reduces vehicle motion based on absolute speed. Slow vehicle down by friction.
+            Vector3 frictionFactorV = ComputeFrictionFactor(m_linearFrictionTimescale, pTimestep);
+            linearMotorCorrectionV -= (currentVelV * frictionFactorV);
+
             // Motor is vehicle coordinates. Rotate it to world coordinates
             Vector3 linearMotorVelocityW = linearMotorCorrectionV * VehicleOrientation;
 
@@ -996,8 +1042,49 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             // Add this correction to the velocity to make it faster/slower.
             VehicleVelocity += linearMotorVelocityW;
 
-            VDetailLog("{0},  MoveLinear,velocity,origVelW={1},velV={2},correctV={3},correctW={4},newVelW={5}",
-                        Prim.LocalID, origVelW, currentVelV, linearMotorCorrectionV, linearMotorVelocityW, VehicleVelocity);
+            VDetailLog("{0},  MoveLinear,velocity,origVelW={1},velV={2},tgt={3},correctV={4},correctW={5},newVelW={6},fricFact={7}",
+                        ControllingPrim.LocalID, origVelW, currentVelV, m_linearMotor.TargetValue, linearMotorCorrectionV,
+                        linearMotorVelocityW, VehicleVelocity, frictionFactorV);
+        }
+
+        //Given a Deflection Effiency and a Velocity, Returns a Velocity that is Partially Deflected onto the X Axis
+        //Clamped so that a DeflectionTimescale of less then 1 does not increase force over original velocity
+        private void ComputeLinearDeflection(float pTimestep)
+        {
+            Vector3 linearDeflectionV = Vector3.Zero;
+            Vector3 velocityV = VehicleForwardVelocity;
+
+            if (BSParam.VehicleEnableLinearDeflection)
+            {
+                // Velocity in Y and Z dimensions is movement to the side or turning.
+                // Compute deflection factor from the to the side and rotational velocity
+                linearDeflectionV.Y = SortedClampInRange(0, (velocityV.Y * m_linearDeflectionEfficiency) / m_linearDeflectionTimescale, velocityV.Y);
+                linearDeflectionV.Z = SortedClampInRange(0, (velocityV.Z * m_linearDeflectionEfficiency) / m_linearDeflectionTimescale, velocityV.Z);
+
+                // Velocity to the side and around is corrected and moved into the forward direction
+                linearDeflectionV.X += Math.Abs(linearDeflectionV.Y);
+                linearDeflectionV.X += Math.Abs(linearDeflectionV.Z);
+
+                // Scale the deflection to the fractional simulation time
+                linearDeflectionV *= pTimestep;
+
+                // Subtract the sideways and rotational velocity deflection factors while adding the correction forward
+                linearDeflectionV *= new Vector3(1, -1, -1);
+
+                // Correction is vehicle relative. Convert to world coordinates.
+                Vector3 linearDeflectionW = linearDeflectionV * VehicleOrientation;
+
+                // Optionally, if not colliding, don't effect world downward velocity. Let falling things fall.
+                if (BSParam.VehicleLinearDeflectionNotCollidingNoZ && !m_controllingPrim.HasSomeCollision)
+                {
+                    linearDeflectionW.Z = 0f;
+                }
+
+                VehicleVelocity += linearDeflectionW;
+
+                VDetailLog("{0},  MoveLinear,LinearDeflection,linDefEff={1},linDefTS={2},linDeflectionV={3}",
+                            ControllingPrim.LocalID, m_linearDeflectionEfficiency, m_linearDeflectionTimescale, linearDeflectionV);
+            }
         }
 
         public void ComputeLinearTerrainHeightCorrection(float pTimestep)
@@ -1011,7 +1098,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                 newPosition.Z = GetTerrainHeight(VehiclePosition) + 1f;
                 VehiclePosition = newPosition;
                 VDetailLog("{0},  MoveLinear,terrainHeight,terrainHeight={1},pos={2}",
-                        Prim.LocalID, GetTerrainHeight(VehiclePosition), VehiclePosition);
+                        ControllingPrim.LocalID, GetTerrainHeight(VehiclePosition), VehiclePosition);
             }
         }
 
@@ -1034,14 +1121,13 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                 {
                     m_VhoverTargetHeight = m_VhoverHeight;
                 }
-
                 if ((m_flags & VehicleFlag.HOVER_UP_ONLY) != 0)
                 {
                     // If body is already heigher, use its height as target height
                     if (VehiclePosition.Z > m_VhoverTargetHeight)
                         m_VhoverTargetHeight = VehiclePosition.Z;
                 }
-                
+
                 if ((m_flags & VehicleFlag.LOCK_HOVER_HEIGHT) != 0)
                 {
                     if (Math.Abs(VehiclePosition.Z - m_VhoverTargetHeight) > 0.2f)
@@ -1050,7 +1136,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                         pos.Z = m_VhoverTargetHeight;
                         VehiclePosition = pos;
 
-                        VDetailLog("{0},  MoveLinear,hover,pos={1},lockHoverHeight", Prim.LocalID, pos);
+                        VDetailLog("{0},  MoveLinear,hover,pos={1},lockHoverHeight", ControllingPrim.LocalID, pos);
                     }
                 }
                 else
@@ -1079,11 +1165,10 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                      */
 
                     VDetailLog("{0},  MoveLinear,hover,pos={1},eff={2},hoverTS={3},height={4},target={5},err={6},corr={7}",
-                                    Prim.LocalID, VehiclePosition, m_VhoverEfficiency,
+                                    ControllingPrim.LocalID, VehiclePosition, m_VhoverEfficiency,
                                     m_VhoverTimescale, m_VhoverHeight, m_VhoverTargetHeight,
                                     verticalError, verticalCorrection);
                 }
-
             }
         }
 
@@ -1124,7 +1209,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                 {
                     VehiclePosition = pos;
                     VDetailLog("{0},  MoveLinear,blockingEndPoint,block={1},origPos={2},pos={3}",
-                                Prim.LocalID, m_BlockingEndPoint, posChange, pos);
+                                ControllingPrim.LocalID, m_BlockingEndPoint, posChange, pos);
                 }
             }
             return changed;
@@ -1135,7 +1220,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         //    used with conjunction with banking: the strength of the banking will decay when the
         //    vehicle no longer experiences collisions. The decay timescale is the same as
         //    VEHICLE_BANKING_TIMESCALE. This is to help prevent ground vehicles from steering
-        //    when they are in mid jump. 
+        //    when they are in mid jump.
         // TODO: this code is wrong. Also, what should it do for boats (height from water)?
         //    This is just using the ground and a general collision check. Should really be using
         //    a downward raycast to find what is below.
@@ -1148,7 +1233,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                 float targetHeight = Type == Vehicle.TYPE_BOAT ? GetWaterLevel(VehiclePosition) : GetTerrainHeight(VehiclePosition);
                 distanceAboveGround = VehiclePosition.Z - targetHeight;
                 // Not colliding if the vehicle is off the ground
-                if (!Prim.IsColliding)
+                if (!Prim.HasSomeCollision)
                 {
                     // downForce = new Vector3(0, 0, -distanceAboveGround / m_bankingTimescale);
                     VehicleVelocity += new Vector3(0, 0, -distanceAboveGround);
@@ -1159,12 +1244,12 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                 //     be computed with a motor.
                 // TODO: add interaction with banking.
                 VDetailLog("{0},  MoveLinear,limitMotorUp,distAbove={1},colliding={2},ret={3}",
-                                Prim.LocalID, distanceAboveGround, Prim.IsColliding, ret);
+                                Prim.LocalID, distanceAboveGround, Prim.HasSomeCollision, ret);
                  */
 
                 // Another approach is to measure if we're going up. If going up and not colliding,
                 //     the vehicle is in the air.  Fix that by pushing down.
-                if (!Prim.IsColliding && VehicleVelocity.Z > 0.1)
+                if (!ControllingPrim.HasSomeCollision && VehicleVelocity.Z > 0.1)
                 {
                     // Get rid of any of the velocity vector that is pushing us up.
                     float upVelocity = VehicleVelocity.Z;
@@ -1186,7 +1271,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                     }
                         */
                     VDetailLog("{0},  MoveLinear,limitMotorUp,collide={1},upVel={2},newVel={3}",
-                                    Prim.LocalID, Prim.IsColliding, upVelocity, VehicleVelocity);
+                                    ControllingPrim.LocalID, ControllingPrim.HasSomeCollision, upVelocity, VehicleVelocity);
                 }
             }
         }
@@ -1196,14 +1281,14 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             Vector3 appliedGravity = m_VehicleGravity * m_vehicleMass;
 
             // Hack to reduce downward force if the vehicle is probably sitting on the ground
-            if (Prim.IsColliding && IsGroundVehicle)
+            if (ControllingPrim.HasSomeCollision && IsGroundVehicle)
                 appliedGravity *= BSParam.VehicleGroundGravityFudge;
 
             VehicleAddForce(appliedGravity);
 
-            VDetailLog("{0},  MoveLinear,applyGravity,vehGrav={1},collid={2},fudge={3},mass={4},appliedForce={3}", 
-                            Prim.LocalID, m_VehicleGravity,
-                            Prim.IsColliding, BSParam.VehicleGroundGravityFudge, m_vehicleMass, appliedGravity);
+            VDetailLog("{0},  MoveLinear,applyGravity,vehGrav={1},collid={2},fudge={3},mass={4},appliedForce={5}",
+                            ControllingPrim.LocalID, m_VehicleGravity,
+                            ControllingPrim.HasSomeCollision, BSParam.VehicleGroundGravityFudge, m_vehicleMass, appliedGravity);
         }
 
         // =======================================================================
@@ -1227,11 +1312,11 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             {
                 // The vehicle is not adding anything angular wise.
                 VehicleRotationalVelocity = Vector3.Zero;
-                VDetailLog("{0},  MoveAngular,done,zero", Prim.LocalID);
+                VDetailLog("{0},  MoveAngular,done,zero", ControllingPrim.LocalID);
             }
             else
             {
-                VDetailLog("{0},  MoveAngular,done,nonZero,angVel={1}", Prim.LocalID, VehicleRotationalVelocity);
+                VDetailLog("{0},  MoveAngular,done,nonZero,angVel={1}", ControllingPrim.LocalID, VehicleRotationalVelocity);
             }
 
             // ==================================================================
@@ -1262,7 +1347,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                     torqueFromOffset.Z = 0;
 
                 VehicleAddAngularForce(torqueFromOffset * m_vehicleMass);
-                VDetailLog("{0},  BSDynamic.MoveAngular,motorOffset,applyTorqueImpulse={1}", Prim.LocalID, torqueFromOffset);
+                VDetailLog("{0},  BSDynamic.MoveAngular,motorOffset,applyTorqueImpulse={1}", ControllingPrim.LocalID, torqueFromOffset);
             }
 
         }
@@ -1270,6 +1355,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         private void ComputeAngularTurning(float pTimestep)
         {
             // The user wants this many radians per second angular change?
+            Vector3 origVehicleRotationalVelocity = VehicleRotationalVelocity;      // DEBUG DEBUG
             Vector3 currentAngularV = VehicleRotationalVelocity * Quaternion.Inverse(VehicleOrientation);
             Vector3 angularMotorContributionV = m_angularMotor.Step(pTimestep, currentAngularV);
 
@@ -1277,18 +1363,25 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             // From http://wiki.secondlife.com/wiki/LlSetVehicleFlags :
             //    This flag prevents linear deflection parallel to world z-axis. This is useful
             //    for preventing ground vehicles with large linear deflection, like bumper cars,
-            //    from climbing their linear deflection into the sky. 
+            //    from climbing their linear deflection into the sky.
             // That is, NO_DEFLECTION_UP says angular motion should not add any pitch or roll movement
             // TODO: This is here because this is where ODE put it but documentation says it
             //    is a linear effect. Where should this check go?
             //if ((m_flags & (VehicleFlag.NO_DEFLECTION_UP)) != 0)
-           // {
+            // {
             //    angularMotorContributionV.X = 0f;
             //    angularMotorContributionV.Y = 0f;
-          //  }
+            //  }
 
-            VehicleRotationalVelocity += angularMotorContributionV * VehicleOrientation;
-            VDetailLog("{0},  MoveAngular,angularTurning,angularMotorContrib={1}", Prim.LocalID, angularMotorContributionV);
+            // Reduce any velocity by friction.
+            Vector3 frictionFactorW = ComputeFrictionFactor(m_angularFrictionTimescale, pTimestep);
+            angularMotorContributionV -= (currentAngularV * frictionFactorW);
+
+            Vector3 angularMotorContributionW = angularMotorContributionV * VehicleOrientation;
+            VehicleRotationalVelocity += angularMotorContributionW;
+
+            VDetailLog("{0},  MoveAngular,angularTurning,curAngVelV={1},origVehRotVel={2},vehRotVel={3},frictFact={4}, angContribV={5},angContribW={6}",
+                        ControllingPrim.LocalID, currentAngularV, origVehicleRotationalVelocity, VehicleRotationalVelocity, frictionFactorW, angularMotorContributionV, angularMotorContributionW);
         }
 
         // From http://wiki.secondlife.com/wiki/Linden_Vehicle_Tutorial:
@@ -1303,86 +1396,136 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         {
 
             // If vertical attaction timescale is reasonable
-            if (enableAngularVerticalAttraction && m_verticalAttractionTimescale < m_verticalAttractionCutoff)
+            if (BSParam.VehicleEnableAngularVerticalAttraction && m_verticalAttractionTimescale < m_verticalAttractionCutoff)
             {
-                // Possible solution derived from a discussion at:
-                // http://stackoverflow.com/questions/14939657/computing-vector-from-quaternion-works-computing-quaternion-from-vector-does-no
-
-                // Create a rotation that is only the vehicle's rotation around Z
-                Vector3 currentEuler = Vector3.Zero;
-                VehicleOrientation.GetEulerAngles(out currentEuler.X, out currentEuler.Y, out currentEuler.Z);
-                Quaternion justZOrientation = Quaternion.CreateFromAxisAngle(Vector3.UnitZ, currentEuler.Z);
-
-                // Create the axis that is perpendicular to the up vector and the rotated up vector.
-                Vector3 differenceAxis = Vector3.Cross(Vector3.UnitZ * justZOrientation, Vector3.UnitZ * VehicleOrientation);
-                // Compute the angle between those to vectors.
-                double differenceAngle = Math.Acos((double)Vector3.Dot(Vector3.UnitZ, Vector3.Normalize(Vector3.UnitZ * VehicleOrientation)));
-                // 'differenceAngle' is the angle to rotate and 'differenceAxis' is the plane to rotate in to get the vehicle vertical
-
-                // Reduce the change by the time period it is to change in. Timestep is handled when velocity is applied.
-                // TODO: add 'efficiency'.
-                differenceAngle /= m_verticalAttractionTimescale;
-
-                // Create the quaterian representing the correction angle
-                Quaternion correctionRotation = Quaternion.CreateFromAxisAngle(differenceAxis, (float)differenceAngle);
-
-                // Turn that quaternion into Euler values to make it into velocities to apply.
-                Vector3 vertContributionV = Vector3.Zero;
-                correctionRotation.GetEulerAngles(out vertContributionV.X, out vertContributionV.Y, out vertContributionV.Z);
-                vertContributionV *= -1f;
-
-                VehicleRotationalVelocity += vertContributionV;
-
-                VDetailLog("{0},  MoveAngular,verticalAttraction,diffAxis={1},diffAng={2},corrRot={3},contrib={4}",
-                                Prim.LocalID,
-                                differenceAxis,
-                                differenceAngle,
-                                correctionRotation,
-                                vertContributionV);
-
-                // ===================================================================
-                /*
-                Vector3 vertContributionV = Vector3.Zero;
-                Vector3 origRotVelW = VehicleRotationalVelocity;        // DEBUG DEBUG
-
-                // Take a vector pointing up and convert it from world to vehicle relative coords.
-                Vector3 verticalError = Vector3.Normalize(Vector3.UnitZ * VehicleOrientation);
-
-                // If vertical attraction correction is needed, the vector that was pointing up (UnitZ)
-                //    is now:
-                //    leaning to one side: rotated around the X axis with the Y value going
-                //        from zero (nearly straight up) to one (completely to the side)) or
-                //    leaning front-to-back: rotated around the Y axis with the value of X being between
-                //         zero and one.
-                // The value of Z is how far the rotation is off with 1 meaning none and 0 being 90 degrees.
-
-                // Y error means needed rotation around X axis and visa versa.
-                // Since the error goes from zero to one, the asin is the corresponding angle.
-                vertContributionV.X = (float)Math.Asin(verticalError.Y);
-                // (Tilt forward (positive X) needs to tilt back (rotate negative) around Y axis.)
-                vertContributionV.Y = -(float)Math.Asin(verticalError.X);
-
-                // If verticalError.Z is negative, the vehicle is upside down. Add additional push.
-                if (verticalError.Z < 0f)
+                Vector3 vehicleUpAxis = Vector3.UnitZ * VehicleOrientation;
+                switch (BSParam.VehicleAngularVerticalAttractionAlgorithm)
                 {
-                    vertContributionV.X += Math.Sign(vertContributionV.X) * PIOverFour;
-                    // vertContribution.Y -= PIOverFour;
+                    case 0:
+                        {
+                            //Another formula to try got from :
+                            //http://answers.unity3d.com/questions/10425/how-to-stabilize-angular-motion-alignment-of-hover.html
+
+                            // Flipping what was originally a timescale into a speed variable and then multiplying it by 2
+                            //    since only computing half the distance between the angles.
+                            float verticalAttractionSpeed = (1 / m_verticalAttractionTimescale) * 2.0f;
+
+                            // Make a prediction of where the up axis will be when this is applied rather then where it is now as
+                            //     this makes for a smoother adjustment and less fighting between the various forces.
+                            Vector3 predictedUp = vehicleUpAxis * Quaternion.CreateFromAxisAngle(VehicleRotationalVelocity, 0f);
+
+                            // This is only half the distance to the target so it will take 2 seconds to complete the turn.
+                            Vector3 torqueVector = Vector3.Cross(predictedUp, Vector3.UnitZ);
+
+                            // Scale vector by our timescale since it is an acceleration it is r/s^2 or radians a timescale squared
+                            Vector3 vertContributionV = torqueVector * verticalAttractionSpeed * verticalAttractionSpeed;
+
+                            VehicleRotationalVelocity += vertContributionV;
+
+                            VDetailLog("{0},  MoveAngular,verticalAttraction,vertAttrSpeed={1},upAxis={2},PredictedUp={3},torqueVector={4},contrib={5}",
+                                            ControllingPrim.LocalID,
+                                            verticalAttractionSpeed,
+                                            vehicleUpAxis,
+                                            predictedUp,
+                                            torqueVector,
+                                            vertContributionV);
+                            break;
+                        }
+                    case 1:
+                        {
+                            // Possible solution derived from a discussion at:
+                            // http://stackoverflow.com/questions/14939657/computing-vector-from-quaternion-works-computing-quaternion-from-vector-does-no
+
+                            // Create a rotation that is only the vehicle's rotation around Z
+                            Vector3 currentEulerW = Vector3.Zero;
+                            VehicleOrientation.GetEulerAngles(out currentEulerW.X, out currentEulerW.Y, out currentEulerW.Z);
+                            Quaternion justZOrientation = Quaternion.CreateFromAxisAngle(Vector3.UnitZ, currentEulerW.Z);
+
+                            // Create the axis that is perpendicular to the up vector and the rotated up vector.
+                            Vector3 differenceAxisW = Vector3.Cross(Vector3.UnitZ * justZOrientation, Vector3.UnitZ * VehicleOrientation);
+                            // Compute the angle between those to vectors.
+                            double differenceAngle = Math.Acos((double)Vector3.Dot(Vector3.UnitZ, Vector3.Normalize(Vector3.UnitZ * VehicleOrientation)));
+                            // 'differenceAngle' is the angle to rotate and 'differenceAxis' is the plane to rotate in to get the vehicle vertical
+
+                            // Reduce the change by the time period it is to change in. Timestep is handled when velocity is applied.
+                            // TODO: add 'efficiency'.
+                            // differenceAngle /= m_verticalAttractionTimescale;
+
+                            // Create the quaterian representing the correction angle
+                            Quaternion correctionRotationW = Quaternion.CreateFromAxisAngle(differenceAxisW, (float)differenceAngle);
+
+                            // Turn that quaternion into Euler values to make it into velocities to apply.
+                            Vector3 vertContributionW = Vector3.Zero;
+                            correctionRotationW.GetEulerAngles(out vertContributionW.X, out vertContributionW.Y, out vertContributionW.Z);
+                            vertContributionW *= -1f;
+                            vertContributionW /= m_verticalAttractionTimescale;
+
+                            VehicleRotationalVelocity += vertContributionW;
+
+                            VDetailLog("{0},  MoveAngular,verticalAttraction,upAxis={1},diffAxis={2},diffAng={3},corrRot={4},contrib={5}",
+                                            ControllingPrim.LocalID,
+                                            vehicleUpAxis,
+                                            differenceAxisW,
+                                            differenceAngle,
+                                            correctionRotationW,
+                                            vertContributionW);
+                            break;
+                        }
+                    case 2:
+                        {
+                            Vector3 vertContributionV = Vector3.Zero;
+                            Vector3 origRotVelW = VehicleRotationalVelocity;        // DEBUG DEBUG
+
+                            // Take a vector pointing up and convert it from world to vehicle relative coords.
+                            Vector3 verticalError = Vector3.Normalize(Vector3.UnitZ * VehicleOrientation);
+
+                            // If vertical attraction correction is needed, the vector that was pointing up (UnitZ)
+                            //    is now:
+                            //    leaning to one side: rotated around the X axis with the Y value going
+                            //        from zero (nearly straight up) to one (completely to the side)) or
+                            //    leaning front-to-back: rotated around the Y axis with the value of X being between
+                            //         zero and one.
+                            // The value of Z is how far the rotation is off with 1 meaning none and 0 being 90 degrees.
+
+                            // Y error means needed rotation around X axis and visa versa.
+                            // Since the error goes from zero to one, the asin is the corresponding angle.
+                            vertContributionV.X = (float)Math.Asin(verticalError.Y);
+                            // (Tilt forward (positive X) needs to tilt back (rotate negative) around Y axis.)
+                            vertContributionV.Y = -(float)Math.Asin(verticalError.X);
+
+                            // If verticalError.Z is negative, the vehicle is upside down. Add additional push.
+                            if (verticalError.Z < 0f)
+                            {
+                                vertContributionV.X += Math.Sign(vertContributionV.X) * PIOverFour;
+                                // vertContribution.Y -= PIOverFour;
+                            }
+
+                            // 'vertContrbution' is now the necessary angular correction to correct tilt in one second.
+                            //     Correction happens over a number of seconds.
+                            Vector3 unscaledContribVerticalErrorV = vertContributionV;     // DEBUG DEBUG
+
+                            // The correction happens over the user's time period
+                            vertContributionV /= m_verticalAttractionTimescale;
+
+                            // Rotate the vehicle rotation to the world coordinates.
+                            VehicleRotationalVelocity += (vertContributionV * VehicleOrientation);
+
+                            VDetailLog("{0},  MoveAngular,verticalAttraction,,upAxis={1},origRotVW={2},vertError={3},unscaledV={4},eff={5},ts={6},vertContribV={7}",
+                                            ControllingPrim.LocalID,
+                                            vehicleUpAxis,
+                                            origRotVelW,
+                                            verticalError,
+                                            unscaledContribVerticalErrorV,
+                                            m_verticalAttractionEfficiency,
+                                            m_verticalAttractionTimescale,
+                                            vertContributionV);
+                            break;
+                        }
+                    default:
+                        {
+                            break;
+                        }
                 }
-
-                // 'vertContrbution' is now the necessary angular correction to correct tilt in one second.
-                //     Correction happens over a number of seconds.
-                Vector3 unscaledContribVerticalErrorV = vertContributionV;     // DEBUG DEBUG
-
-                // The correction happens over the user's time period
-                vertContributionV /= m_verticalAttractionTimescale;
-
-                // Rotate the vehicle rotation to the world coordinates.
-                VehicleRotationalVelocity += (vertContributionV * VehicleOrientation);
-
-                VDetailLog("{0},  MoveAngular,verticalAttraction,,origRotVW={1},vertError={2},unscaledV={3},eff={4},ts={5},vertContribV={6}",
-                                Prim.LocalID, origRotVelW, verticalError, unscaledContribVerticalErrorV, 
-                                m_verticalAttractionEfficiency, m_verticalAttractionTimescale, vertContributionV);
-                */
             }
         }
 
@@ -1392,13 +1535,9 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         //     in that direction.
         // TODO: implement reference frame.
         public void ComputeAngularDeflection()
-        {
-            // Since angularMotorUp and angularDeflection are computed independently, they will calculate
-            //     approximately the same X or Y correction. When added together (when contributions are combined)
-            //     this creates an over-correction and then wabbling as the target is overshot.
-            // TODO: rethink how the different correction computations inter-relate.
+        {   
 
-            if (enableAngularDeflection && m_angularDeflectionEfficiency != 0 && VehicleForwardSpeed > 0.2)
+            if (BSParam.VehicleEnableAngularDeflection && m_angularDeflectionEfficiency != 0 && VehicleForwardSpeed > 0.2)
             {
                 Vector3 deflectContributionV = Vector3.Zero;
 
@@ -1411,10 +1550,14 @@ namespace OpenSim.Region.Physics.BulletSPlugin
 
                 // The direction the vehicle is pointing
                 Vector3 pointingDirection = Vector3.UnitX * VehicleOrientation;
-                pointingDirection.Normalize();
+                //Predict where the Vehicle will be pointing after AngularVelocity change is applied. This will keep
+                //   from overshooting and allow this correction to merge with the Vertical Attraction peacefully.
+                Vector3 predictedPointingDirection = pointingDirection * Quaternion.CreateFromAxisAngle(VehicleRotationalVelocity, 0f);
+                predictedPointingDirection.Normalize();
 
                 // The difference between what is and what should be.
-                Vector3 deflectionError = movingDirection - pointingDirection;
+               // Vector3 deflectionError = movingDirection - predictedPointingDirection;
+                Vector3 deflectionError = Vector3.Cross(movingDirection, predictedPointingDirection);
 
                 // Don't try to correct very large errors (not our job)
                 // if (Math.Abs(deflectionError.X) > PIOverFour) deflectionError.X = PIOverTwo * Math.Sign(deflectionError.X);
@@ -1427,15 +1570,16 @@ namespace OpenSim.Region.Physics.BulletSPlugin
                 // ret = m_angularDeflectionCorrectionMotor(1f, deflectionError);
 
                 // Scale the correction by recovery timescale and efficiency
-                deflectContributionV = (-deflectionError) * m_angularDeflectionEfficiency;
-                deflectContributionV /= m_angularDeflectionTimescale;
-
-                VehicleRotationalVelocity += deflectContributionV * VehicleOrientation;
+                //    Not modeling a spring so clamp the scale to no more then the arc
+                deflectContributionV = (-deflectionError) * ClampInRange(0, m_angularDeflectionEfficiency/m_angularDeflectionTimescale,1f);
+                //deflectContributionV /= m_angularDeflectionTimescale;
 
+               // VehicleRotationalVelocity += deflectContributionV * VehicleOrientation;
+                VehicleRotationalVelocity += deflectContributionV;
                 VDetailLog("{0},  MoveAngular,Deflection,movingDir={1},pointingDir={2},deflectError={3},ret={4}",
-                    Prim.LocalID, movingDirection, pointingDirection, deflectionError, deflectContributionV);
-                VDetailLog("{0},  MoveAngular,Deflection,fwdSpd={1},defEff={2},defTS={3}",
-                    Prim.LocalID, VehicleForwardSpeed, m_angularDeflectionEfficiency, m_angularDeflectionTimescale);
+                    ControllingPrim.LocalID, movingDirection, pointingDirection, deflectionError, deflectContributionV);
+                VDetailLog("{0},  MoveAngular,Deflection,fwdSpd={1},defEff={2},defTS={3},PredictedPointingDir={4}",
+                    ControllingPrim.LocalID, VehicleForwardSpeed, m_angularDeflectionEfficiency, m_angularDeflectionTimescale, predictedPointingDirection);
             }
         }
 
@@ -1447,13 +1591,13 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         //      produce a angular velocity around the yaw-axis, causing the vehicle to turn. The magnitude
         //      of the yaw effect will be proportional to the
         //          VEHICLE_BANKING_EFFICIENCY, the angle of the roll rotation, and sometimes the vehicle's
-        //                 velocity along its preferred axis of motion. 
+        //                 velocity along its preferred axis of motion.
         //          The VEHICLE_BANKING_EFFICIENCY can vary between -1 and +1. When it is positive then any
         //                  positive rotation (by the right-hand rule) about the roll-axis will effect a
         //                  (negative) torque around the yaw-axis, making it turn to the right--that is the
         //                  vehicle will lean into the turn, which is how real airplanes and motorcycle's work.
         //                  Negating the banking coefficient will make it so that the vehicle leans to the
-        //                  outside of the turn (not very "physical" but might allow interesting vehicles so why not?). 
+        //                  outside of the turn (not very "physical" but might allow interesting vehicles so why not?).
         //           The VEHICLE_BANKING_MIX is a fake (i.e. non-physical) parameter that is useful for making
         //                  banking vehicles do what you want rather than what the laws of physics allow.
         //                  For example, consider a real motorcycle...it must be moving forward in order for
@@ -1465,14 +1609,14 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         //                  totally static (0.0) and totally dynamic (1.0). By "static" we mean that the
         //                  banking effect depends only on the vehicle's rotation about its roll-axis compared
         //                  to "dynamic" where the banking is also proportional to its velocity along its
-        //                  roll-axis. Finding the best value of the "mixture" will probably require trial and error. 
+        //                  roll-axis. Finding the best value of the "mixture" will probably require trial and error.
         //      The time it takes for the banking behavior to defeat a preexisting angular velocity about the
         //      world z-axis is determined by the VEHICLE_BANKING_TIMESCALE. So if you want the vehicle to
         //      bank quickly then give it a banking timescale of about a second or less, otherwise you can
-        //      make a sluggish vehicle by giving it a timescale of several seconds. 
+        //      make a sluggish vehicle by giving it a timescale of several seconds.
         public void ComputeAngularBanking()
         {
-            if (enableAngularBanking && m_bankingEfficiency != 0 && m_verticalAttractionTimescale < m_verticalAttractionCutoff)
+            if (BSParam.VehicleEnableAngularBanking && m_bankingEfficiency != 0 && m_verticalAttractionTimescale < m_verticalAttractionCutoff)
             {
                 Vector3 bankingContributionV = Vector3.Zero;
 
@@ -1498,10 +1642,10 @@ namespace OpenSim.Region.Physics.BulletSPlugin
 
                 //VehicleRotationalVelocity += bankingContributionV * VehicleOrientation;
                 VehicleRotationalVelocity += bankingContributionV;
-                
+
 
                 VDetailLog("{0},  MoveAngular,Banking,rollComp={1},speed={2},rollComp={3},yAng={4},mYAng={5},ret={6}",
-                            Prim.LocalID, rollComponents, VehicleForwardSpeed, rollComponents, yawAngle, mixedYawAngle, bankingContributionV);
+                            ControllingPrim.LocalID, rollComponents, VehicleForwardSpeed, rollComponents, yawAngle, mixedYawAngle, bankingContributionV);
             }
         }
 
@@ -1540,8 +1684,37 @@ namespace OpenSim.Region.Physics.BulletSPlugin
             if (rotq != m_rot)
             {
                 VehicleOrientation = m_rot;
-                VDetailLog("{0},  LimitRotation,done,orig={1},new={2}", Prim.LocalID, rotq, m_rot);
+                VDetailLog("{0},  LimitRotation,done,orig={1},new={2}", ControllingPrim.LocalID, rotq, m_rot);
+            }
+
+        }
+
+        // Given a friction vector (reduction in seconds) and a timestep, return the factor to reduce
+        //     some value by to apply this friction.
+        private Vector3 ComputeFrictionFactor(Vector3 friction, float pTimestep)
+        {
+            Vector3 frictionFactor = Vector3.Zero;
+            if (friction != BSMotor.InfiniteVector)
+            {
+                // frictionFactor = (Vector3.One / FrictionTimescale) * timeStep;
+                // Individual friction components can be 'infinite' so compute each separately.
+                frictionFactor.X = (friction.X == BSMotor.Infinite) ? 0f : (1f / friction.X);
+                frictionFactor.Y = (friction.Y == BSMotor.Infinite) ? 0f : (1f / friction.Y);
+                frictionFactor.Z = (friction.Z == BSMotor.Infinite) ? 0f : (1f / friction.Z);
+                frictionFactor *= pTimestep;
+            }
+            return frictionFactor;
+        }
+
+        private float SortedClampInRange(float clampa, float val, float clampb)
+        {
+            if (clampa > clampb)
+            {
+                float temp = clampa;
+                clampa = clampb;
+                clampb = temp;
             }
+           return ClampInRange(clampa, val, clampb);
 
         }
 
@@ -1554,8 +1727,8 @@ namespace OpenSim.Region.Physics.BulletSPlugin
         // Invoke the detailed logger and output something if it's enabled.
         private void VDetailLog(string msg, params Object[] args)
         {
-            if (Prim.PhysicsScene.VehicleLoggingEnabled)
-                Prim.PhysicsScene.DetailLog(msg, args);
+            if (ControllingPrim.PhysScene.VehicleLoggingEnabled)
+                ControllingPrim.PhysScene.DetailLog(msg, args);
         }
     }
 }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
index 4ece1eb..3afd52e 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
@@ -33,14 +33,6 @@ using OMV = OpenMetaverse;
 namespace OpenSim.Region.Physics.BulletSPlugin
 {
 
-// A BSPrim can get individual information about its linkedness attached
-//    to it through an instance of a subclass of LinksetInfo.
-// Each type of linkset will define the information needed for its type.
-public abstract class BSLinksetInfo
-{
-    public virtual void Clear() { }
-}
-
 public abstract class BSLinkset
 {
     // private static string LogHeader = "[BULLETSIM LINKSET]";
@@ -56,15 +48,15 @@ public abstract class BSLinkset
     {
         BSLinkset ret = null;
 
-        switch ((int)BSParam.LinksetImplementation)
+        switch (parent.LinksetType)
         {
-            case (int)LinksetImplementation.Constraint:
+            case LinksetImplementation.Constraint:
                 ret = new BSLinksetConstraints(physScene, parent);
                 break;
-            case (int)LinksetImplementation.Compound:
+            case LinksetImplementation.Compound:
                 ret = new BSLinksetCompound(physScene, parent);
                 break;
-            case (int)LinksetImplementation.Manual:
+            case LinksetImplementation.Manual:
                 // ret = new BSLinksetManual(physScene, parent);
                 break;
             default:
@@ -78,28 +70,33 @@ public abstract class BSLinkset
         return ret;
     }
 
+    public class BSLinkInfo
+    {
+        public BSPrimLinkable member;
+        public BSLinkInfo(BSPrimLinkable pMember)
+        {
+            member = pMember;
+        }
+    }
+
+    public LinksetImplementation LinksetImpl { get; protected set; }
+
     public BSPrimLinkable LinksetRoot { get; protected set; }
 
-    public BSScene PhysicsScene { get; private set; }
+    protected BSScene m_physicsScene { get; private set; }
 
     static int m_nextLinksetID = 1;
     public int LinksetID { get; private set; }
 
     // The children under the root in this linkset.
-    protected HashSet<BSPrimLinkable> m_children;
+    // protected HashSet<BSPrimLinkable> m_children;
+    protected Dictionary<BSPrimLinkable, BSLinkInfo> m_children;
 
     // We lock the diddling of linkset classes to prevent any badness.
     // This locks the modification of the instances of this class. Changes
     //    to the physical representation is done via the tainting mechenism.
     protected object m_linksetActivityLock = new Object();
 
-    // Some linksets have a preferred physical shape.
-    // Returns SHAPE_UNKNOWN if there is no preference. Causes the correct shape to be selected.
-    public virtual BSPhysicsShapeType PreferredPhysicalShape(BSPrimLinkable requestor)
-    {
-        return BSPhysicsShapeType.SHAPE_UNKNOWN;
-    }
-
     // We keep the prim's mass in the linkset structure since it could be dependent on other prims
     public float LinksetMass { get; protected set; }
 
@@ -122,9 +119,9 @@ public abstract class BSLinkset
         // We create LOTS of linksets.
         if (m_nextLinksetID <= 0)
             m_nextLinksetID = 1;
-        PhysicsScene = scene;
+        m_physicsScene = scene;
         LinksetRoot = parent;
-        m_children = new HashSet<BSPrimLinkable>();
+        m_children = new Dictionary<BSPrimLinkable, BSLinkInfo>();
         LinksetMass = parent.RawMass;
         Rebuilding = false;
 
@@ -165,7 +162,7 @@ public abstract class BSLinkset
         }
 
         // The child is down to a linkset of just itself
-        return BSLinkset.Factory(PhysicsScene, child);
+        return BSLinkset.Factory(m_physicsScene, child);
     }
 
     // Return 'true' if the passed object is the root object of this linkset
@@ -185,17 +182,7 @@ public abstract class BSLinkset
         bool ret = false;
         lock (m_linksetActivityLock)
         {
-            ret = m_children.Contains(child);
-            /* Safer version but the above should work
-            foreach (BSPrimLinkable bp in m_children)
-            {
-                if (child.LocalID == bp.LocalID)
-                {
-                    ret = true;
-                    break;
-                }
-            }
-             */
+            ret = m_children.ContainsKey(child);
         }
         return ret;
     }
@@ -209,7 +196,24 @@ public abstract class BSLinkset
         lock (m_linksetActivityLock)
         {
             action(LinksetRoot);
-            foreach (BSPrimLinkable po in m_children)
+            foreach (BSPrimLinkable po in m_children.Keys)
+            {
+                if (action(po))
+                    break;
+            }
+        }
+        return ret;
+    }
+
+    // Perform an action on each member of the linkset including root prim.
+    // Depends on the action on whether this should be done at taint time.
+    public delegate bool ForEachLinkInfoAction(BSLinkInfo obj);
+    public virtual bool ForEachLinkInfo(ForEachLinkInfoAction action)
+    {
+        bool ret = false;
+        lock (m_linksetActivityLock)
+        {
+            foreach (BSLinkInfo po in m_children.Values)
             {
                 if (action(po))
                     break;
@@ -218,10 +222,37 @@ public abstract class BSLinkset
         return ret;
     }
 
+    // Called after a simulation step to post a collision with this object.
+    // Return 'true' if linkset processed the collision. 'false' says the linkset didn't have
+    //     anything to add for the collision and it should be passed through normal processing.
+    // Default processing for a linkset.
+    public virtual bool HandleCollide(uint collidingWith, BSPhysObject collidee,
+                                OMV.Vector3 contactPoint, OMV.Vector3 contactNormal, float pentrationDepth)
+    {
+        bool ret = false;
+
+        // prims in the same linkset cannot collide with each other
+        BSPrimLinkable convCollidee = collidee as BSPrimLinkable;
+        if (convCollidee != null && (LinksetID == convCollidee.Linkset.LinksetID))
+        {
+            // By returning 'true', we tell the caller the collision has been 'handled' so it won't
+            //     do anything about this collision and thus, effectivily, ignoring the collision.
+            ret = true;
+        }
+        else
+        {
+            // Not a collision between members of the linkset. Must be a real collision.
+            // So the linkset root can know if there is a collision anywhere in the linkset.
+            LinksetRoot.SomeCollisionSimulationStep = m_physicsScene.SimulationStep;
+        }
+
+        return ret;
+    }
+
     // I am the root of a linkset and a new child is being added
     // Called while LinkActivity is locked.
     protected abstract void AddChildToLinkset(BSPrimLinkable child);
-    
+
     // I am the root of a linkset and one of my children is being removed.
     // Safe to call even if the child is not really in my linkset.
     protected abstract void RemoveChildFromLinkset(BSPrimLinkable child);
@@ -263,8 +294,87 @@ public abstract class BSLinkset
     // This is called when the root body is changing.
     // Returns 'true' of something was actually removed and would need restoring
     // Called at taint-time!!
-    public abstract bool RemoveBodyDependencies(BSPrimLinkable child);
+    public abstract bool RemoveDependencies(BSPrimLinkable child);
+
+    // ================================================================
+    // Some physical setting happen to all members of the linkset
+    public virtual void SetPhysicalFriction(float friction)
+    {
+        ForEachMember((member) =>
+            {
+                if (member.PhysBody.HasPhysicalBody)
+                    m_physicsScene.PE.SetFriction(member.PhysBody, friction);
+                return false;   // 'false' says to continue looping
+            }
+        );
+    }
+    public virtual void SetPhysicalRestitution(float restitution)
+    {
+        ForEachMember((member) =>
+            {
+                if (member.PhysBody.HasPhysicalBody)
+                    m_physicsScene.PE.SetRestitution(member.PhysBody, restitution);
+                return false;   // 'false' says to continue looping
+            }
+        );
+    }
+    public virtual void SetPhysicalGravity(OMV.Vector3 gravity)
+    {
+        ForEachMember((member) =>
+            {
+                if (member.PhysBody.HasPhysicalBody)
+                    m_physicsScene.PE.SetGravity(member.PhysBody, gravity);
+                return false;   // 'false' says to continue looping
+            }
+        );
+    }
+    public virtual void ComputeAndSetLocalInertia(OMV.Vector3 inertiaFactor, float linksetMass)
+    {
+        ForEachMember((member) =>
+            {
+                if (member.PhysBody.HasPhysicalBody)
+                {
+                    OMV.Vector3 inertia = m_physicsScene.PE.CalculateLocalInertia(member.PhysShape.physShapeInfo, linksetMass);
+                    member.Inertia = inertia * inertiaFactor;
+                    m_physicsScene.PE.SetMassProps(member.PhysBody, linksetMass, member.Inertia);
+                    m_physicsScene.PE.UpdateInertiaTensor(member.PhysBody);
+                    DetailLog("{0},BSLinkset.ComputeAndSetLocalInertia,m.mass={1}, inertia={2}", member.LocalID, linksetMass, member.Inertia);
 
+                }
+                return false;   // 'false' says to continue looping
+            }
+        );
+    }
+    public virtual void SetPhysicalCollisionFlags(CollisionFlags collFlags)
+    {
+        ForEachMember((member) =>
+            {
+                if (member.PhysBody.HasPhysicalBody)
+                    m_physicsScene.PE.SetCollisionFlags(member.PhysBody, collFlags);
+                return false;   // 'false' says to continue looping
+            }
+        );
+    }
+    public virtual void AddToPhysicalCollisionFlags(CollisionFlags collFlags)
+    {
+        ForEachMember((member) =>
+            {
+                if (member.PhysBody.HasPhysicalBody)
+                    m_physicsScene.PE.AddToCollisionFlags(member.PhysBody, collFlags);
+                return false;   // 'false' says to continue looping
+            }
+        );
+    }
+    public virtual void RemoveFromPhysicalCollisionFlags(CollisionFlags collFlags)
+    {
+        ForEachMember((member) =>
+            {
+                if (member.PhysBody.HasPhysicalBody)
+                    m_physicsScene.PE.RemoveFromCollisionFlags(member.PhysBody, collFlags);
+                return false;   // 'false' says to continue looping
+            }
+        );
+    }
     // ================================================================
     protected virtual float ComputeLinksetMass()
     {
@@ -273,7 +383,7 @@ public abstract class BSLinkset
         {
             lock (m_linksetActivityLock)
             {
-                foreach (BSPrimLinkable bp in m_children)
+                foreach (BSPrimLinkable bp in m_children.Keys)
                 {
                     mass += bp.RawMass;
                 }
@@ -291,7 +401,7 @@ public abstract class BSLinkset
             com = LinksetRoot.Position * LinksetRoot.RawMass;
             float totalMass = LinksetRoot.RawMass;
 
-            foreach (BSPrimLinkable bp in m_children)
+            foreach (BSPrimLinkable bp in m_children.Keys)
             {
                 com += bp.Position * bp.RawMass;
                 totalMass += bp.RawMass;
@@ -310,7 +420,7 @@ public abstract class BSLinkset
         {
             com = LinksetRoot.Position;
 
-            foreach (BSPrimLinkable bp in m_children)
+            foreach (BSPrimLinkable bp in m_children.Keys)
             {
                 com += bp.Position;
             }
@@ -323,9 +433,8 @@ public abstract class BSLinkset
     // Invoke the detailed logger and output something if it's enabled.
     protected void DetailLog(string msg, params Object[] args)
     {
-        if (PhysicsScene.PhysicsLogging.Enabled)
-            PhysicsScene.DetailLog(msg, args);
+        if (m_physicsScene.PhysicsLogging.Enabled)
+            m_physicsScene.DetailLog(msg, args);
     }
-
 }
 }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
index e05562a..085d195 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
@@ -35,81 +35,56 @@ using OMV = OpenMetaverse;
 namespace OpenSim.Region.Physics.BulletSPlugin
 {
 
-// When a child is linked, the relationship position of the child to the parent
-//    is remembered so the child's world position can be recomputed when it is
-//    removed from the linkset.
-sealed class BSLinksetCompoundInfo : BSLinksetInfo
+public sealed class BSLinksetCompound : BSLinkset
 {
-    public int Index;
-    public OMV.Vector3 OffsetFromRoot;
-    public OMV.Vector3 OffsetFromCenterOfMass;
-    public OMV.Quaternion OffsetRot;
-    public BSLinksetCompoundInfo(int indx, OMV.Vector3 p, OMV.Quaternion r)
+    private static string LogHeader = "[BULLETSIM LINKSET COMPOUND]";
+
+    public BSLinksetCompound(BSScene scene, BSPrimLinkable parent)
+        : base(scene, parent)
     {
-        Index = indx;
-        OffsetFromRoot = p;
-        OffsetFromCenterOfMass = p;
-        OffsetRot = r;
+        LinksetImpl = LinksetImplementation.Compound;
     }
-    // 'centerDisplacement' is the distance from the root the the center-of-mass (Bullet 'zero' of the shape)
-    public BSLinksetCompoundInfo(int indx, BSPrimLinkable root, BSPrimLinkable child, OMV.Vector3 centerDisplacement)
+
+    // ================================================================
+    // Changing the physical property of the linkset only needs to change the root
+    public override void SetPhysicalFriction(float friction)
     {
-        // Each child position and rotation is given relative to the center-of-mass.
-        OMV.Quaternion invRootOrientation = OMV.Quaternion.Inverse(root.RawOrientation);
-        OMV.Vector3 displacementFromRoot = (child.RawPosition - root.RawPosition) * invRootOrientation;
-        OMV.Vector3 displacementFromCOM = displacementFromRoot - centerDisplacement;
-        OMV.Quaternion displacementRot = child.RawOrientation * invRootOrientation;
-
-        // Save relative position for recomputing child's world position after moving linkset.
-        Index = indx;
-        OffsetFromRoot = displacementFromRoot;
-        OffsetFromCenterOfMass = displacementFromCOM;
-        OffsetRot = displacementRot;
+        if (LinksetRoot.PhysBody.HasPhysicalBody)
+            m_physicsScene.PE.SetFriction(LinksetRoot.PhysBody, friction);
     }
-    public override void Clear()
+    public override void SetPhysicalRestitution(float restitution)
     {
-        Index = 0;
-        OffsetFromRoot = OMV.Vector3.Zero;
-        OffsetFromCenterOfMass = OMV.Vector3.Zero;
-        OffsetRot = OMV.Quaternion.Identity;
+        if (LinksetRoot.PhysBody.HasPhysicalBody)
+            m_physicsScene.PE.SetRestitution(LinksetRoot.PhysBody, restitution);
     }
-    public override string ToString()
+    public override void SetPhysicalGravity(OMV.Vector3 gravity)
     {
-        StringBuilder buff = new StringBuilder();
-        buff.Append("<i=");
-        buff.Append(Index.ToString());
-        buff.Append(",p=");
-        buff.Append(OffsetFromRoot.ToString());
-        buff.Append(",m=");
-        buff.Append(OffsetFromCenterOfMass.ToString());
-        buff.Append(",r=");
-        buff.Append(OffsetRot.ToString());
-        buff.Append(">");
-        return buff.ToString();
+        if (LinksetRoot.PhysBody.HasPhysicalBody)
+            m_physicsScene.PE.SetGravity(LinksetRoot.PhysBody, gravity);
     }
-};
-
-public sealed class BSLinksetCompound : BSLinkset
-{
-    private static string LogHeader = "[BULLETSIM LINKSET COMPOUND]";
-
-    public BSLinksetCompound(BSScene scene, BSPrimLinkable parent)
-        : base(scene, parent)
+    public override void ComputeAndSetLocalInertia(OMV.Vector3 inertiaFactor, float linksetMass)
     {
+        OMV.Vector3 inertia = m_physicsScene.PE.CalculateLocalInertia(LinksetRoot.PhysShape.physShapeInfo, linksetMass);
+        LinksetRoot.Inertia = inertia * inertiaFactor;
+        m_physicsScene.PE.SetMassProps(LinksetRoot.PhysBody, linksetMass, LinksetRoot.Inertia);
+        m_physicsScene.PE.UpdateInertiaTensor(LinksetRoot.PhysBody);
     }
-
-    // For compound implimented linksets, if there are children, use compound shape for the root.
-    public override BSPhysicsShapeType PreferredPhysicalShape(BSPrimLinkable requestor)
-    { 
-        // Returning 'unknown' means we don't have a preference.
-        BSPhysicsShapeType ret = BSPhysicsShapeType.SHAPE_UNKNOWN;
-        if (IsRoot(requestor) && HasAnyChildren)
-        {
-            ret = BSPhysicsShapeType.SHAPE_COMPOUND;
-        }
-        // DetailLog("{0},BSLinksetCompound.PreferredPhysicalShape,call,shape={1}", LinksetRoot.LocalID, ret);
-        return ret;
+    public override void SetPhysicalCollisionFlags(CollisionFlags collFlags)
+    {
+        if (LinksetRoot.PhysBody.HasPhysicalBody)
+            m_physicsScene.PE.SetCollisionFlags(LinksetRoot.PhysBody, collFlags);
+    }
+    public override void AddToPhysicalCollisionFlags(CollisionFlags collFlags)
+    {
+        if (LinksetRoot.PhysBody.HasPhysicalBody)
+            m_physicsScene.PE.AddToCollisionFlags(LinksetRoot.PhysBody, collFlags);
+    }
+    public override void RemoveFromPhysicalCollisionFlags(CollisionFlags collFlags)
+    {
+        if (LinksetRoot.PhysBody.HasPhysicalBody)
+            m_physicsScene.PE.RemoveFromCollisionFlags(LinksetRoot.PhysBody, collFlags);
     }
+    // ================================================================
 
     // When physical properties are changed the linkset needs to recalculate
     //   its internal properties.
@@ -124,14 +99,15 @@ public sealed class BSLinksetCompound : BSLinkset
     // Schedule a refresh to happen after all the other taint processing.
     private void ScheduleRebuild(BSPrimLinkable requestor)
     {
-        DetailLog("{0},BSLinksetCompound.ScheduleRebuild,,rebuilding={1},hasChildren={2},actuallyScheduling={3}", 
+        DetailLog("{0},BSLinksetCompound.ScheduleRebuild,,rebuilding={1},hasChildren={2},actuallyScheduling={3}",
                             requestor.LocalID, Rebuilding, HasAnyChildren, (!Rebuilding && HasAnyChildren));
+
         // When rebuilding, it is possible to set properties that would normally require a rebuild.
         //    If already rebuilding, don't request another rebuild.
         //    If a linkset with just a root prim (simple non-linked prim) don't bother rebuilding.
         if (!Rebuilding && HasAnyChildren)
         {
-            PhysicsScene.PostTaintObject("BSLinksetCompound.ScheduleRebuild", LinksetRoot.LocalID, delegate()
+            m_physicsScene.PostTaintObject("BSLinksetCompound.ScheduleRebuild", LinksetRoot.LocalID, delegate()
             {
                 if (HasAnyChildren)
                     RecomputeLinksetCompound();
@@ -153,46 +129,23 @@ public sealed class BSLinksetCompound : BSLinkset
             // The root is going dynamic. Rebuild the linkset so parts and mass get computed properly.
             ScheduleRebuild(LinksetRoot);
         }
-        else
-        {
-            // The origional prims are removed from the world as the shape of the root compound
-            //     shape takes over.
-            PhysicsScene.PE.AddToCollisionFlags(child.PhysBody, CollisionFlags.CF_NO_CONTACT_RESPONSE);
-            PhysicsScene.PE.ForceActivationState(child.PhysBody, ActivationState.DISABLE_SIMULATION);
-            // We don't want collisions from the old linkset children.
-            PhysicsScene.PE.RemoveFromCollisionFlags(child.PhysBody, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
-
-            child.PhysBody.collisionType = CollisionType.LinksetChild;
-
-            ret = true;
-        }
         return ret;
     }
 
-    // The object is going static (non-physical). Do any setup necessary for a static linkset.
+    // The object is going static (non-physical). We do not do anything for static linksets.
     // Return 'true' if any properties updated on the passed object.
-    // This doesn't normally happen -- OpenSim removes the objects from the physical
-    //     world if it is a static linkset.
     // Called at taint-time!
     public override bool MakeStatic(BSPrimLinkable child)
     {
         bool ret = false;
+
         DetailLog("{0},BSLinksetCompound.MakeStatic,call,IsRoot={1}", child.LocalID, IsRoot(child));
+        child.ClearDisplacement();
         if (IsRoot(child))
         {
+            // Schedule a rebuild to verify that the root shape is set to the real shape.
             ScheduleRebuild(LinksetRoot);
         }
-        else
-        {
-            // The non-physical children can come back to life.
-            PhysicsScene.PE.RemoveFromCollisionFlags(child.PhysBody, CollisionFlags.CF_NO_CONTACT_RESPONSE);
-
-            child.PhysBody.collisionType = CollisionType.LinksetChild;
-
-            // Don't force activation so setting of DISABLE_SIMULATION can stay if used.
-            PhysicsScene.PE.Activate(child.PhysBody, false);
-            ret = true;
-        }
         return ret;
     }
 
@@ -200,13 +153,20 @@ public sealed class BSLinksetCompound : BSLinkset
     // Called at taint-time.
     public override void UpdateProperties(UpdatedProperties whichUpdated, BSPrimLinkable updated)
     {
+        if (!LinksetRoot.IsPhysicallyActive)
+        {
+            // No reason to do this physical stuff for static linksets.
+            DetailLog("{0},BSLinksetCompound.UpdateProperties,notPhysical", LinksetRoot.LocalID);
+            return;
+        }
+
         // The user moving a child around requires the rebuilding of the linkset compound shape
         // One problem is this happens when a border is crossed -- the simulator implementation
         //    stores the position into the group which causes the move of the object
         //    but it also means all the child positions get updated.
         //    What would cause an unnecessary rebuild so we make sure the linkset is in a
         //    region before bothering to do a rebuild.
-        if (!IsRoot(updated) && PhysicsScene.TerrainManager.IsWithinKnownTerrain(LinksetRoot.RawPosition))
+        if (!IsRoot(updated) && m_physicsScene.TerrainManager.IsWithinKnownTerrain(LinksetRoot.RawPosition))
         {
             // If a child of the linkset is updating only the position or rotation, that can be done
             //    without rebuilding the linkset.
@@ -218,22 +178,22 @@ public sealed class BSLinksetCompound : BSLinkset
             //     and that is caused by us updating the object.
             if ((whichUpdated & ~(UpdatedProperties.Position | UpdatedProperties.Orientation)) == 0)
             {
-                    // Find the physical instance of the child 
-                if (LinksetRoot.PhysShape.HasPhysicalShape && PhysicsScene.PE.IsCompound(LinksetRoot.PhysShape))
+                // Find the physical instance of the child
+                if (LinksetRoot.PhysShape.HasPhysicalShape && m_physicsScene.PE.IsCompound(LinksetRoot.PhysShape.physShapeInfo))
                 {
                     // It is possible that the linkset is still under construction and the child is not yet
                     //    inserted into the compound shape. A rebuild of the linkset in a pre-step action will
                     //    build the whole thing with the new position or rotation.
                     // The index must be checked because Bullet references the child array but does no validity
                     //    checking of the child index passed.
-                    int numLinksetChildren = PhysicsScene.PE.GetNumberOfCompoundChildren(LinksetRoot.PhysShape);
+                    int numLinksetChildren = m_physicsScene.PE.GetNumberOfCompoundChildren(LinksetRoot.PhysShape.physShapeInfo);
                     if (updated.LinksetChildIndex < numLinksetChildren)
                     {
-                        BulletShape linksetChildShape = PhysicsScene.PE.GetChildShapeFromCompoundShapeIndex(LinksetRoot.PhysShape, updated.LinksetChildIndex);
+                        BulletShape linksetChildShape = m_physicsScene.PE.GetChildShapeFromCompoundShapeIndex(LinksetRoot.PhysShape.physShapeInfo, updated.LinksetChildIndex);
                         if (linksetChildShape.HasPhysicalShape)
                         {
                             // Found the child shape within the compound shape
-                            PhysicsScene.PE.UpdateChildTransform(LinksetRoot.PhysShape, updated.LinksetChildIndex,
+                            m_physicsScene.PE.UpdateChildTransform(LinksetRoot.PhysShape.physShapeInfo, updated.LinksetChildIndex,
                                                                         updated.RawPosition - LinksetRoot.RawPosition,
                                                                         updated.RawOrientation * OMV.Quaternion.Inverse(LinksetRoot.RawOrientation),
                                                                         true /* shouldRecalculateLocalAabb */);
@@ -267,7 +227,6 @@ public sealed class BSLinksetCompound : BSLinkset
                     //    there will already be a rebuild scheduled.
                     DetailLog("{0},BSLinksetCompound.UpdateProperties,couldNotUpdateChild.schedulingRebuild,whichUpdated={1}",
                                                                     updated.LocalID, whichUpdated);
-                    updated.LinksetInfo = null; // setting to 'null' causes relative position to be recomputed.
                     ScheduleRebuild(updated);
                 }
             }
@@ -275,75 +234,22 @@ public sealed class BSLinksetCompound : BSLinkset
     }
 
     // Routine called when rebuilding the body of some member of the linkset.
-    // Since we don't keep in world relationships, do nothing unless it's a child changing.
+    // If one of the bodies is being changed, the linkset needs rebuilding.
+    // For instance, a linkset is built and then a mesh asset is read in and the mesh is recreated.
     // Returns 'true' of something was actually removed and would need restoring
     // Called at taint-time!!
-    public override bool RemoveBodyDependencies(BSPrimLinkable child)
+    public override bool RemoveDependencies(BSPrimLinkable child)
     {
         bool ret = false;
 
         DetailLog("{0},BSLinksetCompound.RemoveBodyDependencies,refreshIfChild,rID={1},rBody={2},isRoot={3}",
                         child.LocalID, LinksetRoot.LocalID, LinksetRoot.PhysBody, IsRoot(child));
 
-        if (!IsRoot(child))
-        {
-            // Because it is a convenient time, recompute child world position and rotation based on
-            //    its position in the linkset.
-            RecomputeChildWorldPosition(child, true /* inTaintTime */);
-            child.LinksetInfo = null;
-        }
-
-        // Cannot schedule a refresh/rebuild here because this routine is called when
-        //     the linkset is being rebuilt.
-        // InternalRefresh(LinksetRoot);
+        ScheduleRebuild(child);
 
         return ret;
     }
 
-    // When the linkset is built, the child shape is added to the compound shape relative to the
-    //    root shape. The linkset then moves around but this does not move the actual child
-    //    prim. The child prim's location must be recomputed based on the location of the root shape.
-    private void RecomputeChildWorldPosition(BSPrimLinkable child, bool inTaintTime)
-    {
-        // For the moment (20130201), disable this computation (converting the child physical addr back to
-        //    a region address) until we have a good handle on center-of-mass offsets and what the physics
-        //    engine moving a child actually means.
-        // The simulator keeps track of where children should be as the linkset moves. Setting
-        //    the pos/rot here does not effect that knowledge as there is no good way for the
-        //    physics engine to send the simulator an update for a child.
-
-        /*
-        BSLinksetCompoundInfo lci = child.LinksetInfo as BSLinksetCompoundInfo;
-        if (lci != null)
-        {
-            if (inTaintTime)
-            {
-                OMV.Vector3 oldPos = child.RawPosition;
-                child.ForcePosition = LinksetRoot.RawPosition + lci.OffsetFromRoot;
-                child.ForceOrientation = LinksetRoot.RawOrientation * lci.OffsetRot;
-                DetailLog("{0},BSLinksetCompound.RecomputeChildWorldPosition,oldPos={1},lci={2},newPos={3}",
-                                            child.LocalID, oldPos, lci, child.RawPosition);
-            }
-            else
-            {
-                // TaintedObject is not used here so the raw position is set now and not at taint-time.
-                child.Position = LinksetRoot.RawPosition + lci.OffsetFromRoot;
-                child.Orientation = LinksetRoot.RawOrientation * lci.OffsetRot;
-            }
-        }
-        else
-        {
-            // This happens when children have been added to the linkset but the linkset
-            //     has not been constructed yet. So like, at taint time, adding children to a linkset
-            //     and then changing properties of the children (makePhysical, for instance)
-            //     but the post-print action of actually rebuilding the linkset has not yet happened.
-            // PhysicsScene.Logger.WarnFormat("{0} Restoring linkset child position failed because of no relative position computed. ID={1}",
-            //                                 LogHeader, child.LocalID);
-            DetailLog("{0},BSLinksetCompound.recomputeChildWorldPosition,noRelativePositonInfo", child.LocalID);
-        }
-        */
-    }
-
     // ================================================================
 
     // Add a new child to the linkset.
@@ -352,7 +258,7 @@ public sealed class BSLinksetCompound : BSLinkset
     {
         if (!HasChild(child))
         {
-            m_children.Add(child);
+            m_children.Add(child, new BSLinkInfo(child));
 
             DetailLog("{0},BSLinksetCompound.AddChildToLinkset,call,child={1}", LinksetRoot.LocalID, child.LocalID);
 
@@ -376,8 +282,6 @@ public sealed class BSLinksetCompound : BSLinkset
                             child.LocalID, child.PhysBody.AddrString);
 
             // Cause the child's body to be rebuilt and thus restored to normal operation
-            RecomputeChildWorldPosition(child, false);
-            child.LinksetInfo = null;
             child.ForceBodyShapeRebuild(false);
 
             if (!HasAnyChildren)
@@ -399,108 +303,118 @@ public sealed class BSLinksetCompound : BSLinkset
     // Constraint linksets are rebuilt every time.
     // Note that this works for rebuilding just the root after a linkset is taken apart.
     // Called at taint time!!
-    private bool disableCOM = true;     // DEBUG DEBUG: disable until we get this debugged
+    private bool UseBulletSimRootOffsetHack = false;    // Attempt to have Bullet track the coords of root compound shape
     private void RecomputeLinksetCompound()
     {
         try
         {
-            // Suppress rebuilding while rebuilding. (We know rebuilding is on only one thread.)
             Rebuilding = true;
 
-            // Cause the root shape to be rebuilt as a compound object with just the root in it
-            LinksetRoot.ForceBodyShapeRebuild(true /* inTaintTime */);
+            // No matter what is being done, force the root prim's PhysBody and PhysShape to get set
+            //     to what they should be as if the root was not in a linkset.
+            // Not that bad since we only get into this routine if there are children in the linkset and
+            //     something has been updated/changed.
+            // Have to do the rebuild before checking for physical because this might be a linkset
+            //     being destructed and going non-physical.
+            LinksetRoot.ForceBodyShapeRebuild(true);
 
-            // The center of mass for the linkset is the geometric center of the group.
-            // Compute a displacement for each component so it is relative to the center-of-mass.
-            // Bullet presumes an object's origin (relative <0,0,0>) is its center-of-mass
-            OMV.Vector3 centerOfMassW = LinksetRoot.RawPosition;
-            if (!disableCOM)                             // DEBUG DEBUG
+            // There is no reason to build all this physical stuff for a non-physical linkset.
+            if (!LinksetRoot.IsPhysicallyActive)
             {
-                // Compute a center-of-mass in world coordinates.
-                centerOfMassW = ComputeLinksetCenterOfMass();
+                DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,notPhysical", LinksetRoot.LocalID);
+                return; // Note the 'finally' clause at the botton which will get executed.
             }
 
-            OMV.Quaternion invRootOrientation = OMV.Quaternion.Inverse(LinksetRoot.RawOrientation);
+            // Get a new compound shape to build the linkset shape in.
+            BSShape linksetShape = BSShapeCompound.GetReference(m_physicsScene);
 
-            // 'centerDisplacement' is the value to subtract from children to give physical offset position
-            OMV.Vector3 centerDisplacement = (centerOfMassW - LinksetRoot.RawPosition) * invRootOrientation;
-            LinksetRoot.SetEffectiveCenterOfMassW(centerDisplacement);
-
-            // This causes the physical position of the root prim to be offset to accomodate for the displacements
-            LinksetRoot.ForcePosition = LinksetRoot.RawPosition;
+            // Compute a displacement for each component so it is relative to the center-of-mass.
+            // Bullet presumes an object's origin (relative <0,0,0>) is its center-of-mass
+            OMV.Vector3 centerOfMassW = ComputeLinksetCenterOfMass();
 
-            // Update the local transform for the root child shape so it is offset from the <0,0,0> which is COM
-            PhysicsScene.PE.UpdateChildTransform(LinksetRoot.PhysShape, 0 /* childIndex */,
-                                                -centerDisplacement,
-                                                OMV.Quaternion.Identity, // LinksetRoot.RawOrientation,
-                                                false /* shouldRecalculateLocalAabb (is done later after linkset built) */);
+            OMV.Quaternion invRootOrientation = OMV.Quaternion.Normalize(OMV.Quaternion.Inverse(LinksetRoot.RawOrientation));
+            OMV.Vector3 origRootPosition = LinksetRoot.RawPosition;
 
-            DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,COM,com={1},rootPos={2},centerDisp={3}",
-                                    LinksetRoot.LocalID, centerOfMassW, LinksetRoot.RawPosition, centerDisplacement);
+            // 'centerDisplacementV' is the vehicle relative distance from the simulator root position to the center-of-mass
+            OMV.Vector3 centerDisplacementV = (centerOfMassW - LinksetRoot.RawPosition) * invRootOrientation;
+            if (UseBulletSimRootOffsetHack || !BSParam.LinksetOffsetCenterOfMass)
+            {
+                // Zero everything if center-of-mass displacement is not being done.
+                centerDisplacementV = OMV.Vector3.Zero;
+                LinksetRoot.ClearDisplacement();
+            }
+            else
+            {
+                // The actual center-of-mass could have been set by the user.
+                centerDisplacementV = LinksetRoot.SetEffectiveCenterOfMassDisplacement(centerDisplacementV);
+            }
 
-            DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,start,rBody={1},rShape={2},numChildren={3}",
-                            LinksetRoot.LocalID, LinksetRoot.PhysBody, LinksetRoot.PhysShape, NumberOfChildren);
+            DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,COM,rootPos={1},com={2},comDisp={3}",
+                                LinksetRoot.LocalID, origRootPosition, centerOfMassW, centerDisplacementV);
 
-            // Add a shape for each of the other children in the linkset
+            // Add the shapes of all the components of the linkset
             int memberIndex = 1;
-            ForEachMember(delegate(BSPrimLinkable cPrim)
+            ForEachMember((cPrim) =>
             {
                 if (IsRoot(cPrim))
                 {
+                    // Root shape is always index zero.
                     cPrim.LinksetChildIndex = 0;
                 }
                 else
                 {
                     cPrim.LinksetChildIndex = memberIndex;
+                    memberIndex++;
+                }
 
-                    if (cPrim.PhysShape.isNativeShape)
-                    {
-                        // A native shape is turned into a hull collision shape because native
-                        //    shapes are not shared so we have to hullify it so it will be tracked
-                        //    and freed at the correct time. This also solves the scaling problem
-                        //    (native shapes scale but hull/meshes are assumed to not be).
-                        // TODO: decide of the native shape can just be used in the compound shape.
-                        //    Use call to CreateGeomNonSpecial().
-                        BulletShape saveShape = cPrim.PhysShape;
-                        cPrim.PhysShape.Clear();        // Don't let the create free the child's shape
-                        PhysicsScene.Shapes.CreateGeomMeshOrHull(cPrim, null);
-                        BulletShape newShape = cPrim.PhysShape;
-                        cPrim.PhysShape = saveShape;
-
-                        OMV.Vector3 offsetPos = (cPrim.RawPosition - LinksetRoot.RawPosition) * invRootOrientation - centerDisplacement;
-                        OMV.Quaternion offsetRot = cPrim.RawOrientation * invRootOrientation;
-                        PhysicsScene.PE.AddChildShapeToCompoundShape(LinksetRoot.PhysShape, newShape, offsetPos, offsetRot);
-                        DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,addNative,indx={1},rShape={2},cShape={3},offPos={4},offRot={5}",
-                                    LinksetRoot.LocalID, memberIndex, LinksetRoot.PhysShape, newShape, offsetPos, offsetRot);
-                    }
-                    else
-                    {
-                        // For the shared shapes (meshes and hulls), just use the shape in the child.
-                        // The reference count added here will be decremented when the compound shape
-                        //     is destroyed in BSShapeCollection (the child shapes are looped over and dereferenced).
-                        if (PhysicsScene.Shapes.ReferenceShape(cPrim.PhysShape))
-                        {
-                            PhysicsScene.Logger.ErrorFormat("{0} Rebuilt sharable shape when building linkset! Region={1}, primID={2}, shape={3}",
-                                                LogHeader, PhysicsScene.RegionName, cPrim.LocalID, cPrim.PhysShape);
-                        }
-                        OMV.Vector3 offsetPos = (cPrim.RawPosition - LinksetRoot.RawPosition) * invRootOrientation - centerDisplacement;
-                        OMV.Quaternion offsetRot = cPrim.RawOrientation * invRootOrientation;
-                        PhysicsScene.PE.AddChildShapeToCompoundShape(LinksetRoot.PhysShape, cPrim.PhysShape, offsetPos, offsetRot);
-                        DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,addNonNative,indx={1},rShape={2},cShape={3},offPos={4},offRot={5}",
-                                    LinksetRoot.LocalID, memberIndex, LinksetRoot.PhysShape, cPrim.PhysShape, offsetPos, offsetRot);
+                // Get a reference to the shape of the child for adding of that shape to the linkset compound shape
+                BSShape childShape = cPrim.PhysShape.GetReference(m_physicsScene, cPrim);
 
-                    }
-                    memberIndex++;
+                // Offset the child shape from the center-of-mass and rotate it to vehicle relative.
+                OMV.Vector3 offsetPos = (cPrim.RawPosition - origRootPosition) * invRootOrientation - centerDisplacementV;
+                OMV.Quaternion offsetRot = OMV.Quaternion.Normalize(cPrim.RawOrientation) * invRootOrientation;
+
+                // Add the child shape to the compound shape being built
+                m_physicsScene.PE.AddChildShapeToCompoundShape(linksetShape.physShapeInfo, childShape.physShapeInfo, offsetPos, offsetRot);
+                DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,addChild,indx={1},cShape={2},offPos={3},offRot={4}",
+                                    LinksetRoot.LocalID, cPrim.LinksetChildIndex, childShape, offsetPos, offsetRot);
+
+                // Since we are borrowing the shape of the child, disable the origional child body
+                if (!IsRoot(cPrim))
+                {
+                    m_physicsScene.PE.AddToCollisionFlags(cPrim.PhysBody, CollisionFlags.CF_NO_CONTACT_RESPONSE);
+                    m_physicsScene.PE.ForceActivationState(cPrim.PhysBody, ActivationState.DISABLE_SIMULATION);
+                    // We don't want collisions from the old linkset children.
+                    m_physicsScene.PE.RemoveFromCollisionFlags(cPrim.PhysBody, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
+                    cPrim.PhysBody.collisionType = CollisionType.LinksetChild;
                 }
+
                 return false;   // 'false' says to move onto the next child in the list
             });
 
+            // Replace the root shape with the built compound shape.
+            // Object removed and added to world to get collision cache rebuilt for new shape.
+            LinksetRoot.PhysShape.Dereference(m_physicsScene);
+            LinksetRoot.PhysShape = linksetShape;
+            m_physicsScene.PE.RemoveObjectFromWorld(m_physicsScene.World, LinksetRoot.PhysBody);
+            m_physicsScene.PE.SetCollisionShape(m_physicsScene.World, LinksetRoot.PhysBody, linksetShape.physShapeInfo);
+            m_physicsScene.PE.AddObjectToWorld(m_physicsScene.World, LinksetRoot.PhysBody);
+            DetailLog("{0},BSLinksetCompound.RecomputeLinksetCompound,addBody,body={1},shape={2}",
+                                        LinksetRoot.LocalID, LinksetRoot.PhysBody, linksetShape);
+
             // With all of the linkset packed into the root prim, it has the mass of everyone.
             LinksetMass = ComputeLinksetMass();
             LinksetRoot.UpdatePhysicalMassProperties(LinksetMass, true);
 
-            // Enable the physical position updator to return the position and rotation of the root shape
-            PhysicsScene.PE.AddToCollisionFlags(LinksetRoot.PhysBody, CollisionFlags.BS_RETURN_ROOT_COMPOUND_SHAPE);
+            if (UseBulletSimRootOffsetHack)
+            {
+                // Enable the physical position updator to return the position and rotation of the root shape.
+                // This enables a feature in the C++ code to return the world coordinates of the first shape in the
+                //     compound shape. This aleviates the need to offset the returned physical position by the
+                //     center-of-mass offset.
+                // TODO: either debug this feature or remove it.
+                m_physicsScene.PE.AddToCollisionFlags(LinksetRoot.PhysBody, CollisionFlags.BS_RETURN_ROOT_COMPOUND_SHAPE);
+            }
         }
         finally
         {
@@ -508,7 +422,7 @@ public sealed class BSLinksetCompound : BSLinkset
         }
 
         // See that the Aabb surrounds the new shape
-        PhysicsScene.PE.RecalculateCompoundShapeLocalAabb(LinksetRoot.PhysShape);
+        m_physicsScene.PE.RecalculateCompoundShapeLocalAabb(LinksetRoot.PhysShape.physShapeInfo);
     }
 }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
index 6d252ca..4bac222 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs
@@ -36,8 +36,78 @@ public sealed class BSLinksetConstraints : BSLinkset
 {
     // private static string LogHeader = "[BULLETSIM LINKSET CONSTRAINTS]";
 
+    public class BSLinkInfoConstraint : BSLinkInfo
+    {
+        public ConstraintType constraintType;
+        public BSConstraint constraint;
+        public OMV.Vector3 linearLimitLow;
+        public OMV.Vector3 linearLimitHigh;
+        public OMV.Vector3 angularLimitLow;
+        public OMV.Vector3 angularLimitHigh;
+        public bool useFrameOffset;
+        public bool enableTransMotor;
+        public float transMotorMaxVel;
+        public float transMotorMaxForce;
+        public float cfm;
+        public float erp;
+        public float solverIterations;
+
+        public BSLinkInfoConstraint(BSPrimLinkable pMember)
+            : base(pMember)
+        {
+            constraint = null;
+            ResetToFixedConstraint();
+        }
+
+        // Set all the parameters for this constraint to a fixed, non-movable constraint.
+        public void ResetToFixedConstraint()
+        {
+            constraintType = ConstraintType.D6_CONSTRAINT_TYPE;
+            linearLimitLow = OMV.Vector3.Zero;
+            linearLimitHigh = OMV.Vector3.Zero;
+            angularLimitLow = OMV.Vector3.Zero;
+            angularLimitHigh = OMV.Vector3.Zero;
+            useFrameOffset = BSParam.LinkConstraintUseFrameOffset;
+            enableTransMotor = BSParam.LinkConstraintEnableTransMotor;
+            transMotorMaxVel = BSParam.LinkConstraintTransMotorMaxVel;
+            transMotorMaxForce = BSParam.LinkConstraintTransMotorMaxForce;
+            cfm = BSParam.LinkConstraintCFM;
+            erp = BSParam.LinkConstraintERP;
+            solverIterations = BSParam.LinkConstraintSolverIterations;
+        }
+
+        // Given a constraint, apply the current constraint parameters to same.
+        public void SetConstraintParameters(BSConstraint constrain)
+        {
+            switch (constraintType)
+            {
+                case ConstraintType.D6_CONSTRAINT_TYPE:
+                    BSConstraint6Dof constrain6dof = constrain as BSConstraint6Dof;
+                    if (constrain6dof != null)
+                    {
+                        // zero linear and angular limits makes the objects unable to move in relation to each other
+                        constrain6dof.SetLinearLimits(linearLimitLow, linearLimitHigh);
+                        constrain6dof.SetAngularLimits(angularLimitLow, angularLimitHigh);
+
+                        // tweek the constraint to increase stability
+                        constrain6dof.UseFrameOffset(useFrameOffset);
+                        constrain6dof.TranslationalLimitMotor(enableTransMotor, transMotorMaxVel, transMotorMaxForce);
+                        constrain6dof.SetCFMAndERP(cfm, erp);
+                        if (solverIterations != 0f)
+                        {
+                            constrain6dof.SetSolverIterations(solverIterations);
+                        }
+                    }
+                    break;
+                default:
+                    break;
+            }
+        }
+    }
+
     public BSLinksetConstraints(BSScene scene, BSPrimLinkable parent) : base(scene, parent)
     {
+        LinksetImpl = LinksetImplementation.Constraint;
     }
 
     // When physical properties are changed the linkset needs to recalculate
@@ -48,12 +118,22 @@ public sealed class BSLinksetConstraints : BSLinkset
     {
         base.Refresh(requestor);
 
-        if (HasAnyChildren && IsRoot(requestor))
+    }
+
+    private void ScheduleRebuild(BSPrimLinkable requestor)
+    {
+        DetailLog("{0},BSLinksetConstraint.ScheduleRebuild,,rebuilding={1},hasChildren={2},actuallyScheduling={3}",
+                            requestor.LocalID, Rebuilding, HasAnyChildren, (!Rebuilding && HasAnyChildren));
+
+        // When rebuilding, it is possible to set properties that would normally require a rebuild.
+        //    If already rebuilding, don't request another rebuild.
+        //    If a linkset with just a root prim (simple non-linked prim) don't bother rebuilding.
+        if (!Rebuilding && HasAnyChildren)
         {
             // Queue to happen after all the other taint processing
-            PhysicsScene.PostTaintObject("BSLinksetContraints.Refresh", requestor.LocalID, delegate()
+            m_physicsScene.PostTaintObject("BSLinksetContraints.Refresh", requestor.LocalID, delegate()
                 {
-                    if (HasAnyChildren && IsRoot(requestor))
+                    if (HasAnyChildren)
                         RecomputeLinksetConstraints();
                 });
         }
@@ -67,8 +147,14 @@ public sealed class BSLinksetConstraints : BSLinkset
     // Called at taint-time!
     public override bool MakeDynamic(BSPrimLinkable child)
     {
-        // What is done for each object in BSPrim is what we want.
-        return false;
+        bool ret = false;
+        DetailLog("{0},BSLinksetConstraints.MakeDynamic,call,IsRoot={1}", child.LocalID, IsRoot(child));
+        if (IsRoot(child))
+        {
+            // The root is going dynamic. Rebuild the linkset so parts and mass get computed properly.
+            ScheduleRebuild(LinksetRoot);
+        }
+        return ret;
     }
 
     // The object is going static (non-physical). Do any setup necessary for a static linkset.
@@ -78,8 +164,16 @@ public sealed class BSLinksetConstraints : BSLinkset
     // Called at taint-time!
     public override bool MakeStatic(BSPrimLinkable child)
     {
-        // What is done for each object in BSPrim is what we want.
-        return false;
+        bool ret = false;
+
+        DetailLog("{0},BSLinksetConstraint.MakeStatic,call,IsRoot={1}", child.LocalID, IsRoot(child));
+        child.ClearDisplacement();
+        if (IsRoot(child))
+        {
+            // Schedule a rebuild to verify that the root shape is set to the real shape.
+            ScheduleRebuild(LinksetRoot);
+        }
+        return ret;
     }
 
     // Called at taint-time!!
@@ -93,11 +187,11 @@ public sealed class BSLinksetConstraints : BSLinkset
     //     up to rebuild the constraints before the next simulation step.
     // Returns 'true' of something was actually removed and would need restoring
     // Called at taint-time!!
-    public override bool RemoveBodyDependencies(BSPrimLinkable child)
+    public override bool RemoveDependencies(BSPrimLinkable child)
     {
         bool ret = false;
 
-        DetailLog("{0},BSLinksetConstraint.RemoveBodyDependencies,removeChildrenForRoot,rID={1},rBody={2}",
+        DetailLog("{0},BSLinksetConstraint.RemoveDependencies,removeChildrenForRoot,rID={1},rBody={2}",
                                     child.LocalID, LinksetRoot.LocalID, LinksetRoot.PhysBody.AddrString);
 
         lock (m_linksetActivityLock)
@@ -105,7 +199,7 @@ public sealed class BSLinksetConstraints : BSLinkset
             // Just undo all the constraints for this linkset. Rebuild at the end of the step.
             ret = PhysicallyUnlinkAllChildrenFromRoot(LinksetRoot);
             // Cause the constraints, et al to be rebuilt before the next simulation step.
-            Refresh(LinksetRoot);
+            ScheduleRebuild(LinksetRoot);
         }
         return ret;
     }
@@ -118,12 +212,12 @@ public sealed class BSLinksetConstraints : BSLinkset
     {
         if (!HasChild(child))
         {
-            m_children.Add(child);
+            m_children.Add(child, new BSLinkInfoConstraint(child));
 
             DetailLog("{0},BSLinksetConstraints.AddChildToLinkset,call,child={1}", LinksetRoot.LocalID, child.LocalID);
 
             // Cause constraints and assorted properties to be recomputed before the next simulation step.
-            Refresh(LinksetRoot);
+            ScheduleRebuild(LinksetRoot);
         }
         return;
     }
@@ -142,12 +236,12 @@ public sealed class BSLinksetConstraints : BSLinkset
                             rootx.LocalID, rootx.PhysBody.AddrString,
                             childx.LocalID, childx.PhysBody.AddrString);
 
-            PhysicsScene.TaintedObject("BSLinksetConstraints.RemoveChildFromLinkset", delegate()
+            m_physicsScene.TaintedObject("BSLinksetConstraints.RemoveChildFromLinkset", delegate()
             {
                 PhysicallyUnlinkAChildFromRoot(rootx, childx);
             });
             // See that the linkset parameters are recomputed at the end of the taint time.
-            Refresh(LinksetRoot);
+            ScheduleRebuild(LinksetRoot);
         }
         else
         {
@@ -165,73 +259,75 @@ public sealed class BSLinksetConstraints : BSLinkset
         Refresh(rootPrim);
     }
 
-    private BSConstraint BuildConstraint(BSPrimLinkable rootPrim, BSPrimLinkable childPrim)
+    // Create a static constraint between the two passed objects
+    private BSConstraint BuildConstraint(BSPrimLinkable rootPrim, BSLinkInfo li)
     {
+        BSLinkInfoConstraint liConstraint = li as BSLinkInfoConstraint;
+        if (liConstraint == null)
+            return null;
+
         // Zero motion for children so they don't interpolate
-        childPrim.ZeroMotion(true);
-
-        // Relative position normalized to the root prim
-        // Essentually a vector pointing from center of rootPrim to center of childPrim
-        OMV.Vector3 childRelativePosition = childPrim.Position - rootPrim.Position;
-
-        // real world coordinate of midpoint between the two objects
-        OMV.Vector3 midPoint = rootPrim.Position + (childRelativePosition / 2);
-
-        DetailLog("{0},BSLinksetConstraint.BuildConstraint,taint,root={1},rBody={2},child={3},cBody={4},rLoc={5},cLoc={6},midLoc={7}",
-                                        rootPrim.LocalID,
-                                        rootPrim.LocalID, rootPrim.PhysBody.AddrString,
-                                        childPrim.LocalID, childPrim.PhysBody.AddrString,
-                                        rootPrim.Position, childPrim.Position, midPoint);
-
-        // create a constraint that allows no freedom of movement between the two objects
-        // http://bulletphysics.org/Bullet/phpBB3/viewtopic.php?t=4818
-
-        BSConstraint6Dof constrain = new BSConstraint6Dof(
-                            PhysicsScene.World, rootPrim.PhysBody, childPrim.PhysBody, midPoint, true, true );
-                            // PhysicsScene.World, childPrim.BSBody, rootPrim.BSBody, midPoint, true, true );
-
-        /* NOTE: below is an attempt to build constraint with full frame computation, etc.
-         *     Using the midpoint is easier since it lets the Bullet code manipulate the transforms
-         *     of the objects.
-         * Code left for future programmers.
-        // ==================================================================================
-        // relative position normalized to the root prim
-        OMV.Quaternion invThisOrientation = OMV.Quaternion.Inverse(rootPrim.Orientation);
-        OMV.Vector3 childRelativePosition = (childPrim.Position - rootPrim.Position) * invThisOrientation;
-
-        // relative rotation of the child to the parent
-        OMV.Quaternion childRelativeRotation = invThisOrientation * childPrim.Orientation;
-        OMV.Quaternion inverseChildRelativeRotation = OMV.Quaternion.Inverse(childRelativeRotation);
-
-        DetailLog("{0},BSLinksetConstraint.PhysicallyLinkAChildToRoot,taint,root={1},child={2}", rootPrim.LocalID, rootPrim.LocalID, childPrim.LocalID);
-        BS6DofConstraint constrain = new BS6DofConstraint(
-                        PhysicsScene.World, rootPrim.Body, childPrim.Body,
-                        OMV.Vector3.Zero,
-                        OMV.Quaternion.Inverse(rootPrim.Orientation),
-                        OMV.Vector3.Zero,
-                        OMV.Quaternion.Inverse(childPrim.Orientation),
-                        true,
-                        true
-                        );
-        // ==================================================================================
-        */
-
-        PhysicsScene.Constraints.AddConstraint(constrain);
-
-        // zero linear and angular limits makes the objects unable to move in relation to each other
-        constrain.SetLinearLimits(OMV.Vector3.Zero, OMV.Vector3.Zero);
-        constrain.SetAngularLimits(OMV.Vector3.Zero, OMV.Vector3.Zero);
-
-        // tweek the constraint to increase stability
-        constrain.UseFrameOffset(BSParam.LinkConstraintUseFrameOffset);
-        constrain.TranslationalLimitMotor(BSParam.LinkConstraintEnableTransMotor,
-                        BSParam.LinkConstraintTransMotorMaxVel,
-                        BSParam.LinkConstraintTransMotorMaxForce);
-        constrain.SetCFMAndERP(BSParam.LinkConstraintCFM, BSParam.LinkConstraintERP);
-        if (BSParam.LinkConstraintSolverIterations != 0f)
+        li.member.ZeroMotion(true);
+
+        BSConstraint constrain = null;
+
+        switch (liConstraint.constraintType)
         {
-            constrain.SetSolverIterations(BSParam.LinkConstraintSolverIterations);
+            case ConstraintType.D6_CONSTRAINT_TYPE:
+                // Relative position normalized to the root prim
+                // Essentually a vector pointing from center of rootPrim to center of li.member
+                OMV.Vector3 childRelativePosition = liConstraint.member.Position - rootPrim.Position;
+
+                // real world coordinate of midpoint between the two objects
+                OMV.Vector3 midPoint = rootPrim.Position + (childRelativePosition / 2);
+
+                DetailLog("{0},BSLinksetConstraint.BuildConstraint,taint,root={1},rBody={2},child={3},cBody={4},rLoc={5},cLoc={6},midLoc={7}",
+                                                rootPrim.LocalID,
+                                                rootPrim.LocalID, rootPrim.PhysBody.AddrString,
+                                                liConstraint.member.LocalID, liConstraint.member.PhysBody.AddrString,
+                                                rootPrim.Position, liConstraint.member.Position, midPoint);
+
+                // create a constraint that allows no freedom of movement between the two objects
+                // http://bulletphysics.org/Bullet/phpBB3/viewtopic.php?t=4818
+
+                constrain = new BSConstraint6Dof(
+                                    m_physicsScene.World, rootPrim.PhysBody, liConstraint.member.PhysBody, midPoint, true, true );
+
+                /* NOTE: below is an attempt to build constraint with full frame computation, etc.
+                 *     Using the midpoint is easier since it lets the Bullet code manipulate the transforms
+                 *     of the objects.
+                 * Code left for future programmers.
+                // ==================================================================================
+                // relative position normalized to the root prim
+                OMV.Quaternion invThisOrientation = OMV.Quaternion.Inverse(rootPrim.Orientation);
+                OMV.Vector3 childRelativePosition = (liConstraint.member.Position - rootPrim.Position) * invThisOrientation;
+
+                // relative rotation of the child to the parent
+                OMV.Quaternion childRelativeRotation = invThisOrientation * liConstraint.member.Orientation;
+                OMV.Quaternion inverseChildRelativeRotation = OMV.Quaternion.Inverse(childRelativeRotation);
+
+                DetailLog("{0},BSLinksetConstraint.PhysicallyLinkAChildToRoot,taint,root={1},child={2}", rootPrim.LocalID, rootPrim.LocalID, liConstraint.member.LocalID);
+                constrain = new BS6DofConstraint(
+                                PhysicsScene.World, rootPrim.Body, liConstraint.member.Body,
+                                OMV.Vector3.Zero,
+                                OMV.Quaternion.Inverse(rootPrim.Orientation),
+                                OMV.Vector3.Zero,
+                                OMV.Quaternion.Inverse(liConstraint.member.Orientation),
+                                true,
+                                true
+                                );
+                // ==================================================================================
+                */
+
+                break;
+            default:
+                break;
         }
+
+        liConstraint.SetConstraintParameters(constrain);
+
+        m_physicsScene.Constraints.AddConstraint(constrain);
+
         return constrain;
     }
 
@@ -248,10 +344,10 @@ public sealed class BSLinksetConstraints : BSLinkset
                             childPrim.LocalID, childPrim.PhysBody.AddrString);
 
         // Find the constraint for this link and get rid of it from the overall collection and from my list
-        if (PhysicsScene.Constraints.RemoveAndDestroyConstraint(rootPrim.PhysBody, childPrim.PhysBody))
+        if (m_physicsScene.Constraints.RemoveAndDestroyConstraint(rootPrim.PhysBody, childPrim.PhysBody))
         {
             // Make the child refresh its location
-            PhysicsScene.PE.PushUpdate(childPrim.PhysBody);
+            m_physicsScene.PE.PushUpdate(childPrim.PhysBody);
             ret = true;
         }
 
@@ -265,7 +361,7 @@ public sealed class BSLinksetConstraints : BSLinkset
     {
         DetailLog("{0},BSLinksetConstraint.PhysicallyUnlinkAllChildren,taint", rootPrim.LocalID);
 
-        return PhysicsScene.Constraints.RemoveAndDestroyConstraint(rootPrim.PhysBody);
+        return m_physicsScene.Constraints.RemoveAndDestroyConstraint(rootPrim.PhysBody);
     }
 
     // Call each of the constraints that make up this linkset and recompute the
@@ -281,24 +377,40 @@ public sealed class BSLinksetConstraints : BSLinkset
         DetailLog("{0},BSLinksetConstraint.RecomputeLinksetConstraints,set,rBody={1},linksetMass={2}",
                             LinksetRoot.LocalID, LinksetRoot.PhysBody.AddrString, linksetMass);
 
-        foreach (BSPrimLinkable child in m_children)
+        try
         {
-            // A child in the linkset physically shows the mass of the whole linkset.
-            // This allows Bullet to apply enough force on the child to move the whole linkset.
-            // (Also do the mass stuff before recomputing the constraint so mass is not zero.)
-            child.UpdatePhysicalMassProperties(linksetMass, true);
+            Rebuilding = true;
 
-            BSConstraint constrain;
-            if (!PhysicsScene.Constraints.TryGetConstraint(LinksetRoot.PhysBody, child.PhysBody, out constrain))
+            // There is no reason to build all this physical stuff for a non-physical linkset.
+            if (!LinksetRoot.IsPhysicallyActive)
             {
-                // If constraint doesn't exist yet, create it.
-                constrain = BuildConstraint(LinksetRoot, child);
+                DetailLog("{0},BSLinksetConstraint.RecomputeLinksetCompound,notPhysical", LinksetRoot.LocalID);
+                return; // Note the 'finally' clause at the botton which will get executed.
             }
-            constrain.RecomputeConstraintVariables(linksetMass);
 
-            // PhysicsScene.PE.DumpConstraint(PhysicsScene.World, constrain.Constraint);    // DEBUG DEBUG
-        }
+            ForEachLinkInfo((li) =>
+            {
+                // A child in the linkset physically shows the mass of the whole linkset.
+                // This allows Bullet to apply enough force on the child to move the whole linkset.
+                // (Also do the mass stuff before recomputing the constraint so mass is not zero.)
+                li.member.UpdatePhysicalMassProperties(linksetMass, true);
+
+                BSConstraint constrain;
+                if (!m_physicsScene.Constraints.TryGetConstraint(LinksetRoot.PhysBody, li.member.PhysBody, out constrain))
+                {
+                    // If constraint doesn't exist yet, create it.
+                    constrain = BuildConstraint(LinksetRoot, li);
+                }
+                constrain.RecomputeConstraintVariables(linksetMass);
 
+                // PhysicsScene.PE.DumpConstraint(PhysicsScene.World, constrain.Constraint);    // DEBUG DEBUG
+                return false;   // 'false' says to keep processing other members
+            });
+        }
+        finally
+        {
+            Rebuilding = false;
+        }
     }
 }
 }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs b/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs
index 9501e2d..7693195 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSMotors.cs
@@ -65,13 +65,11 @@ public abstract class BSMotor
 }
 
 // Motor which moves CurrentValue to TargetValue over TimeScale seconds.
-// The TargetValue decays in TargetValueDecayTimeScale and
-//     the CurrentValue will be held back by FrictionTimeScale.
+// The TargetValue decays in TargetValueDecayTimeScale.
 // This motor will "zero itself" over time in that the targetValue will
 //    decay to zero and the currentValue will follow it to that zero.
 //    The overall effect is for the returned correction value to go from large
-//    values (the total difference between current and target minus friction)
-//    to small and eventually zero values.
+//    values to small and eventually zero values.
 // TimeScale and TargetDelayTimeScale may be 'infinite' which means no decay.
 
 // For instance, if something is moving at speed X and the desired speed is Y,
@@ -88,7 +86,6 @@ public class BSVMotor : BSMotor
 
     public virtual float TimeScale { get; set; }
     public virtual float TargetValueDecayTimeScale { get; set; }
-    public virtual Vector3 FrictionTimescale { get; set; }
     public virtual float Efficiency { get; set; }
 
     public virtual float ErrorZeroThreshold { get; set; }
@@ -102,7 +99,7 @@ public class BSVMotor : BSMotor
         return ErrorIsZero(LastError);
     }
     public virtual bool ErrorIsZero(Vector3 err)
-    { 
+    {
         return (err == Vector3.Zero || err.ApproxEquals(Vector3.Zero, ErrorZeroThreshold));
     }
 
@@ -111,16 +108,14 @@ public class BSVMotor : BSMotor
     {
         TimeScale = TargetValueDecayTimeScale = BSMotor.Infinite;
         Efficiency = 1f;
-        FrictionTimescale = BSMotor.InfiniteVector;
         CurrentValue = TargetValue = Vector3.Zero;
         ErrorZeroThreshold = 0.001f;
     }
-    public BSVMotor(string useName, float timeScale, float decayTimeScale, Vector3 frictionTimeScale, float efficiency) 
+    public BSVMotor(string useName, float timeScale, float decayTimeScale, float efficiency)
         : this(useName)
     {
         TimeScale = timeScale;
         TargetValueDecayTimeScale = decayTimeScale;
-        FrictionTimescale = frictionTimeScale;
         Efficiency = efficiency;
         CurrentValue = TargetValue = Vector3.Zero;
     }
@@ -149,7 +144,6 @@ public class BSVMotor : BSMotor
 
         Vector3 correction = Vector3.Zero;
         Vector3 error = TargetValue - CurrentValue;
-        LastError = error;
         if (!ErrorIsZero(error))
         {
             correction = StepError(timeStep, error);
@@ -165,26 +159,11 @@ public class BSVMotor : BSMotor
                 TargetValue *= (1f - decayFactor);
             }
 
-            // The amount we can correct the error is reduced by the friction
-            Vector3 frictionFactor = Vector3.Zero;
-            if (FrictionTimescale != BSMotor.InfiniteVector)
-            {
-                // frictionFactor = (Vector3.One / FrictionTimescale) * timeStep;
-                // Individual friction components can be 'infinite' so compute each separately.
-                frictionFactor.X = (FrictionTimescale.X == BSMotor.Infinite) ? 0f : (1f / FrictionTimescale.X);
-                frictionFactor.Y = (FrictionTimescale.Y == BSMotor.Infinite) ? 0f : (1f / FrictionTimescale.Y);
-                frictionFactor.Z = (FrictionTimescale.Z == BSMotor.Infinite) ? 0f : (1f / FrictionTimescale.Z);
-                frictionFactor *= timeStep;
-                CurrentValue *= (Vector3.One - frictionFactor);
-            }
-
             MDetailLog("{0},  BSVMotor.Step,nonZero,{1},origCurr={2},origTarget={3},timeStep={4},err={5},corr={6}",
                                 BSScene.DetailLogZero, UseName, origCurrVal, origTarget,
                                 timeStep, error, correction);
-            MDetailLog("{0},  BSVMotor.Step,nonZero,{1},tgtDecayTS={2},decayFact={3},frictTS={4},frictFact={5},tgt={6},curr={7}",
-                                BSScene.DetailLogZero, UseName,
-                                TargetValueDecayTimeScale, decayFactor, FrictionTimescale, frictionFactor,
-                                TargetValue, CurrentValue);
+            MDetailLog("{0},  BSVMotor.Step,nonZero,{1},tgtDecayTS={2},decayFact={3},tgt={4},curr={5}",
+                                BSScene.DetailLogZero, UseName, TargetValueDecayTimeScale, decayFactor, TargetValue, CurrentValue);
         }
         else
         {
@@ -199,6 +178,7 @@ public class BSVMotor : BSMotor
             MDetailLog("{0},  BSVMotor.Step,zero,{1},origTgt={2},origCurr={3},currTgt={4},currCurr={5}",
                         BSScene.DetailLogZero, UseName, origCurrVal, origTarget, TargetValue, CurrentValue);
         }
+        LastError = error;
 
         return correction;
     }
@@ -208,6 +188,8 @@ public class BSVMotor : BSMotor
         CurrentValue = current;
         return Step(timeStep);
     }
+    // Given and error, computer a correction for this step.
+    // Simple scaling of the error by the timestep.
     public virtual Vector3 StepError(float timeStep, Vector3 error)
     {
         if (!Enabled) return Vector3.Zero;
@@ -235,27 +217,27 @@ public class BSVMotor : BSMotor
         // maximum number of outputs to generate.
         int maxOutput = 50;
         MDetailLog("{0},BSVMotor.Test,{1},===================================== BEGIN Test Output", BSScene.DetailLogZero, UseName);
-        MDetailLog("{0},BSVMotor.Test,{1},timeScale={2},targDlyTS={3},frictTS={4},eff={5},curr={6},tgt={7}",
+        MDetailLog("{0},BSVMotor.Test,{1},timeScale={2},targDlyTS={3},eff={4},curr={5},tgt={6}",
                                 BSScene.DetailLogZero, UseName,
-                                TimeScale, TargetValueDecayTimeScale, FrictionTimescale, Efficiency, 
+                                TimeScale, TargetValueDecayTimeScale, Efficiency,
                                 CurrentValue, TargetValue);
 
         LastError = BSMotor.InfiniteVector;
-        while (maxOutput-- > 0 && !LastError.ApproxEquals(Vector3.Zero, ErrorZeroThreshold))
+        while (maxOutput-- > 0 && !ErrorIsZero())
         {
             Vector3 lastStep = Step(timeStep);
             MDetailLog("{0},BSVMotor.Test,{1},cur={2},tgt={3},lastError={4},lastStep={5}",
                             BSScene.DetailLogZero, UseName, CurrentValue, TargetValue, LastError, lastStep);
         }
         MDetailLog("{0},BSVMotor.Test,{1},===================================== END Test Output", BSScene.DetailLogZero, UseName);
-        
+
 
     }
 
     public override string ToString()
     {
-        return String.Format("<{0},curr={1},targ={2},lastErr={3},decayTS={4},frictTS={5}>",
-            UseName, CurrentValue, TargetValue, LastError, TargetValueDecayTimeScale, FrictionTimescale);
+        return String.Format("<{0},curr={1},targ={2},lastErr={3},decayTS={4}>",
+            UseName, CurrentValue, TargetValue, LastError, TargetValueDecayTimeScale);
     }
 }
 
@@ -265,7 +247,6 @@ public class BSFMotor : BSMotor
 {
     public virtual float TimeScale { get; set; }
     public virtual float TargetValueDecayTimeScale { get; set; }
-    public virtual float FrictionTimescale { get; set; }
     public virtual float Efficiency { get; set; }
 
     public virtual float ErrorZeroThreshold { get; set; }
@@ -279,16 +260,15 @@ public class BSFMotor : BSMotor
         return ErrorIsZero(LastError);
     }
     public virtual bool ErrorIsZero(float err)
-    { 
+    {
         return (err >= -ErrorZeroThreshold && err <= ErrorZeroThreshold);
     }
 
-    public BSFMotor(string useName, float timeScale, float decayTimescale, float friction, float efficiency)
+    public BSFMotor(string useName, float timeScale, float decayTimescale, float efficiency)
         : base(useName)
     {
         TimeScale = TargetValueDecayTimeScale = BSMotor.Infinite;
         Efficiency = 1f;
-        FrictionTimescale = BSMotor.Infinite;
         CurrentValue = TargetValue = 0f;
         ErrorZeroThreshold = 0.01f;
     }
@@ -315,7 +295,6 @@ public class BSFMotor : BSMotor
 
         float correction = 0f;
         float error = TargetValue - CurrentValue;
-        LastError = error;
         if (!ErrorIsZero(error))
         {
             correction = StepError(timeStep, error);
@@ -331,24 +310,11 @@ public class BSFMotor : BSMotor
                 TargetValue *= (1f - decayFactor);
             }
 
-            // The amount we can correct the error is reduced by the friction
-            float frictionFactor = 0f;
-            if (FrictionTimescale != BSMotor.Infinite)
-            {
-                // frictionFactor = (Vector3.One / FrictionTimescale) * timeStep;
-                // Individual friction components can be 'infinite' so compute each separately.
-                frictionFactor = 1f / FrictionTimescale;
-                frictionFactor *= timeStep;
-                CurrentValue *= (1f - frictionFactor);
-            }
-
             MDetailLog("{0},  BSFMotor.Step,nonZero,{1},origCurr={2},origTarget={3},timeStep={4},err={5},corr={6}",
                                 BSScene.DetailLogZero, UseName, origCurrVal, origTarget,
                                 timeStep, error, correction);
-            MDetailLog("{0},  BSFMotor.Step,nonZero,{1},tgtDecayTS={2},decayFact={3},frictTS={4},frictFact={5},tgt={6},curr={7}",
-                                BSScene.DetailLogZero, UseName,
-                                TargetValueDecayTimeScale, decayFactor, FrictionTimescale, frictionFactor,
-                                TargetValue, CurrentValue);
+            MDetailLog("{0},  BSFMotor.Step,nonZero,{1},tgtDecayTS={2},decayFact={3},tgt={4},curr={5}",
+                                BSScene.DetailLogZero, UseName, TargetValueDecayTimeScale, decayFactor, TargetValue, CurrentValue);
         }
         else
         {
@@ -363,6 +329,7 @@ public class BSFMotor : BSMotor
             MDetailLog("{0},  BSFMotor.Step,zero,{1},origTgt={2},origCurr={3},ret={4}",
                         BSScene.DetailLogZero, UseName, origCurrVal, origTarget, CurrentValue);
         }
+        LastError = error;
 
         return CurrentValue;
     }
@@ -390,15 +357,15 @@ public class BSFMotor : BSMotor
 
     public override string ToString()
     {
-        return String.Format("<{0},curr={1},targ={2},lastErr={3},decayTS={4},frictTS={5}>",
-            UseName, CurrentValue, TargetValue, LastError, TargetValueDecayTimeScale, FrictionTimescale);
+        return String.Format("<{0},curr={1},targ={2},lastErr={3},decayTS={4}>",
+            UseName, CurrentValue, TargetValue, LastError, TargetValueDecayTimeScale);
     }
 
 }
 
 // ============================================================================
 // ============================================================================
-// Proportional, Integral, Derivitive Motor
+// Proportional, Integral, Derivitive ("PID") Motor
 // Good description at http://www.answers.com/topic/pid-controller . Includes processes for choosing p, i and d factors.
 public class BSPIDVMotor : BSVMotor
 {
@@ -410,7 +377,6 @@ public class BSPIDVMotor : BSVMotor
     // The factors are vectors for the three dimensions. This is the proportional of each
     //    that is applied. This could be multiplied through the actual factors but it
     //    is sometimes easier to manipulate the factors and their mix separately.
-    //      to 
     public Vector3 FactorMix;
 
     // Arbritrary factor range.
@@ -448,14 +414,14 @@ public class BSPIDVMotor : BSVMotor
             // If efficiency is high (1f), use a factor value that moves the error value to zero with little overshoot.
             // If efficiency is low (0f), use a factor value that overcorrects.
             // TODO: might want to vary contribution of different factor depending on efficiency.
-            float factor = ((1f - this.Efficiency) * EfficiencyHigh + EfficiencyLow) / 3f;
-            // float factor = (1f - this.Efficiency) * EfficiencyHigh + EfficiencyLow;
+            // float factor = ((1f - this.Efficiency) * EfficiencyHigh + EfficiencyLow) / 3f;
+            float factor = (1f - this.Efficiency) * EfficiencyHigh + EfficiencyLow;
 
             proportionFactor = new Vector3(factor, factor, factor);
             integralFactor = new Vector3(factor, factor, factor);
             derivFactor = new Vector3(factor, factor, factor);
 
-            MDetailLog("{0},BSPIDVMotor.setEfficiency,eff={1},factor={2}", BSScene.DetailLogZero, Efficiency, factor);
+            MDetailLog("{0},  BSPIDVMotor.setEfficiency,eff={1},factor={2}", BSScene.DetailLogZero, Efficiency, factor);
         }
     }
 
@@ -469,16 +435,15 @@ public class BSPIDVMotor : BSVMotor
 
         // A simple derivitive is the rate of change from the last error.
         Vector3 derivitive = (error - LastError) * timeStep;
-        LastError = error;
 
         // Correction = (proportionOfPresentError + accumulationOfPastError + rateOfChangeOfError)
-        Vector3 ret   =   error * timeStep   * proportionFactor * FactorMix.X
-                        + RunningIntegration * integralFactor   * FactorMix.Y
-                        + derivitive         * derivFactor      * FactorMix.Z
+        Vector3 ret   =   error / TimeScale * timeStep   * proportionFactor * FactorMix.X
+                        + RunningIntegration / TimeScale * integralFactor   * FactorMix.Y
+                        + derivitive / TimeScale         * derivFactor      * FactorMix.Z
                         ;
 
-        MDetailLog("{0},BSPIDVMotor.step,ts={1},err={2},runnInt={3},deriv={4},ret={5}",
-                        BSScene.DetailLogZero, timeStep, error, RunningIntegration, derivitive, ret);
+        MDetailLog("{0},  BSPIDVMotor.step,ts={1},err={2},lerr={3},runnInt={4},deriv={5},ret={6}",
+                        BSScene.DetailLogZero, timeStep, error, LastError, RunningIntegration, derivitive, ret);
 
         return ret;
     }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 385ed9e..fcb892a 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -26,6 +26,7 @@
  */
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using System.Text;
 
 using OpenSim.Region.Physics.Manager;
@@ -37,7 +38,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
 {
 public static class BSParam
 {
-    private static string LogHeader = "[BULLETSIM PARAMETERS]"; 
+    private static string LogHeader = "[BULLETSIM PARAMETERS]";
 
     // Tuning notes:
     // From: http://bulletphysics.org/Bullet/phpBB3/viewtopic.php?t=6575
@@ -51,7 +52,10 @@ public static class BSParam
     //    This is separate/independent from the collision margin. The collision margin increases the object a bit
     //    to improve collision detection performance and accuracy.
     // ===================
-    // From: 
+    // From:
+
+    public static bool UseSeparatePhysicsThread { get; private set; }
+    public static float PhysicsTimeStep { get; private set; }
 
     // Level of Detail values kept as float because that's what the Meshmerizer wants
     public static float MeshLOD { get; private set; }
@@ -86,8 +90,12 @@ public static class BSParam
     public static bool ShouldForceSimplePrimMeshing { get; private set; }   // if a cube or sphere, let Bullet do internal shapes
     public static bool ShouldUseHullsForPhysicalObjects { get; private set; }   // 'true' if should create hulls for physical objects
     public static bool ShouldRemoveZeroWidthTriangles { get; private set; }
+    public static bool ShouldUseBulletHACD { get; set; }
+    public static bool ShouldUseSingleConvexHullForPrims { get; set; }
+    public static bool ShouldUseGImpactShapeForPrims { get; set; }
+    public static bool ShouldUseAssetHulls { get; set; }
 
-    public static float TerrainImplementation { get; private set; }
+    public static float TerrainImplementation { get; set; }
     public static int TerrainMeshMagnification { get; private set; }
     public static float TerrainFriction { get; private set; }
     public static float TerrainHitFraction { get; private set; }
@@ -122,11 +130,17 @@ public static class BSParam
     public static float AvatarCapsuleWidth { get; private set; }
     public static float AvatarCapsuleDepth { get; private set; }
     public static float AvatarCapsuleHeight { get; private set; }
+    public static float AvatarHeightLowFudge { get; private set; }
+    public static float AvatarHeightMidFudge { get; private set; }
+    public static float AvatarHeightHighFudge { get; private set; }
         public static float AvatarContactProcessingThreshold { get; private set; }
+        public static int AvatarJumpFrames { get; private set; }
         public static float AvatarBelowGroundUpCorrectionMeters { get; private set; }
         public static float AvatarStepHeight { get; private set; }
         public static float AvatarStepApproachFactor { get; private set; }
         public static float AvatarStepForceFactor { get; private set; }
+        public static float AvatarStepUpCorrectionFactor { get; private set; }
+        public static int AvatarStepSmoothingSteps { get; private set; }
 
     // Vehicle parameters
     public static float VehicleMaxLinearVelocity { get; private set; }
@@ -138,9 +152,15 @@ public static class BSParam
     public static float VehicleRestitution { get; private set; }
     public static Vector3 VehicleLinearFactor { get; private set; }
     public static Vector3 VehicleAngularFactor { get; private set; }
+    public static Vector3 VehicleInertiaFactor { get; private set; }
     public static float VehicleGroundGravityFudge { get; private set; }
     public static float VehicleAngularBankingTimescaleFudge { get; private set; }
-    public static bool VehicleDebuggingEnabled { get; private set; }
+    public static bool VehicleEnableLinearDeflection { get; private set; }
+    public static bool VehicleLinearDeflectionNotCollidingNoZ { get; private set; }
+    public static bool VehicleEnableAngularVerticalAttraction { get; private set; }
+    public static int VehicleAngularVerticalAttractionAlgorithm { get; private set; }
+    public static bool VehicleEnableAngularDeflection { get; private set; }
+    public static bool VehicleEnableAngularBanking { get; private set; }
 
     // Convex Hulls
     public static int CSHullMaxDepthSplit { get; private set; }
@@ -149,9 +169,19 @@ public static class BSParam
     public static float CSHullVolumeConservationThresholdPercent { get; private set; }
     public static int CSHullMaxVertices { get; private set; }
     public static float CSHullMaxSkinWidth { get; private set; }
+        public static float BHullMaxVerticesPerHull { get; private set; }               // 100
+        public static float BHullMinClusters { get; private set; }                              // 2
+        public static float BHullCompacityWeight { get; private set; }                  // 0.1
+        public static float BHullVolumeWeight { get; private set; }                             // 0.0
+        public static float BHullConcavity { get; private set; }                                    // 100
+        public static bool BHullAddExtraDistPoints { get; private set; }                // false
+        public static bool BHullAddNeighboursDistPoints { get; private set; }   // false
+        public static bool BHullAddFacesPoints { get; private set; }                    // false
+        public static bool BHullShouldAdjustCollisionMargin { get; private set; }       // false
 
     // Linkset implementation parameters
     public static float LinksetImplementation { get; private set; }
+    public static bool LinksetOffsetCenterOfMass { get; private set; }
     public static bool LinkConstraintUseFrameOffset { get; private set; }
     public static bool LinkConstraintEnableTransMotor { get; private set; }
     public static float LinkConstraintTransMotorMaxVel { get; private set; }
@@ -223,16 +253,41 @@ public static class BSParam
             getter = pGetter;
             objectSet = pObjSetter;
         }
-        /* Wish I could simplify using this definition but CLR doesn't store references so closure around delegates of references won't work
-        public ParameterDefn(string pName, string pDesc, T pDefault, ref T loc)
+        // Simple parameter variable where property name is the same as the INI file name
+        //     and the value is only a simple get and set.
+        public ParameterDefn(string pName, string pDesc, T pDefault)
             : base(pName, pDesc)
         {
             defaultValue = pDefault;
-            setter = (s, v) => { loc = v; };
-            getter = (s) => { return loc; };
+            setter = (s, v) => { SetValueByName(s, name, v); };
+            getter = (s) => { return GetValueByName(s, name); };
             objectSet = null;
         }
-         */
+        // Use reflection to find the property named 'pName' in BSParam and assign 'val' to same.
+        private void SetValueByName(BSScene s, string pName, T val)
+        {
+            PropertyInfo prop = typeof(BSParam).GetProperty(pName, BindingFlags.Public | BindingFlags.Static | BindingFlags.FlattenHierarchy);
+            if (prop == null)
+            {
+                // This should only be output when someone adds a new INI parameter and misspells the name.
+                s.Logger.ErrorFormat("{0} SetValueByName: did not find '{1}'. Verify specified property name is the same as the given INI parameters name.", LogHeader, pName);
+            }
+            else
+            {
+                prop.SetValue(null, val, null);
+            }
+        }
+        // Use reflection to find the property named 'pName' in BSParam and return the value in same.
+        private T GetValueByName(BSScene s, string pName)
+        {
+            PropertyInfo prop = typeof(BSParam).GetProperty(pName, BindingFlags.Public | BindingFlags.Static | BindingFlags.FlattenHierarchy);
+            if (prop == null)
+            {
+                // This should only be output when someone adds a new INI parameter and misspells the name.
+                s.Logger.ErrorFormat("{0} GetValueByName: did not find '{1}'. Verify specified property name is the same as the given INI parameter name.", LogHeader, pName);
+            }
+            return (T)prop.GetValue(null, null);
+        }
         public override void AssignDefault(BSScene s)
         {
             setter(s, defaultValue);
@@ -309,6 +364,11 @@ public static class BSParam
     //    v = value (appropriate type)
     private static ParameterDefnBase[] ParameterDefinitions =
     {
+        new ParameterDefn<bool>("UseSeparatePhysicsThread", "If 'true', the physics engine runs independent from the simulator heartbeat",
+            false ),
+        new ParameterDefn<float>("PhysicsTimeStep", "If separate thread, seconds to simulate each interval",
+            0.089f ),
+
         new ParameterDefn<bool>("MeshSculptedPrim", "Whether to create meshes for sculpties",
             true,
             (s) => { return ShouldMeshSculptedPrim; },
@@ -322,18 +382,20 @@ public static class BSParam
             (s) => { return ShouldUseHullsForPhysicalObjects; },
             (s,v) => { ShouldUseHullsForPhysicalObjects = v; } ),
         new ParameterDefn<bool>("ShouldRemoveZeroWidthTriangles", "If true, remove degenerate triangles from meshes",
-            true,
-            (s) => { return ShouldRemoveZeroWidthTriangles; },
-            (s,v) => { ShouldRemoveZeroWidthTriangles = v; } ),
+            true ),
+        new ParameterDefn<bool>("ShouldUseBulletHACD", "If true, use the Bullet version of HACD",
+            false ),
+        new ParameterDefn<bool>("ShouldUseSingleConvexHullForPrims", "If true, use a single convex hull shape for physical prims",
+            true ),
+        new ParameterDefn<bool>("ShouldUseGImpactShapeForPrims", "If true, use a GImpact shape for prims with cuts and twists",
+            false ),
+        new ParameterDefn<bool>("ShouldUseAssetHulls", "If true, use hull if specified in the mesh asset info",
+            true ),
 
         new ParameterDefn<int>("CrossingFailuresBeforeOutOfBounds", "How forgiving we are about getting into adjactent regions",
-            5,
-            (s) => { return CrossingFailuresBeforeOutOfBounds; },
-            (s,v) => { CrossingFailuresBeforeOutOfBounds = v; } ),
+            5 ),
         new ParameterDefn<float>("UpdateVelocityChangeThreshold", "Change in updated velocity required before reporting change to simulator",
-            0.1f,
-            (s) => { return UpdateVelocityChangeThreshold; },
-            (s,v) => { UpdateVelocityChangeThreshold = v; } ),
+            0.1f ),
 
         new ParameterDefn<float>("MeshLevelOfDetail", "Level of detail to render meshes (32, 16, 8 or 4. 32=most detailed)",
             32f,
@@ -399,26 +461,22 @@ public static class BSParam
             (s) => { return MaxAddForceMagnitude; },
             (s,v) => { MaxAddForceMagnitude = v; MaxAddForceMagnitudeSquared = v * v; } ),
         // Density is passed around as 100kg/m3. This scales that to 1kg/m3.
+        // Reduce by power of 100 because Bullet doesn't seem to handle objects with large mass very well
         new ParameterDefn<float>("DensityScaleFactor", "Conversion for simulator/viewer density (100kg/m3) to physical density (1kg/m3)",
-            0.01f,
-            (s) => { return DensityScaleFactor; },
-            (s,v) => { DensityScaleFactor = v; } ),
+            0.01f ),
 
         new ParameterDefn<float>("PID_D", "Derivitive factor for motion smoothing",
-            2200f,
-            (s) => { return (float)PID_D; },
-            (s,v) => { PID_D = v; } ),
+            2200f ),
         new ParameterDefn<float>("PID_P", "Parameteric factor for motion smoothing",
-            900f,
-            (s) => { return (float)PID_P; },
-            (s,v) => { PID_P = v; } ),
+            900f ),
 
         new ParameterDefn<float>("DefaultFriction", "Friction factor used on new objects",
             0.2f,
             (s) => { return DefaultFriction; },
             (s,v) => { DefaultFriction = v; s.UnmanagedParams[0].defaultFriction = v; } ),
+        // For historical reasons, the viewer and simulator multiply the density by 100
         new ParameterDefn<float>("DefaultDensity", "Density for new objects" ,
-            10.000006836f,  // Aluminum g/cm3
+            1000.0006836f,  // Aluminum g/cm3 * 100
             (s) => { return DefaultDensity; },
             (s,v) => { DefaultDensity = v; s.UnmanagedParams[0].defaultDensity = v; } ),
         new ParameterDefn<float>("DefaultRestitution", "Bouncyness of an object" ,
@@ -478,86 +536,59 @@ public static class BSParam
             (s,o) => { s.PE.SetContactProcessingThreshold(o.PhysBody, ContactProcessingThreshold); } ),
 
             new ParameterDefn<float>("TerrainImplementation", "Type of shape to use for terrain (0=heightmap, 1=mesh)",
-            (float)BSTerrainPhys.TerrainImplementation.Mesh,
-            (s) => { return TerrainImplementation; },
-            (s,v) => { TerrainImplementation = v; } ),
+            (float)BSTerrainPhys.TerrainImplementation.Mesh ),
         new ParameterDefn<int>("TerrainMeshMagnification", "Number of times the 256x256 heightmap is multiplied to create the terrain mesh" ,
-            2,
-            (s) => { return TerrainMeshMagnification; },
-            (s,v) => { TerrainMeshMagnification = v; } ),
+            2 ),
         new ParameterDefn<float>("TerrainFriction", "Factor to reduce movement against terrain surface" ,
-            0.3f,
-            (s) => { return TerrainFriction; },
-            (s,v) => { TerrainFriction = v;  /* TODO: set on real terrain */} ),
+            0.3f ),
         new ParameterDefn<float>("TerrainHitFraction", "Distance to measure hit collisions" ,
-            0.8f,
-            (s) => { return TerrainHitFraction; },
-            (s,v) => { TerrainHitFraction = v; /* TODO: set on real terrain */ } ),
+            0.8f ),
         new ParameterDefn<float>("TerrainRestitution", "Bouncyness" ,
-            0f,
-            (s) => { return TerrainRestitution; },
-            (s,v) => { TerrainRestitution = v;  /* TODO: set on real terrain */ } ),
+            0f ),
         new ParameterDefn<float>("TerrainContactProcessingThreshold", "Distance from terrain to stop processing collisions" ,
-            0.0f,
-            (s) => { return TerrainContactProcessingThreshold; },
-            (s,v) => { TerrainContactProcessingThreshold = v;  /* TODO: set on real terrain */ } ),
+            0.0f ),
         new ParameterDefn<float>("TerrainCollisionMargin", "Margin where collision checking starts" ,
-            0.08f,
-            (s) => { return TerrainCollisionMargin; },
-            (s,v) => { TerrainCollisionMargin = v;  /* TODO: set on real terrain */ } ),
+            0.08f ),
 
         new ParameterDefn<float>("AvatarFriction", "Factor to reduce movement against an avatar. Changed on avatar recreation.",
-            0.2f,
-            (s) => { return AvatarFriction; },
-            (s,v) => { AvatarFriction = v; } ),
+            0.2f ),
         new ParameterDefn<float>("AvatarStandingFriction", "Avatar friction when standing. Changed on avatar recreation.",
-            0.95f,
-            (s) => { return AvatarStandingFriction; },
-            (s,v) => { AvatarStandingFriction = v; } ),
+            0.95f ),
         new ParameterDefn<float>("AvatarAlwaysRunFactor", "Speed multiplier if avatar is set to always run",
-            1.3f,
-            (s) => { return AvatarAlwaysRunFactor; },
-            (s,v) => { AvatarAlwaysRunFactor = v; } ),
-        new ParameterDefn<float>("AvatarDensity", "Density of an avatar. Changed on avatar recreation.",
-            3.5f,
-            (s) => { return AvatarDensity; },
-            (s,v) => { AvatarDensity = v; } ),
+            1.3f ),
+            // For historical reasons, density is reported  * 100
+        new ParameterDefn<float>("AvatarDensity", "Density of an avatar. Changed on avatar recreation. Scaled times 100.",
+            3500f) ,    // 3.5 * 100
         new ParameterDefn<float>("AvatarRestitution", "Bouncyness. Changed on avatar recreation.",
-            0f,
-            (s) => { return AvatarRestitution; },
-            (s,v) => { AvatarRestitution = v; } ),
+            0f ),
         new ParameterDefn<float>("AvatarCapsuleWidth", "The distance between the sides of the avatar capsule",
-            0.6f,
-            (s) => { return AvatarCapsuleWidth; },
-            (s,v) => { AvatarCapsuleWidth = v; } ),
+            0.6f ) ,
         new ParameterDefn<float>("AvatarCapsuleDepth", "The distance between the front and back of the avatar capsule",
-            0.45f,
-            (s) => { return AvatarCapsuleDepth; },
-            (s,v) => { AvatarCapsuleDepth = v; } ),
+            0.45f ),
         new ParameterDefn<float>("AvatarCapsuleHeight", "Default height of space around avatar",
-            1.5f,
-            (s) => { return AvatarCapsuleHeight; },
-            (s,v) => { AvatarCapsuleHeight = v; } ),
+            1.5f ),
+        new ParameterDefn<float>("AvatarHeightLowFudge", "A fudge factor to make small avatars stand on the ground",
+            -0.2f ),
+        new ParameterDefn<float>("AvatarHeightMidFudge", "A fudge distance to adjust average sized avatars to be standing on ground",
+            0.2f ),
+        new ParameterDefn<float>("AvatarHeightHighFudge", "A fudge factor to make tall avatars stand on the ground",
+            0.2f ),
             new ParameterDefn<float>("AvatarContactProcessingThreshold", "Distance from capsule to check for collisions",
-            0.1f,
-            (s) => { return AvatarContactProcessingThreshold; },
-            (s,v) => { AvatarContactProcessingThreshold = v; } ),
+            0.1f ),
             new ParameterDefn<float>("AvatarBelowGroundUpCorrectionMeters", "Meters to move avatar up if it seems to be below ground",
-            1.0f,
-            (s) => { return AvatarBelowGroundUpCorrectionMeters; },
-            (s,v) => { AvatarBelowGroundUpCorrectionMeters = v; } ),
+            1.0f ),
+            new ParameterDefn<int>("AvatarJumpFrames", "Number of frames to allow jump forces. Changes jump height.",
+            4 ),
             new ParameterDefn<float>("AvatarStepHeight", "Height of a step obstacle to consider step correction",
-            0.3f,
-            (s) => { return AvatarStepHeight; },
-            (s,v) => { AvatarStepHeight = v; } ),
+            0.6f ) ,
             new ParameterDefn<float>("AvatarStepApproachFactor", "Factor to control angle of approach to step (0=straight on)",
-            0.6f,
-            (s) => { return AvatarStepApproachFactor; },
-            (s,v) => { AvatarStepApproachFactor = v; } ),
+            0.6f ),
             new ParameterDefn<float>("AvatarStepForceFactor", "Controls the amount of force up applied to step up onto a step",
-            2.0f,
-            (s) => { return AvatarStepForceFactor; },
-            (s,v) => { AvatarStepForceFactor = v; } ),
+            1.0f ),
+            new ParameterDefn<float>("AvatarStepUpCorrectionFactor", "Multiplied by height of step collision to create up movement at step",
+            1.0f ),
+            new ParameterDefn<int>("AvatarStepSmoothingSteps", "Number of frames after a step collision that we continue walking up stairs",
+            2 ),
 
         new ParameterDefn<float>("VehicleMaxLinearVelocity", "Maximum velocity magnitude that can be assigned to a vehicle",
             1000.0f,
@@ -568,37 +599,33 @@ public static class BSParam
             (s) => { return (float)VehicleMaxAngularVelocity; },
             (s,v) => { VehicleMaxAngularVelocity = v; VehicleMaxAngularVelocitySq = v * v; } ),
         new ParameterDefn<float>("VehicleAngularDamping", "Factor to damp vehicle angular movement per second (0.0 - 1.0)",
-            0.0f,
-            (s) => { return VehicleAngularDamping; },
-            (s,v) => { VehicleAngularDamping = v; } ),
+            0.0f ),
         new ParameterDefn<Vector3>("VehicleLinearFactor", "Fraction of physical linear changes applied to vehicle (<0,0,0> to <1,1,1>)",
-            new Vector3(1f, 1f, 1f),
-            (s) => { return VehicleLinearFactor; },
-            (s,v) => { VehicleLinearFactor = v; } ),
+            new Vector3(1f, 1f, 1f) ),
         new ParameterDefn<Vector3>("VehicleAngularFactor", "Fraction of physical angular changes applied to vehicle (<0,0,0> to <1,1,1>)",
-            new Vector3(1f, 1f, 1f),
-            (s) => { return VehicleAngularFactor; },
-            (s,v) => { VehicleAngularFactor = v; } ),
+            new Vector3(1f, 1f, 1f) ),
+        new ParameterDefn<Vector3>("VehicleInertiaFactor", "Fraction of physical inertia applied (<0,0,0> to <1,1,1>)",
+            new Vector3(1f, 1f, 1f) ),
         new ParameterDefn<float>("VehicleFriction", "Friction of vehicle on the ground (0.0 - 1.0)",
-            0.0f,
-            (s) => { return VehicleFriction; },
-            (s,v) => { VehicleFriction = v; } ),
+            0.0f ),
         new ParameterDefn<float>("VehicleRestitution", "Bouncyness factor for vehicles (0.0 - 1.0)",
-            0.0f,
-            (s) => { return VehicleRestitution; },
-            (s,v) => { VehicleRestitution = v; } ),
+            0.0f ),
         new ParameterDefn<float>("VehicleGroundGravityFudge", "Factor to multiply gravity if a ground vehicle is probably on the ground (0.0 - 1.0)",
-            0.2f,
-            (s) => { return VehicleGroundGravityFudge; },
-            (s,v) => { VehicleGroundGravityFudge = v; } ),
+            0.2f ),
         new ParameterDefn<float>("VehicleAngularBankingTimescaleFudge", "Factor to multiple angular banking timescale. Tune to increase realism.",
-            60.0f,
-            (s) => { return VehicleAngularBankingTimescaleFudge; },
-            (s,v) => { VehicleAngularBankingTimescaleFudge = v; } ),
-        new ParameterDefn<bool>("VehicleDebuggingEnable", "Turn on/off vehicle debugging",
-            false,
-            (s) => { return VehicleDebuggingEnabled; },
-            (s,v) => { VehicleDebuggingEnabled = v; } ),
+            60.0f ),
+        new ParameterDefn<bool>("VehicleEnableLinearDeflection", "Turn on/off vehicle linear deflection effect",
+            true ),
+        new ParameterDefn<bool>("VehicleLinearDeflectionNotCollidingNoZ", "Turn on/off linear deflection Z effect on non-colliding vehicles",
+            true ),
+        new ParameterDefn<bool>("VehicleEnableAngularVerticalAttraction", "Turn on/off vehicle angular vertical attraction effect",
+            true ),
+        new ParameterDefn<int>("VehicleAngularVerticalAttractionAlgorithm", "Select vertical attraction algo. You need to look at the source.",
+            0 ),
+        new ParameterDefn<bool>("VehicleEnableAngularDeflection", "Turn on/off vehicle angular deflection effect",
+            true ),
+        new ParameterDefn<bool>("VehicleEnableAngularBanking", "Turn on/off vehicle angular banking effect",
+            true ),
 
             new ParameterDefn<float>("MaxPersistantManifoldPoolSize", "Number of manifolds pooled (0 means default of 4096)",
             0f,
@@ -611,7 +638,7 @@ public static class BSParam
             new ParameterDefn<bool>("ShouldDisableContactPoolDynamicAllocation", "Enable to allow large changes in object count",
             false,
             (s) => { return ShouldDisableContactPoolDynamicAllocation; },
-            (s,v) => { ShouldDisableContactPoolDynamicAllocation = v; 
+            (s,v) => { ShouldDisableContactPoolDynamicAllocation = v;
                         s.UnmanagedParams[0].shouldDisableContactPoolDynamicAllocation = NumericBool(v); } ),
             new ParameterDefn<bool>("ShouldForceUpdateAllAabbs", "Enable to recomputer AABBs every simulator step",
             false,
@@ -643,62 +670,55 @@ public static class BSParam
             (s,v) => { GlobalContactBreakingThreshold = v; s.UnmanagedParams[0].globalContactBreakingThreshold = v; } ),
 
             new ParameterDefn<int>("CSHullMaxDepthSplit", "CS impl: max depth to split for hull. 1-10 but > 7 is iffy",
-            7,
-            (s) => { return CSHullMaxDepthSplit; },
-            (s,v) => { CSHullMaxDepthSplit = v; } ),
+            7 ),
             new ParameterDefn<int>("CSHullMaxDepthSplitForSimpleShapes", "CS impl: max depth setting for simple prim shapes",
-            2,
-            (s) => { return CSHullMaxDepthSplitForSimpleShapes; },
-            (s,v) => { CSHullMaxDepthSplitForSimpleShapes = v; } ),
+            2 ),
             new ParameterDefn<float>("CSHullConcavityThresholdPercent", "CS impl: concavity threshold percent (0-20)",
-            5f,
-            (s) => { return CSHullConcavityThresholdPercent; },
-            (s,v) => { CSHullConcavityThresholdPercent = v; } ),
+            5f ),
             new ParameterDefn<float>("CSHullVolumeConservationThresholdPercent", "percent volume conservation to collapse hulls (0-30)",
-            5f,
-            (s) => { return CSHullVolumeConservationThresholdPercent; },
-            (s,v) => { CSHullVolumeConservationThresholdPercent = v; } ),
+            5f ),
             new ParameterDefn<int>("CSHullMaxVertices", "CS impl: maximum number of vertices in output hulls. Keep < 50.",
-            32,
-            (s) => { return CSHullMaxVertices; },
-            (s,v) => { CSHullMaxVertices = v; } ),
+            32 ),
             new ParameterDefn<float>("CSHullMaxSkinWidth", "CS impl: skin width to apply to output hulls.",
-            0,
-            (s) => { return CSHullMaxSkinWidth; },
-            (s,v) => { CSHullMaxSkinWidth = v; } ),
+            0f ),
+
+            new ParameterDefn<float>("BHullMaxVerticesPerHull", "Bullet impl: max number of vertices per created hull",
+            100f ),
+            new ParameterDefn<float>("BHullMinClusters", "Bullet impl: minimum number of hulls to create per mesh",
+            2f ),
+            new ParameterDefn<float>("BHullCompacityWeight", "Bullet impl: weight factor for how compact to make hulls",
+            0.1f ),
+            new ParameterDefn<float>("BHullVolumeWeight", "Bullet impl: weight factor for volume in created hull",
+            0f ),
+            new ParameterDefn<float>("BHullConcavity", "Bullet impl: weight factor for how convex a created hull can be",
+            100f ),
+            new ParameterDefn<bool>("BHullAddExtraDistPoints", "Bullet impl: whether to add extra vertices for long distance vectors",
+            false ),
+            new ParameterDefn<bool>("BHullAddNeighboursDistPoints", "Bullet impl: whether to add extra vertices between neighbor hulls",
+            false ),
+            new ParameterDefn<bool>("BHullAddFacesPoints", "Bullet impl: whether to add extra vertices to break up hull faces",
+            false ),
+            new ParameterDefn<bool>("BHullShouldAdjustCollisionMargin", "Bullet impl: whether to shrink resulting hulls to account for collision margin",
+            false ),
 
             new ParameterDefn<float>("LinksetImplementation", "Type of linkset implementation (0=Constraint, 1=Compound, 2=Manual)",
-            (float)BSLinkset.LinksetImplementation.Compound,
-            (s) => { return LinksetImplementation; },
-            (s,v) => { LinksetImplementation = v; } ),
+            (float)BSLinkset.LinksetImplementation.Compound ),
+            new ParameterDefn<bool>("LinksetOffsetCenterOfMass", "If 'true', compute linkset center-of-mass and offset linkset position to account for same",
+            true ),
             new ParameterDefn<bool>("LinkConstraintUseFrameOffset", "For linksets built with constraints, enable frame offsetFor linksets built with constraints, enable frame offset.",
-            false,
-            (s) => { return LinkConstraintUseFrameOffset; },
-            (s,v) => { LinkConstraintUseFrameOffset = v; } ),
+            false ),
             new ParameterDefn<bool>("LinkConstraintEnableTransMotor", "Whether to enable translational motor on linkset constraints",
-            true,
-            (s) => { return LinkConstraintEnableTransMotor; },
-            (s,v) => { LinkConstraintEnableTransMotor = v; } ),
+            true ),
             new ParameterDefn<float>("LinkConstraintTransMotorMaxVel", "Maximum velocity to be applied by translational motor in linkset constraints",
-            5.0f,
-            (s) => { return LinkConstraintTransMotorMaxVel; },
-            (s,v) => { LinkConstraintTransMotorMaxVel = v; } ),
+            5.0f ),
             new ParameterDefn<float>("LinkConstraintTransMotorMaxForce", "Maximum force to be applied by translational motor in linkset constraints",
-            0.1f,
-            (s) => { return LinkConstraintTransMotorMaxForce; },
-            (s,v) => { LinkConstraintTransMotorMaxForce = v; } ),
+            0.1f ),
             new ParameterDefn<float>("LinkConstraintCFM", "Amount constraint can be violated. 0=no violation, 1=infinite. Default=0.1",
-            0.1f,
-            (s) => { return LinkConstraintCFM; },
-            (s,v) => { LinkConstraintCFM = v; } ),
+            0.1f ),
             new ParameterDefn<float>("LinkConstraintERP", "Amount constraint is corrected each tick. 0=none, 1=all. Default = 0.2",
-            0.1f,
-            (s) => { return LinkConstraintERP; },
-            (s,v) => { LinkConstraintERP = v; } ),
+            0.1f ),
             new ParameterDefn<float>("LinkConstraintSolverIterations", "Number of solver iterations when computing constraint. (0 = Bullet default)",
-            40,
-            (s) => { return LinkConstraintSolverIterations; },
-            (s,v) => { LinkConstraintSolverIterations = v; } ),
+            40 ),
 
         new ParameterDefn<int>("PhysicsMetricFrames", "Frames between outputting detailed phys metrics. (0 is off)",
             0,
@@ -707,7 +727,7 @@ public static class BSParam
         new ParameterDefn<float>("ResetBroadphasePool", "Setting this is any value resets the broadphase collision pool",
             0f,
             (s) => { return 0f; },
-            (s,v) => { BSParam.ResetBroadphasePoolTainted(s, v); } ),
+            (s,v) => { BSParam.ResetBroadphasePoolTainted(s, v, false /* inTaintTime */); } ),
         new ParameterDefn<float>("ResetConstraintSolver", "Setting this is any value resets the constraint solver",
             0f,
             (s) => { return 0f; },
@@ -793,10 +813,10 @@ public static class BSParam
     // =====================================================================
     // There are parameters that, when set, cause things to happen in the physics engine.
     // This causes the broadphase collision cache to be cleared.
-    private static void ResetBroadphasePoolTainted(BSScene pPhysScene, float v)
+    private static void ResetBroadphasePoolTainted(BSScene pPhysScene, float v, bool inTaintTime)
     {
         BSScene physScene = pPhysScene;
-        physScene.TaintedObject("BSParam.ResetBroadphasePoolTainted", delegate()
+        physScene.TaintedObject(inTaintTime, "BSParam.ResetBroadphasePoolTainted", delegate()
         {
             physScene.PE.ResetBroadphasePool(physScene.World);
         });
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index 6bb88c7..9dc52d5 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -38,12 +38,12 @@ namespace OpenSim.Region.Physics.BulletSPlugin
  * Class to wrap all objects.
  * The rest of BulletSim doesn't need to keep checking for avatars or prims
  *        unless the difference is significant.
- * 
+ *
  *  Variables in the physicsl objects are in three forms:
  *      VariableName: used by the simulator and performs taint operations, etc
  *      RawVariableName: direct reference to the BulletSim storage for the variable value
  *      ForceVariableName: direct reference (store and fetch) to the value in the physics engine.
- *  The last two (and certainly the last one) should be referenced only in taint-time.
+ *  The last one should only be referenced in taint-time.
  */
 
 /*
@@ -52,7 +52,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
  * SOP.ApplyImpulse     SOP.ApplyAngularImpulse     SOP.SetAngularImpulse   SOP.SetForce
  * SOG.ApplyImpulse     SOG.ApplyAngularImpulse     SOG.SetAngularImpulse
  * PA.AddForce          PA.AddAngularForce          PA.Torque = v           PA.Force = v
- * BS.ApplyCentralForce BS.ApplyTorque              
+ * BS.ApplyCentralForce BS.ApplyTorque
  */
 
 // Flags used to denote which properties updates when making UpdateProperties calls to linksets, etc.
@@ -72,19 +72,27 @@ public abstract class BSPhysObject : PhysicsActor
     }
     protected BSPhysObject(BSScene parentScene, uint localID, string name, string typeName)
     {
-        PhysicsScene = parentScene;
+        IsInitialized = false;
+
+        PhysScene = parentScene;
         LocalID = localID;
         PhysObjectName = name;
         Name = name;    // PhysicsActor also has the name of the object. Someday consolidate.
         TypeName = typeName;
 
+        // The collection of things that push me around
+        PhysicalActors = new BSActorCollection(PhysScene);
+
         // Initialize variables kept in base.
         GravModifier = 1.0f;
         Gravity = new OMV.Vector3(0f, 0f, BSParam.Gravity);
+        HoverActive = false;
 
         // We don't have any physical representation yet.
         PhysBody = new BulletBody(localID);
-        PhysShape = new BulletShape();
+        PhysShape = new BSShapeNull();
+
+        UserSetCenterOfMassDisplacement = null;
 
         PrimAssetState = PrimAssetCondition.Unknown;
 
@@ -92,30 +100,41 @@ public abstract class BSPhysObject : PhysicsActor
         SetMaterial((int)MaterialAttributes.Material.Wood);
 
         CollisionCollection = new CollisionEventUpdate();
-        CollisionsLastTick = CollisionCollection;
+        CollisionsLastReported = CollisionCollection;
+        CollisionsLastTick = new CollisionEventUpdate();
+        CollisionsLastTickStep = -1;
+
         SubscribedEventsMs = 0;
-        CollidingStep = 0;
-        CollidingGroundStep = 0;
-        CollisionAccumulation = 0;
+        // Crazy values that will never be true
+        CollidingStep = BSScene.NotASimulationStep;
+        CollidingGroundStep = BSScene.NotASimulationStep;
+        CollisionAccumulation = BSScene.NotASimulationStep;
         ColliderIsMoving = false;
         CollisionScore = 0;
 
         // All axis free.
-        LockedAxis = LockedAxisFree;
+        LockedLinearAxis = LockedAxisFree;
+        LockedAngularAxis = LockedAxisFree;
     }
 
     // Tell the object to clean up.
     public virtual void Destroy()
     {
-        UnRegisterAllPreStepActions();
-        UnRegisterAllPostStepActions();
+        PhysicalActors.Enable(false);
+        PhysScene.TaintedObject("BSPhysObject.Destroy", delegate()
+        {
+            PhysicalActors.Dispose();
+        });
     }
 
-    public BSScene PhysicsScene { get; protected set; }
+    public BSScene PhysScene { get; protected set; }
     // public override uint LocalID { get; set; } // Use the LocalID definition in PhysicsActor
     public string PhysObjectName { get; protected set; }
     public string TypeName { get; protected set; }
 
+    // Set to 'true' when the object is completely initialized.
+    // This mostly prevents property updates and collisions until the object is completely here.
+    public bool IsInitialized { get; protected set; }
 
     // Return the object mass without calculating it or having side effects
     public abstract float RawMass { get; }
@@ -131,26 +150,19 @@ public abstract class BSPhysObject : PhysicsActor
     // Reference to the physical body (btCollisionObject) of this object
     public BulletBody PhysBody;
     // Reference to the physical shape (btCollisionShape) of this object
-    public BulletShape PhysShape;
+    public BSShape PhysShape;
 
     // The physical representation of the prim might require an asset fetch.
     // The asset state is first 'Unknown' then 'Waiting' then either 'Failed' or 'Fetched'.
     public enum PrimAssetCondition
     {
-        Unknown, Waiting, Failed, Fetched
+        Unknown, Waiting, FailedAssetFetch, FailedMeshing, Fetched
     }
     public PrimAssetCondition PrimAssetState { get; set; }
 
     // The objects base shape information. Null if not a prim type shape.
     public PrimitiveBaseShape BaseShape { get; protected set; }
 
-    // Some types of objects have preferred physical representations.
-    // Returns SHAPE_UNKNOWN if there is no preference.
-    public virtual BSPhysicsShapeType PreferredPhysicalShape
-    {
-        get { return BSPhysicsShapeType.SHAPE_UNKNOWN; }
-    }
-
     // When the physical properties are updated, an EntityProperty holds the update values.
     // Keep the current and last EntityProperties to enable computation of differences
     //      between the current update and the previous values.
@@ -168,6 +180,7 @@ public abstract class BSPhysObject : PhysicsActor
     public abstract bool IsSolid { get; }
     public abstract bool IsStatic { get; }
     public abstract bool IsSelected { get; }
+    public abstract bool IsVolumeDetect { get; }
 
     // Materialness
     public MaterialAttributes.Material Material { get; private set; }
@@ -176,11 +189,25 @@ public abstract class BSPhysObject : PhysicsActor
         Material = (MaterialAttributes.Material)material;
 
         // Setting the material sets the material attributes also.
+        // TODO: decide if this is necessary -- the simulator does this.
         MaterialAttributes matAttrib = BSMaterials.GetAttributes(Material, false);
         Friction = matAttrib.friction;
         Restitution = matAttrib.restitution;
-        Density = matAttrib.density / BSParam.DensityScaleFactor;
-        DetailLog("{0},{1}.SetMaterial,Mat={2},frict={3},rest={4},den={5}", LocalID, TypeName, Material, Friction, Restitution, Density);
+        Density = matAttrib.density;
+        // DetailLog("{0},{1}.SetMaterial,Mat={2},frict={3},rest={4},den={5}", LocalID, TypeName, Material, Friction, Restitution, Density);
+    }
+
+    public override float Density
+    {
+        get
+        {
+            return base.Density;
+        }
+        set
+        {
+            DetailLog("{0},BSPhysObject.Density,set,den={1}", LocalID, value);
+            base.Density = value;
+        }
     }
 
     // Stop all physical motion.
@@ -190,21 +217,55 @@ public abstract class BSPhysObject : PhysicsActor
     // Update the physical location and motion of the object. Called with data from Bullet.
     public abstract void UpdateProperties(EntityProperties entprop);
 
-    public abstract OMV.Vector3 RawPosition { get; set; }
+    public virtual OMV.Vector3 RawPosition { get; set; }
     public abstract OMV.Vector3 ForcePosition { get; set; }
 
-    public abstract OMV.Quaternion RawOrientation { get; set; }
+    public virtual OMV.Quaternion RawOrientation { get; set; }
     public abstract OMV.Quaternion ForceOrientation { get; set; }
 
-    public abstract OMV.Vector3 RawVelocity { get; set; }
+    public OMV.Vector3 RawVelocity { get; set; }
     public abstract OMV.Vector3 ForceVelocity { get; set; }
 
+    public OMV.Vector3 RawForce { get; set; }
+    public OMV.Vector3 RawTorque { get; set; }
+    public override void AddAngularForce(OMV.Vector3 force, bool pushforce)
+    {
+        AddAngularForce(force, pushforce, false);
+    }
+    public abstract void AddAngularForce(OMV.Vector3 force, bool pushforce, bool inTaintTime);
+    public abstract void AddForce(OMV.Vector3 force, bool pushforce, bool inTaintTime);
+
     public abstract OMV.Vector3 ForceRotationalVelocity { get; set; }
 
     public abstract float ForceBuoyancy { get; set; }
 
     public virtual bool ForceBodyShapeRebuild(bool inTaintTime) { return false; }
 
+    public override bool PIDActive { set { MoveToTargetActive = value; } }
+    public override OMV.Vector3 PIDTarget { set { MoveToTargetTarget = value; } }
+    public override float PIDTau { set { MoveToTargetTau = value; } }
+
+    public bool MoveToTargetActive { get; set; }
+    public OMV.Vector3 MoveToTargetTarget { get; set; }
+    public float MoveToTargetTau { get; set; }
+
+    // Used for llSetHoverHeight and maybe vehicle height. Hover Height will override MoveTo target's Z
+    public override bool PIDHoverActive { set { HoverActive = value; } }
+    public override float PIDHoverHeight { set { HoverHeight = value; } }
+    public override PIDHoverType PIDHoverType { set { HoverType = value; } }
+    public override float PIDHoverTau { set { HoverTau = value; } }
+
+    public bool HoverActive { get; set; }
+    public float HoverHeight { get;  set; }
+    public PIDHoverType HoverType { get;  set; }
+    public float HoverTau { get; set; }
+
+    // For RotLookAt
+    public override OMV.Quaternion APIDTarget { set { return; } }
+    public override bool APIDActive { set { return; } }
+    public override float APIDStrength { set { return; } }
+    public override float APIDDamping { set { return; } }
+
     // The current velocity forward
     public virtual float ForwardSpeed
     {
@@ -226,10 +287,58 @@ public abstract class BSPhysObject : PhysicsActor
 
     // The user can optionally set the center of mass. The user's setting will override any
     //    computed center-of-mass (like in linksets).
-    public OMV.Vector3? UserSetCenterOfMass { get; set; }
+    // Note this is a displacement from the root's coordinates. Zero means use the root prim as center-of-mass.
+    public OMV.Vector3? UserSetCenterOfMassDisplacement { get; set; }
+
+    public OMV.Vector3 LockedLinearAxis { get; set; } // zero means locked. one means free.
+    public OMV.Vector3 LockedAngularAxis { get; set; } // zero means locked. one means free.
+    public const float FreeAxis = 1f;
+    public readonly OMV.Vector3 LockedAxisFree = new OMV.Vector3(FreeAxis, FreeAxis, FreeAxis);  // All axis are free
+
+    // Enable physical actions. Bullet will keep sleeping non-moving physical objects so
+    //     they need waking up when parameters are changed.
+    // Called in taint-time!!
+    public void ActivateIfPhysical(bool forceIt)
+    {
+        if (IsPhysical && PhysBody.HasPhysicalBody)
+            PhysScene.PE.Activate(PhysBody, forceIt);
+    }
 
-    public OMV.Vector3 LockedAxis { get; set; } // zero means locked. one means free.
-    public readonly OMV.Vector3 LockedAxisFree = new OMV.Vector3(1f, 1f, 1f);  // All axis are free
+    // 'actors' act on the physical object to change or constrain its motion. These can range from
+    //       hovering to complex vehicle motion.
+    // May be called at non-taint time as this just adds the actor to the action list and the real
+    //    work is done during the simulation step.
+    // Note that, if the actor is already in the list and we are disabling same, the actor is just left
+    //    in the list disabled.
+    public delegate BSActor CreateActor();
+    public void EnableActor(bool enableActor, string actorName, CreateActor creator)
+    {
+        lock (PhysicalActors)
+        {
+            BSActor theActor;
+            if (PhysicalActors.TryGetActor(actorName, out theActor))
+            {
+                // The actor already exists so just turn it on or off
+                DetailLog("{0},BSPhysObject.EnableActor,enablingExistingActor,name={1},enable={2}", LocalID, actorName, enableActor);
+                theActor.Enabled = enableActor;
+            }
+            else
+            {
+                // The actor does not exist. If it should, create it.
+                if (enableActor)
+                {
+                    DetailLog("{0},BSPhysObject.EnableActor,creatingActor,name={1}", LocalID, actorName);
+                    theActor = creator();
+                    PhysicalActors.Add(actorName, theActor);
+                    theActor.Enabled = true;
+                }
+                else
+                {
+                    DetailLog("{0},BSPhysObject.EnableActor,notCreatingActorSinceNotEnabled,name={1}", LocalID, actorName);
+                }
+            }
+        }
+    }
 
     #region Collisions
 
@@ -247,70 +356,98 @@ public abstract class BSPhysObject : PhysicsActor
     protected CollisionFlags CurrentCollisionFlags { get; set; }
     // On a collision, check the collider and remember if the last collider was moving
     //    Used to modify the standing of avatars (avatars on stationary things stand still)
-    protected bool ColliderIsMoving;
+    public bool ColliderIsMoving;
+    // 'true' if the last collider was a volume detect object
+    public bool ColliderIsVolumeDetect;
+    // Used by BSCharacter to manage standing (and not slipping)
+    public bool IsStationary;
 
     // Count of collisions for this object
     protected long CollisionAccumulation { get; set; }
 
     public override bool IsColliding {
-        get { return (CollidingStep == PhysicsScene.SimulationStep); }
+        get { return (CollidingStep == PhysScene.SimulationStep); }
         set {
             if (value)
-                CollidingStep = PhysicsScene.SimulationStep;
+                CollidingStep = PhysScene.SimulationStep;
             else
-                CollidingStep = 0;
+                CollidingStep = BSScene.NotASimulationStep;
             }
     }
+    // Complex objects (like linksets) need to know if there is a collision on any part of
+    //    their shape. 'IsColliding' has an existing definition of reporting a collision on
+    //    only this specific prim or component of linksets.
+    // 'HasSomeCollision' is defined as reporting if there is a collision on any part of
+    //    the complex body that this prim is the root of.
+    public virtual bool HasSomeCollision
+    {
+        get { return IsColliding; }
+        set { IsColliding = value; }
+    }
     public override bool CollidingGround {
-        get { return (CollidingGroundStep == PhysicsScene.SimulationStep); }
+        get { return (CollidingGroundStep == PhysScene.SimulationStep); }
         set
         {
             if (value)
-                CollidingGroundStep = PhysicsScene.SimulationStep;
+                CollidingGroundStep = PhysScene.SimulationStep;
             else
-                CollidingGroundStep = 0;
+                CollidingGroundStep = BSScene.NotASimulationStep;
         }
     }
     public override bool CollidingObj {
-        get { return (CollidingObjectStep == PhysicsScene.SimulationStep); }
-        set { 
+        get { return (CollidingObjectStep == PhysScene.SimulationStep); }
+        set {
             if (value)
-                CollidingObjectStep = PhysicsScene.SimulationStep;
+                CollidingObjectStep = PhysScene.SimulationStep;
             else
-                CollidingObjectStep = 0;
+                CollidingObjectStep = BSScene.NotASimulationStep;
         }
     }
 
-    // The collisions that have been collected this tick
+    // The collisions that have been collected for the next collision reporting (throttled by subscription)
     protected CollisionEventUpdate CollisionCollection;
-    // Remember collisions from last tick for fancy collision based actions
+    // This is the collision collection last reported to the Simulator.
+    public CollisionEventUpdate CollisionsLastReported;
+    // Remember the collisions recorded in the last tick for fancy collision checking
     //     (like a BSCharacter walking up stairs).
-    protected CollisionEventUpdate CollisionsLastTick;
+    public CollisionEventUpdate CollisionsLastTick;
+    private long CollisionsLastTickStep = -1;
 
     // The simulation step is telling this object about a collision.
     // Return 'true' if a collision was processed and should be sent up.
     // Return 'false' if this object is not enabled/subscribed/appropriate for or has already seen this collision.
     // Called at taint time from within the Step() function
+    public delegate bool CollideCall(uint collidingWith, BSPhysObject collidee, OMV.Vector3 contactPoint, OMV.Vector3 contactNormal, float pentrationDepth);
     public virtual bool Collide(uint collidingWith, BSPhysObject collidee,
                     OMV.Vector3 contactPoint, OMV.Vector3 contactNormal, float pentrationDepth)
     {
         bool ret = false;
 
         // The following lines make IsColliding(), CollidingGround() and CollidingObj work
-        CollidingStep = PhysicsScene.SimulationStep;
-        if (collidingWith <= PhysicsScene.TerrainManager.HighestTerrainID)
+        CollidingStep = PhysScene.SimulationStep;
+        if (collidingWith <= PhysScene.TerrainManager.HighestTerrainID)
         {
-            CollidingGroundStep = PhysicsScene.SimulationStep;
+            CollidingGroundStep = PhysScene.SimulationStep;
         }
         else
         {
-            CollidingObjectStep = PhysicsScene.SimulationStep;
+            CollidingObjectStep = PhysScene.SimulationStep;
         }
 
         CollisionAccumulation++;
 
         // For movement tests, remember if we are colliding with an object that is moving.
         ColliderIsMoving = collidee != null ? (collidee.RawVelocity != OMV.Vector3.Zero) : false;
+        ColliderIsVolumeDetect = collidee != null ? (collidee.IsVolumeDetect) : false;
+
+        // Make a collection of the collisions that happened the last simulation tick.
+        // This is different than the collection created for sending up to the simulator as it is cleared every tick.
+        if (CollisionsLastTickStep != PhysScene.SimulationStep)
+        {
+            CollisionsLastTick = new CollisionEventUpdate();
+            CollisionsLastTickStep = PhysScene.SimulationStep;
+        }
+        CollisionsLastTick.AddCollider(collidingWith, new ContactPoint(contactPoint, contactNormal, pentrationDepth));
 
         // If someone has subscribed for collision events log the collision so it will be reported up
         if (SubscribedEvents()) {
@@ -332,12 +469,12 @@ public abstract class BSPhysObject : PhysicsActor
         bool ret = true;
 
         // If the 'no collision' call, force it to happen right now so quick collision_end
-        bool force = (CollisionCollection.Count == 0 && CollisionsLastTick.Count != 0);
+        bool force = (CollisionCollection.Count == 0 && CollisionsLastReported.Count != 0);
 
         // throttle the collisions to the number of milliseconds specified in the subscription
-        if (force || (PhysicsScene.SimulationNowTime >= NextCollisionOkTime))
+        if (force || (PhysScene.SimulationNowTime >= NextCollisionOkTime))
         {
-            NextCollisionOkTime = PhysicsScene.SimulationNowTime + SubscribedEventsMs;
+            NextCollisionOkTime = PhysScene.SimulationNowTime + SubscribedEventsMs;
 
             // We are called if we previously had collisions. If there are no collisions
             //   this time, send up one last empty event so OpenSim can sense collision end.
@@ -351,11 +488,11 @@ public abstract class BSPhysObject : PhysicsActor
             base.SendCollisionUpdate(CollisionCollection);
 
             // Remember the collisions from this tick for some collision specific processing.
-            CollisionsLastTick = CollisionCollection;
+            CollisionsLastReported = CollisionCollection;
 
             // The CollisionCollection instance is passed around in the simulator.
             // Make sure we don't have a handle to that one and that a new one is used for next time.
-            //    This fixes an interesting 'gotcha'. If we call CollisionCollection.Clear() here, 
+            //    This fixes an interesting 'gotcha'. If we call CollisionCollection.Clear() here,
             //    a race condition is created for the other users of this instance.
             CollisionCollection = new CollisionEventUpdate();
         }
@@ -372,10 +509,10 @@ public abstract class BSPhysObject : PhysicsActor
             // make sure first collision happens
             NextCollisionOkTime = Util.EnvironmentTickCountSubtract(SubscribedEventsMs);
 
-            PhysicsScene.TaintedObject(TypeName+".SubscribeEvents", delegate()
+            PhysScene.TaintedObject(TypeName+".SubscribeEvents", delegate()
             {
                 if (PhysBody.HasPhysicalBody)
-                    CurrentCollisionFlags = PhysicsScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
+                    CurrentCollisionFlags = PhysScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
             });
         }
         else
@@ -387,11 +524,11 @@ public abstract class BSPhysObject : PhysicsActor
     public override void UnSubscribeEvents() {
         // DetailLog("{0},{1}.UnSubscribeEvents,unsubscribing", LocalID, TypeName);
         SubscribedEventsMs = 0;
-        PhysicsScene.TaintedObject(TypeName+".UnSubscribeEvents", delegate()
+        PhysScene.TaintedObject(TypeName+".UnSubscribeEvents", delegate()
         {
             // Make sure there is a body there because sometimes destruction happens in an un-ideal order.
             if (PhysBody.HasPhysicalBody)
-                CurrentCollisionFlags = PhysicsScene.PE.RemoveFromCollisionFlags(PhysBody, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
+                CurrentCollisionFlags = PhysScene.PE.RemoveFromCollisionFlags(PhysBody, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
         });
     }
     // Return 'true' if the simulator wants collision events
@@ -405,7 +542,7 @@ public abstract class BSPhysObject : PhysicsActor
     {
         // Scale the collision count by the time since the last collision.
         // The "+1" prevents dividing by zero.
-        long timeAgo = PhysicsScene.SimulationStep - CollidingStep + 1;
+        long timeAgo = PhysScene.SimulationStep - CollidingStep + 1;
         CollisionScore = CollisionAccumulation / timeAgo;
     }
     public override float CollisionScore { get; set; }
@@ -413,103 +550,8 @@ public abstract class BSPhysObject : PhysicsActor
     #endregion // Collisions
 
     #region Per Simulation Step actions
-    // There are some actions that must be performed for a physical object before each simulation step.
-    // These actions are optional so, rather than scanning all the physical objects and asking them
-    //     if they have anything to do, a physical object registers for an event call before the step is performed.
-    // This bookkeeping makes it easy to add, remove and clean up after all these registrations.
-    private Dictionary<string, BSScene.PreStepAction> RegisteredPrestepActions = new Dictionary<string, BSScene.PreStepAction>();
-    private Dictionary<string, BSScene.PostStepAction> RegisteredPoststepActions = new Dictionary<string, BSScene.PostStepAction>();
-    protected void RegisterPreStepAction(string op, uint id, BSScene.PreStepAction actn)
-    {
-        string identifier = op + "-" + id.ToString();
-
-        lock (RegisteredPrestepActions)
-        {
-            // Clean out any existing action
-            UnRegisterPreStepAction(op, id);
-            RegisteredPrestepActions[identifier] = actn;
-            PhysicsScene.BeforeStep += actn;
-        }
-        DetailLog("{0},BSPhysObject.RegisterPreStepAction,id={1}", LocalID, identifier);
-    }
 
-    // Unregister a pre step action. Safe to call if the action has not been registered.
-    // Returns 'true' if an action was actually removed
-    protected bool UnRegisterPreStepAction(string op, uint id)
-    {
-        string identifier = op + "-" + id.ToString();
-        bool removed = false;
-        lock (RegisteredPrestepActions)
-        {
-            if (RegisteredPrestepActions.ContainsKey(identifier))
-            {
-                PhysicsScene.BeforeStep -= RegisteredPrestepActions[identifier];
-                RegisteredPrestepActions.Remove(identifier);
-                removed = true;
-            }
-        }
-        DetailLog("{0},BSPhysObject.UnRegisterPreStepAction,id={1},removed={2}", LocalID, identifier, removed);
-        return removed;
-    }
-
-    protected void UnRegisterAllPreStepActions()
-    {
-        lock (RegisteredPrestepActions)
-        {
-            foreach (KeyValuePair<string, BSScene.PreStepAction> kvp in RegisteredPrestepActions)
-            {
-                PhysicsScene.BeforeStep -= kvp.Value;
-            }
-            RegisteredPrestepActions.Clear();
-        }
-        DetailLog("{0},BSPhysObject.UnRegisterAllPreStepActions,", LocalID);
-    }
-    
-    protected void RegisterPostStepAction(string op, uint id, BSScene.PostStepAction actn)
-    {
-        string identifier = op + "-" + id.ToString();
-
-        lock (RegisteredPoststepActions)
-        {
-            // Clean out any existing action
-            UnRegisterPostStepAction(op, id);
-            RegisteredPoststepActions[identifier] = actn;
-            PhysicsScene.AfterStep += actn;
-        }
-        DetailLog("{0},BSPhysObject.RegisterPostStepAction,id={1}", LocalID, identifier);
-    }
-
-    // Unregister a pre step action. Safe to call if the action has not been registered.
-    // Returns 'true' if an action was actually removed.
-    protected bool UnRegisterPostStepAction(string op, uint id)
-    {
-        string identifier = op + "-" + id.ToString();
-        bool removed = false;
-        lock (RegisteredPoststepActions)
-        {
-            if (RegisteredPoststepActions.ContainsKey(identifier))
-            {
-                PhysicsScene.AfterStep -= RegisteredPoststepActions[identifier];
-                RegisteredPoststepActions.Remove(identifier);
-                removed = true;
-            }
-        }
-        DetailLog("{0},BSPhysObject.UnRegisterPostStepAction,id={1},removed={2}", LocalID, identifier, removed);
-        return removed;
-    }
-
-    protected void UnRegisterAllPostStepActions()
-    {
-        lock (RegisteredPoststepActions)
-        {
-            foreach (KeyValuePair<string, BSScene.PostStepAction> kvp in RegisteredPoststepActions)
-            {
-                PhysicsScene.AfterStep -= kvp.Value;
-            }
-            RegisteredPoststepActions.Clear();
-        }
-        DetailLog("{0},BSPhysObject.UnRegisterAllPostStepActions,", LocalID);
-    }
+    public BSActorCollection PhysicalActors;
 
     // When an update to the physical properties happens, this event is fired to let
     //    different actors to modify the update before it is passed around
@@ -522,53 +564,13 @@ public abstract class BSPhysObject : PhysicsActor
             actions(ref entprop);
     }
 
-    private Dictionary<string, PreUpdatePropertyAction> RegisteredPreUpdatePropertyActions = new Dictionary<string, PreUpdatePropertyAction>();
-    public void RegisterPreUpdatePropertyAction(string identifier, PreUpdatePropertyAction actn)
-    {
-        lock (RegisteredPreUpdatePropertyActions)
-        {
-            // Clean out any existing action
-            UnRegisterPreUpdatePropertyAction(identifier);
-            RegisteredPreUpdatePropertyActions[identifier] = actn;
-            OnPreUpdateProperty += actn;
-        }
-        DetailLog("{0},BSPhysObject.RegisterPreUpdatePropertyAction,id={1}", LocalID, identifier);
-    }
-    public bool UnRegisterPreUpdatePropertyAction(string identifier)
-    {
-        bool removed = false;
-        lock (RegisteredPreUpdatePropertyActions)
-        {
-            if (RegisteredPreUpdatePropertyActions.ContainsKey(identifier))
-            {
-                OnPreUpdateProperty -= RegisteredPreUpdatePropertyActions[identifier];
-                RegisteredPreUpdatePropertyActions.Remove(identifier);
-                removed = true;
-            }
-        }
-        DetailLog("{0},BSPhysObject.UnRegisterPreUpdatePropertyAction,id={1},removed={2}", LocalID, identifier, removed);
-        return removed;
-    }
-    public void UnRegisterAllPreUpdatePropertyActions()
-    {
-        lock (RegisteredPreUpdatePropertyActions)
-        {
-            foreach (KeyValuePair<string, PreUpdatePropertyAction> kvp in RegisteredPreUpdatePropertyActions)
-            {
-                OnPreUpdateProperty -= kvp.Value;
-            }
-            RegisteredPreUpdatePropertyActions.Clear();
-        }
-        DetailLog("{0},BSPhysObject.UnRegisterAllPreUpdatePropertyAction,", LocalID);
-    }
-
     #endregion // Per Simulation Step actions
 
     // High performance detailed logging routine used by the physical objects.
     protected void DetailLog(string msg, params Object[] args)
     {
-        if (PhysicsScene.PhysicsLogging.Enabled)
-            PhysicsScene.DetailLog(msg, args);
+        if (PhysScene.PhysicsLogging.Enabled)
+            PhysScene.DetailLog(msg, args);
     }
 
 }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 6a5461a..d5b999d 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -51,15 +51,8 @@ public class BSPrim : BSPhysObject
     private bool _isSelected;
     private bool _isVolumeDetect;
 
-    // _position is what the simulator thinks the positions of the prim is.
-    private OMV.Vector3 _position;
-
     private float _mass;    // the mass of this object
-    private OMV.Vector3 _force;
-    private OMV.Vector3 _velocity;
-    private OMV.Vector3 _torque;
     private OMV.Vector3 _acceleration;
-    private OMV.Quaternion _orientation;
     private int _physicsActorType;
     private bool _isPhysical;
     private bool _flying;
@@ -72,16 +65,18 @@ public class BSPrim : BSPhysObject
 
     private int CrossingFailures { get; set; }
 
-    public BSDynamics VehicleController { get; private set; }
-
-    private BSVMotor _targetMotor;
-    private OMV.Vector3 _PIDTarget;
-    private float _PIDTau;
+    // Keep a handle to the vehicle actor so it is easy to set parameters on same.
+    public const string VehicleActorName = "BasicVehicle";
 
-    private BSFMotor _hoverMotor;
-    private float _PIDHoverHeight;
-    private PIDHoverType _PIDHoverType;
-    private float _PIDHoverTau;
+    // Parameters for the hover actor
+    public const string HoverActorName = "BSPrim.HoverActor";
+    // Parameters for the axis lock actor
+    public const String LockedAxisActorName = "BSPrim.LockedAxis";
+    // Parameters for the move to target actor
+    public const string MoveToTargetActorName = "BSPrim.MoveToTargetActor";
+    // Parameters for the setForce and setTorque actors
+    public const string SetForceActorName = "BSPrim.SetForceActor";
+    public const string SetTorqueActorName = "BSPrim.SetTorqueActor";
 
     public BSPrim(uint localID, String primName, BSScene parent_scene, OMV.Vector3 pos, OMV.Vector3 size,
                        OMV.Quaternion rotation, PrimitiveBaseShape pbs, bool pisPhysical)
@@ -89,31 +84,34 @@ public class BSPrim : BSPhysObject
     {
         // m_log.DebugFormat("{0}: BSPrim creation of {1}, id={2}", LogHeader, primName, localID);
         _physicsActorType = (int)ActorTypes.Prim;
-        _position = pos;
+        RawPosition = pos;
         _size = size;
         Scale = size;   // prims are the size the user wants them to be (different for BSCharactes).
-        _orientation = rotation;
+        RawOrientation = rotation;
         _buoyancy = 0f;
-        _velocity = OMV.Vector3.Zero;
+        RawVelocity = OMV.Vector3.Zero;
         _rotationalVelocity = OMV.Vector3.Zero;
         BaseShape = pbs;
         _isPhysical = pisPhysical;
         _isVolumeDetect = false;
 
-        VehicleController = new BSDynamics(PhysicsScene, this);            // add vehicleness
+        // Add a dynamic vehicle to our set of actors that can move this prim.
+        // PhysicalActors.Add(VehicleActorName, new BSDynamics(PhysScene, this, VehicleActorName));
 
         _mass = CalculateMass();
 
-        DetailLog("{0},BSPrim.constructor,call", LocalID);
+        // DetailLog("{0},BSPrim.constructor,call", LocalID);
         // do the actual object creation at taint time
-        PhysicsScene.TaintedObject("BSPrim.create", delegate()
+        PhysScene.TaintedObject("BSPrim.create", delegate()
         {
             // Make sure the object is being created with some sanity.
             ExtremeSanityCheck(true /* inTaintTime */);
 
             CreateGeomAndObject(true);
 
-            CurrentCollisionFlags = PhysicsScene.PE.GetCollisionFlags(PhysBody);
+            CurrentCollisionFlags = PhysScene.PE.GetCollisionFlags(PhysBody);
+
+            IsInitialized = true;
         });
     }
 
@@ -121,19 +119,21 @@ public class BSPrim : BSPhysObject
     public override void Destroy()
     {
         // m_log.DebugFormat("{0}: Destroy, id={1}", LogHeader, LocalID);
+        IsInitialized = false;
+
         base.Destroy();
 
         // Undo any vehicle properties
         this.VehicleType = (int)Vehicle.TYPE_NONE;
 
-        PhysicsScene.TaintedObject("BSPrim.destroy", delegate()
+        PhysScene.TaintedObject("BSPrim.Destroy", delegate()
         {
             DetailLog("{0},BSPrim.Destroy,taint,", LocalID);
             // If there are physical body and shape, release my use of same.
-            PhysicsScene.Shapes.DereferenceBody(PhysBody, null);
+            PhysScene.Shapes.DereferenceBody(PhysBody, null);
             PhysBody.Clear();
-            PhysicsScene.Shapes.DereferenceShape(PhysShape, null);
-            PhysShape.Clear();
+            PhysShape.Dereference(PhysScene);
+            PhysShape = new BSShapeNull();
         });
     }
 
@@ -159,25 +159,13 @@ public class BSPrim : BSPhysObject
             ForceBodyShapeRebuild(false);
         }
     }
-    // 'unknown' says to choose the best type
-    public override BSPhysicsShapeType PreferredPhysicalShape
-        { get { return BSPhysicsShapeType.SHAPE_UNKNOWN; } }
-
     public override bool ForceBodyShapeRebuild(bool inTaintTime)
     {
-        if (inTaintTime)
+        PhysScene.TaintedObject(inTaintTime, "BSPrim.ForceBodyShapeRebuild", delegate()
         {
             _mass = CalculateMass();   // changing the shape changes the mass
             CreateGeomAndObject(true);
-        }
-        else
-        {
-            PhysicsScene.TaintedObject("BSPrim.ForceBodyShapeRebuild", delegate()
-            {
-                _mass = CalculateMass();   // changing the shape changes the mass
-                CreateGeomAndObject(true);
-            });
-        }
+        });
         return true;
     }
     public override bool Grabbed {
@@ -190,7 +178,7 @@ public class BSPrim : BSPhysObject
             if (value != _isSelected)
             {
                 _isSelected = value;
-                PhysicsScene.TaintedObject("BSPrim.setSelected", delegate()
+                PhysScene.TaintedObject("BSPrim.setSelected", delegate()
                 {
                     DetailLog("{0},BSPrim.selected,taint,selected={1}", LocalID, _isSelected);
                     SetObjectDynamic(false);
@@ -231,165 +219,93 @@ public class BSPrim : BSPhysObject
     // Called at taint time!
     public override void ZeroMotion(bool inTaintTime)
     {
-        _velocity = OMV.Vector3.Zero;
+        RawVelocity = OMV.Vector3.Zero;
         _acceleration = OMV.Vector3.Zero;
         _rotationalVelocity = OMV.Vector3.Zero;
 
         // Zero some other properties in the physics engine
-        PhysicsScene.TaintedObject(inTaintTime, "BSPrim.ZeroMotion", delegate()
+        PhysScene.TaintedObject(inTaintTime, "BSPrim.ZeroMotion", delegate()
         {
             if (PhysBody.HasPhysicalBody)
-                PhysicsScene.PE.ClearAllForces(PhysBody);
+                PhysScene.PE.ClearAllForces(PhysBody);
         });
     }
     public override void ZeroAngularMotion(bool inTaintTime)
     {
         _rotationalVelocity = OMV.Vector3.Zero;
         // Zero some other properties in the physics engine
-        PhysicsScene.TaintedObject(inTaintTime, "BSPrim.ZeroMotion", delegate()
+        PhysScene.TaintedObject(inTaintTime, "BSPrim.ZeroMotion", delegate()
         {
             // DetailLog("{0},BSPrim.ZeroAngularMotion,call,rotVel={1}", LocalID, _rotationalVelocity);
             if (PhysBody.HasPhysicalBody)
             {
-                PhysicsScene.PE.SetInterpolationAngularVelocity(PhysBody, _rotationalVelocity);
-                PhysicsScene.PE.SetAngularVelocity(PhysBody, _rotationalVelocity);
+                PhysScene.PE.SetInterpolationAngularVelocity(PhysBody, _rotationalVelocity);
+                PhysScene.PE.SetAngularVelocity(PhysBody, _rotationalVelocity);
             }
         });
     }
 
-    bool TryExperimentalLockAxisCode = false;
-    BSConstraint LockAxisConstraint = null;
     public override void LockAngularMotion(OMV.Vector3 axis)
     {
         DetailLog("{0},BSPrim.LockAngularMotion,call,axis={1}", LocalID, axis);
 
         // "1" means free, "0" means locked
-        OMV.Vector3 locking = new OMV.Vector3(1f, 1f, 1f);
+        OMV.Vector3 locking = LockedAxisFree;
         if (axis.X != 1) locking.X = 0f;
         if (axis.Y != 1) locking.Y = 0f;
         if (axis.Z != 1) locking.Z = 0f;
-        LockedAxis = locking;
+        LockedAngularAxis = locking;
 
-        if (TryExperimentalLockAxisCode && LockedAxis != LockedAxisFree)
+        EnableActor(LockedAngularAxis != LockedAxisFree, LockedAxisActorName, delegate()
         {
-            // Lock that axis by creating a 6DOF constraint that has one end in the world and
-            //    the other in the object.
-            // http://www.bulletphysics.org/Bullet/phpBB3/viewtopic.php?p=20817
-            // http://www.bulletphysics.org/Bullet/phpBB3/viewtopic.php?p=26380
-
-            PhysicsScene.TaintedObject("BSPrim.LockAngularMotion", delegate()
-            {
-                CleanUpLockAxisPhysicals(true /* inTaintTime */);
-
-                BSConstraint6Dof axisConstrainer = new BSConstraint6Dof(PhysicsScene.World, PhysBody, 
-                                    OMV.Vector3.Zero, OMV.Quaternion.Inverse(RawOrientation),
-                                    true /* useLinearReferenceFrameB */, true /* disableCollisionsBetweenLinkedBodies */);
-                LockAxisConstraint = axisConstrainer;
-                PhysicsScene.Constraints.AddConstraint(LockAxisConstraint);
-
-                // The constraint is tied to the world and oriented to the prim.
-
-                // Free to move linearly
-                OMV.Vector3 linearLow = OMV.Vector3.Zero;
-                OMV.Vector3 linearHigh = PhysicsScene.TerrainManager.DefaultRegionSize;
-                axisConstrainer.SetLinearLimits(linearLow, linearHigh);
-
-                // Angular with some axis locked
-                float f2PI = (float)Math.PI * 2f;
-                OMV.Vector3 angularLow = new OMV.Vector3(-f2PI, -f2PI, -f2PI);
-                OMV.Vector3 angularHigh = new OMV.Vector3(f2PI, f2PI, f2PI);
-                if (LockedAxis.X != 1f)
-                {
-                    angularLow.X = 0f;
-                    angularHigh.X = 0f;
-                }
-                if (LockedAxis.Y != 1f)
-                {
-                    angularLow.Y = 0f;
-                    angularHigh.Y = 0f;
-                }
-                if (LockedAxis.Z != 1f)
-                {
-                    angularLow.Z = 0f;
-                    angularHigh.Z = 0f;
-                }
-                axisConstrainer.SetAngularLimits(angularLow, angularHigh);
-
-                DetailLog("{0},BSPrim.LockAngularMotion,create,linLow={1},linHi={2},angLow={3},angHi={4}",
-                                            LocalID, linearLow, linearHigh, angularLow, angularHigh);
-
-                // Constants from one of the posts mentioned above and used in Bullet's ConstraintDemo.
-                axisConstrainer.TranslationalLimitMotor(true /* enable */, 5.0f, 0.1f);
+            return new BSActorLockAxis(PhysScene, this, LockedAxisActorName);
+        });
 
-                axisConstrainer.RecomputeConstraintVariables(RawMass);
-            });
-        }
-        else
+        // Update parameters so the new actor's Refresh() action is called at the right time.
+        PhysScene.TaintedObject("BSPrim.LockAngularMotion", delegate()
         {
-            // Everything seems unlocked
-            CleanUpLockAxisPhysicals(false /* inTaintTime */);
-        }
+            UpdatePhysicalParameters();
+        });
 
         return;
     }
-    // Get rid of any constraint built for LockAxis
-    // Most often the constraint is removed when the constraint collection is cleaned for this prim.
-    private void CleanUpLockAxisPhysicals(bool inTaintTime)
-    {
-        if (LockAxisConstraint != null)
-        {
-            PhysicsScene.TaintedObject(inTaintTime, "BSPrim.CleanUpLockAxisPhysicals", delegate()
-            {
-                if (LockAxisConstraint != null)
-                {
-                    PhysicsScene.Constraints.RemoveAndDestroyConstraint(LockAxisConstraint);
-                    LockAxisConstraint = null;
-                    DetailLog("{0},BSPrim.CleanUpLockAxisPhysicals,destroyingConstraint", LocalID);
-                }
-            });
-        }
-    }
 
-    public override OMV.Vector3 RawPosition
-    {
-        get { return _position; }
-        set { _position = value; }
-    }
     public override OMV.Vector3 Position {
         get {
             // don't do the GetObjectPosition for root elements because this function is called a zillion times.
-            // _position = ForcePosition;
-            return _position;
+            // RawPosition = ForcePosition;
+            return RawPosition;
         }
         set {
             // If the position must be forced into the physics engine, use ForcePosition.
             // All positions are given in world positions.
-            if (_position == value)
+            if (RawPosition == value)
             {
-                DetailLog("{0},BSPrim.setPosition,call,positionNotChanging,pos={1},orient={2}", LocalID, _position, _orientation);
+                DetailLog("{0},BSPrim.setPosition,call,positionNotChanging,pos={1},orient={2}", LocalID, RawPosition, RawOrientation);
                 return;
             }
-            _position = value;
+            RawPosition = value;
             PositionSanityCheck(false);
 
-            PhysicsScene.TaintedObject("BSPrim.setPosition", delegate()
+            PhysScene.TaintedObject("BSPrim.setPosition", delegate()
             {
-                DetailLog("{0},BSPrim.SetPosition,taint,pos={1},orient={2}", LocalID, _position, _orientation);
-                ForcePosition = _position;
+                DetailLog("{0},BSPrim.SetPosition,taint,pos={1},orient={2}", LocalID, RawPosition, RawOrientation);
+                ForcePosition = RawPosition;
             });
         }
     }
 
+    // NOTE: overloaded by BSPrimDisplaced to handle offset for center-of-gravity.
     public override OMV.Vector3 ForcePosition {
         get {
-            _position = PhysicsScene.PE.GetPosition(PhysBody);
-            return _position;
+            RawPosition = PhysScene.PE.GetPosition(PhysBody);
+            return RawPosition;
         }
         set {
-            _position = value;
+            RawPosition = value;
             if (PhysBody.HasPhysicalBody)
             {
-                PhysicsScene.PE.SetTranslation(PhysBody, _position, _orientation);
+                PhysScene.PE.SetTranslation(PhysBody, RawPosition, RawOrientation);
                 ActivateIfPhysical(false);
             }
         }
@@ -406,7 +322,7 @@ public class BSPrim : BSPhysObject
         if (!IsPhysicallyActive)
             return ret;
 
-        if (!PhysicsScene.TerrainManager.IsWithinKnownTerrain(RawPosition))
+        if (!PhysScene.TerrainManager.IsWithinKnownTerrain(RawPosition))
         {
             // The physical object is out of the known/simulated area.
             // Upper levels of code will handle the transition to other areas so, for
@@ -414,7 +330,7 @@ public class BSPrim : BSPhysObject
             return ret;
         }
 
-        float terrainHeight = PhysicsScene.TerrainManager.GetTerrainHeightAtXYZ(RawPosition);
+        float terrainHeight = PhysScene.TerrainManager.GetTerrainHeightAtXYZ(RawPosition);
         OMV.Vector3 upForce = OMV.Vector3.Zero;
         float approxSize = Math.Max(Size.X, Math.Max(Size.Y, Size.Z));
         if ((RawPosition.Z + approxSize / 2f) < terrainHeight)
@@ -423,10 +339,10 @@ public class BSPrim : BSPhysObject
             float targetHeight = terrainHeight + (Size.Z / 2f);
             // If the object is below ground it just has to be moved up because pushing will
             //     not get it through the terrain
-            _position.Z = targetHeight;
+            RawPosition = new OMV.Vector3(RawPosition.X, RawPosition.Y, targetHeight);
             if (inTaintTime)
             {
-                ForcePosition = _position;
+                ForcePosition = RawPosition;
             }
             // If we are throwing the object around, zero its other forces
             ZeroMotion(inTaintTime);
@@ -435,7 +351,7 @@ public class BSPrim : BSPhysObject
 
         if ((CurrentCollisionFlags & CollisionFlags.BS_FLOATS_ON_WATER) != 0)
         {
-            float waterHeight = PhysicsScene.TerrainManager.GetWaterLevelAtXYZ(_position);
+            float waterHeight = PhysScene.TerrainManager.GetWaterLevelAtXYZ(RawPosition);
             // TODO: a floating motor so object will bob in the water
             if (Math.Abs(RawPosition.Z - waterHeight) > 0.1f)
             {
@@ -443,8 +359,8 @@ public class BSPrim : BSPhysObject
                 upForce.Z = (waterHeight - RawPosition.Z) * 1f;
 
                 // Apply upforce and overcome gravity.
-                OMV.Vector3 correctionForce = upForce - PhysicsScene.DefaultGravity;
-                DetailLog("{0},BSPrim.PositionSanityCheck,applyForce,pos={1},upForce={2},correctionForce={3}", LocalID, _position, upForce, correctionForce);
+                OMV.Vector3 correctionForce = upForce - PhysScene.DefaultGravity;
+                DetailLog("{0},BSPrim.PositionSanityCheck,applyForce,pos={1},upForce={2},correctionForce={3}", LocalID, RawPosition, upForce, correctionForce);
                 AddForce(correctionForce, false, inTaintTime);
                 ret = true;
             }
@@ -463,17 +379,17 @@ public class BSPrim : BSPhysObject
         uint wayOutThere = Constants.RegionSize * Constants.RegionSize;
         // There have been instances of objects getting thrown way out of bounds and crashing
         //    the border crossing code.
-        if (   _position.X < -Constants.RegionSize || _position.X > wayOutThere
-            || _position.Y < -Constants.RegionSize || _position.Y > wayOutThere
-            || _position.Z < -Constants.RegionSize || _position.Z > wayOutThere)
+        if (   RawPosition.X < -Constants.RegionSize || RawPosition.X > wayOutThere
+            || RawPosition.Y < -Constants.RegionSize || RawPosition.Y > wayOutThere
+            || RawPosition.Z < -Constants.RegionSize || RawPosition.Z > wayOutThere)
         {
-            _position = new OMV.Vector3(10, 10, 50);
+            RawPosition = new OMV.Vector3(10, 10, 50);
             ZeroMotion(inTaintTime);
             ret = true;
         }
-        if (_velocity.LengthSquared() > BSParam.MaxLinearVelocity)
+        if (RawVelocity.LengthSquared() > BSParam.MaxLinearVelocity)
         {
-            _velocity = Util.ClampV(_velocity, BSParam.MaxLinearVelocity);
+            RawVelocity = Util.ClampV(RawVelocity, BSParam.MaxLinearVelocity);
             ret = true;
         }
         if (_rotationalVelocity.LengthSquared() > BSParam.MaxAngularVelocitySquared)
@@ -498,7 +414,7 @@ public class BSPrim : BSPhysObject
         get { return _mass; }
     }
     // used when we only want this prim's mass and not the linkset thing
-    public override float RawMass { 
+    public override float RawMass {
         get { return _mass; }
     }
     // Set the physical mass to the passed mass.
@@ -509,10 +425,10 @@ public class BSPrim : BSPhysObject
         {
             if (IsStatic)
             {
-                PhysicsScene.PE.SetGravity(PhysBody, PhysicsScene.DefaultGravity);
+                PhysScene.PE.SetGravity(PhysBody, PhysScene.DefaultGravity);
                 Inertia = OMV.Vector3.Zero;
-                PhysicsScene.PE.SetMassProps(PhysBody, 0f, Inertia);
-                PhysicsScene.PE.UpdateInertiaTensor(PhysBody);
+                PhysScene.PE.SetMassProps(PhysBody, 0f, Inertia);
+                PhysScene.PE.UpdateInertiaTensor(PhysBody);
             }
             else
             {
@@ -521,16 +437,19 @@ public class BSPrim : BSPhysObject
                     // Changing interesting properties doesn't change proxy and collision cache
                     //    information. The Bullet solution is to re-add the object to the world
                     //    after parameters are changed.
-                    PhysicsScene.PE.RemoveObjectFromWorld(PhysicsScene.World, PhysBody);
+                    PhysScene.PE.RemoveObjectFromWorld(PhysScene.World, PhysBody);
                 }
 
                 // The computation of mass props requires gravity to be set on the object.
                 Gravity = ComputeGravity(Buoyancy);
-                PhysicsScene.PE.SetGravity(PhysBody, Gravity);
+                PhysScene.PE.SetGravity(PhysBody, Gravity);
 
-                Inertia = PhysicsScene.PE.CalculateLocalInertia(PhysShape, physMass);
-                PhysicsScene.PE.SetMassProps(PhysBody, physMass, Inertia);
-                PhysicsScene.PE.UpdateInertiaTensor(PhysBody);
+                // OMV.Vector3 currentScale = PhysScene.PE.GetLocalScaling(PhysShape.physShapeInfo);   // DEBUG DEBUG
+                // DetailLog("{0},BSPrim.UpdateMassProperties,currentScale{1},shape={2}", LocalID, currentScale, PhysShape.physShapeInfo);   // DEBUG DEBUG
+
+                Inertia = PhysScene.PE.CalculateLocalInertia(PhysShape.physShapeInfo, physMass);
+                PhysScene.PE.SetMassProps(PhysBody, physMass, Inertia);
+                PhysScene.PE.UpdateInertiaTensor(PhysBody);
 
                 DetailLog("{0},BSPrim.UpdateMassProperties,mass={1},localInertia={2},grav={3},inWorld={4}",
                                             LocalID, physMass, Inertia, Gravity, inWorld);
@@ -546,7 +465,7 @@ public class BSPrim : BSPhysObject
     // Return what gravity should be set to this very moment
     public OMV.Vector3 ComputeGravity(float buoyancy)
     {
-        OMV.Vector3 ret = PhysicsScene.DefaultGravity;
+        OMV.Vector3 ret = PhysScene.DefaultGravity;
 
         if (!IsStatic)
         {
@@ -570,95 +489,121 @@ public class BSPrim : BSPhysObject
     }
 
     public override OMV.Vector3 Force {
-        get { return _force; }
+        get { return RawForce; }
         set {
-            _force = value;
-            if (_force != OMV.Vector3.Zero)
+            RawForce = value;
+            EnableActor(RawForce != OMV.Vector3.Zero, SetForceActorName, delegate()
             {
-                // If the force is non-zero, it must be reapplied each tick because
-                //    Bullet clears the forces applied last frame.
-                RegisterPreStepAction("BSPrim.setForce", LocalID,
-                    delegate(float timeStep)
-                    {
-                        if (!IsPhysicallyActive || _force == OMV.Vector3.Zero)
-                        {
-                            UnRegisterPreStepAction("BSPrim.setForce", LocalID);
-                            return;
-                        }
+                return new BSActorSetForce(PhysScene, this, SetForceActorName);
+            });
+        }
+    }
 
-                        DetailLog("{0},BSPrim.setForce,preStep,force={1}", LocalID, _force);
-                        if (PhysBody.HasPhysicalBody)
-                        {
-                            PhysicsScene.PE.ApplyCentralForce(PhysBody, _force);
-                            ActivateIfPhysical(false);
-                        }
-                    }
-                );
-            }
-            else
+    // Find and return a handle to the current vehicle actor.
+    // Return 'null' if there is no vehicle actor.
+    public BSDynamics GetVehicleActor(bool createIfNone)
+    {
+        BSDynamics ret = null;
+        BSActor actor;
+        if (PhysicalActors.TryGetActor(VehicleActorName, out actor))
+        {
+            ret = actor as BSDynamics;
+        }
+        else
+        {
+            if (createIfNone)
             {
-                UnRegisterPreStepAction("BSPrim.setForce", LocalID);
+                ret = new BSDynamics(PhysScene, this, VehicleActorName);
+                PhysicalActors.Add(ret.ActorName, ret);
             }
         }
+        return ret;
     }
 
     public override int VehicleType {
         get {
-            return (int)VehicleController.Type;   // if we are a vehicle, return that type
+            int ret = (int)Vehicle.TYPE_NONE;
+            BSDynamics vehicleActor = GetVehicleActor(false /* createIfNone */);
+            if (vehicleActor != null)
+                ret = (int)vehicleActor.Type;
+            return ret;
         }
         set {
             Vehicle type = (Vehicle)value;
 
-            PhysicsScene.TaintedObject("setVehicleType", delegate()
+            PhysScene.TaintedObject("setVehicleType", delegate()
             {
-                // Done at taint time so we're sure the physics engine is not using the variables
-                // Vehicle code changes the parameters for this vehicle type.
-                VehicleController.ProcessTypeChange(type);
-                ActivateIfPhysical(false);
-
-                // If an active vehicle, register the vehicle code to be called before each step
-                if (VehicleController.Type == Vehicle.TYPE_NONE)
+                // Some vehicle scripts change vehicle type on the fly as an easy way to
+                //    change all the parameters. Like a plane changing to CAR when on the
+                //    ground. In this case, don't want to zero motion.
+                // ZeroMotion(true /* inTaintTime */);
+                if (type == Vehicle.TYPE_NONE)
                 {
-                    UnRegisterPreStepAction("BSPrim.Vehicle", LocalID);
-                    UnRegisterPostStepAction("BSPrim.Vehicle", LocalID);
+                    // Vehicle type is 'none' so get rid of any actor that may have been allocated.
+                    BSDynamics vehicleActor = GetVehicleActor(false /* createIfNone */);
+                    if (vehicleActor != null)
+                    {
+                        PhysicalActors.RemoveAndRelease(vehicleActor.ActorName);
+                    }
                 }
                 else
                 {
-                    RegisterPreStepAction("BSPrim.Vehicle", LocalID, VehicleController.Step);
-                    RegisterPostStepAction("BSPrim.Vehicle", LocalID, VehicleController.PostStep);
+                    // Vehicle type is not 'none' so create an actor and set it running.
+                    BSDynamics vehicleActor = GetVehicleActor(true /* createIfNone */);
+                    if (vehicleActor != null)
+                    {
+                        vehicleActor.ProcessTypeChange(type);
+                        ActivateIfPhysical(false);
+                    }
                 }
             });
         }
     }
     public override void VehicleFloatParam(int param, float value)
     {
-        PhysicsScene.TaintedObject("BSPrim.VehicleFloatParam", delegate()
+        PhysScene.TaintedObject("BSPrim.VehicleFloatParam", delegate()
         {
-            VehicleController.ProcessFloatVehicleParam((Vehicle)param, value);
-            ActivateIfPhysical(false);
+            BSDynamics vehicleActor = GetVehicleActor(true /* createIfNone */);
+            if (vehicleActor != null)
+            {
+                vehicleActor.ProcessFloatVehicleParam((Vehicle)param, value);
+                ActivateIfPhysical(false);
+            }
         });
     }
     public override void VehicleVectorParam(int param, OMV.Vector3 value)
     {
-        PhysicsScene.TaintedObject("BSPrim.VehicleVectorParam", delegate()
+        PhysScene.TaintedObject("BSPrim.VehicleVectorParam", delegate()
         {
-            VehicleController.ProcessVectorVehicleParam((Vehicle)param, value);
-            ActivateIfPhysical(false);
+            BSDynamics vehicleActor = GetVehicleActor(true /* createIfNone */);
+            if (vehicleActor != null)
+            {
+                vehicleActor.ProcessVectorVehicleParam((Vehicle)param, value);
+                ActivateIfPhysical(false);
+            }
         });
     }
     public override void VehicleRotationParam(int param, OMV.Quaternion rotation)
     {
-        PhysicsScene.TaintedObject("BSPrim.VehicleRotationParam", delegate()
+        PhysScene.TaintedObject("BSPrim.VehicleRotationParam", delegate()
         {
-            VehicleController.ProcessRotationVehicleParam((Vehicle)param, rotation);
-            ActivateIfPhysical(false);
+            BSDynamics vehicleActor = GetVehicleActor(true /* createIfNone */);
+            if (vehicleActor != null)
+            {
+                vehicleActor.ProcessRotationVehicleParam((Vehicle)param, rotation);
+                ActivateIfPhysical(false);
+            }
         });
     }
     public override void VehicleFlags(int param, bool remove)
     {
-        PhysicsScene.TaintedObject("BSPrim.VehicleFlags", delegate()
+        PhysScene.TaintedObject("BSPrim.VehicleFlags", delegate()
         {
-            VehicleController.ProcessVehicleFlags(param, remove);
+            BSDynamics vehicleActor = GetVehicleActor(true /* createIfNone */);
+            if (vehicleActor != null)
+            {
+                vehicleActor.ProcessVehicleFlags(param, remove);
+            }
         });
     }
 
@@ -668,7 +613,7 @@ public class BSPrim : BSPhysObject
         if (_isVolumeDetect != newValue)
         {
             _isVolumeDetect = newValue;
-            PhysicsScene.TaintedObject("BSPrim.SetVolumeDetect", delegate()
+            PhysScene.TaintedObject("BSPrim.SetVolumeDetect", delegate()
             {
                 // DetailLog("{0},setVolumeDetect,taint,volDetect={1}", LocalID, _isVolumeDetect);
                 SetObjectDynamic(true);
@@ -676,10 +621,14 @@ public class BSPrim : BSPhysObject
         }
         return;
     }
+    public override bool IsVolumeDetect
+    {
+        get { return _isVolumeDetect; }
+    }
     public override void SetMaterial(int material)
     {
         base.SetMaterial(material);
-        PhysicsScene.TaintedObject("BSPrim.SetMaterial", delegate()
+        PhysScene.TaintedObject("BSPrim.SetMaterial", delegate()
         {
             UpdatePhysicalParameters();
         });
@@ -692,7 +641,7 @@ public class BSPrim : BSPhysObject
             if (base.Friction != value)
             {
                 base.Friction = value;
-                PhysicsScene.TaintedObject("BSPrim.setFriction", delegate()
+                PhysScene.TaintedObject("BSPrim.setFriction", delegate()
                 {
                     UpdatePhysicalParameters();
                 });
@@ -707,7 +656,7 @@ public class BSPrim : BSPhysObject
             if (base.Restitution != value)
             {
                 base.Restitution = value;
-                PhysicsScene.TaintedObject("BSPrim.setRestitution", delegate()
+                PhysScene.TaintedObject("BSPrim.setRestitution", delegate()
                 {
                     UpdatePhysicalParameters();
                 });
@@ -724,7 +673,7 @@ public class BSPrim : BSPhysObject
             if (base.Density != value)
             {
                 base.Density = value;
-                PhysicsScene.TaintedObject("BSPrim.setDensity", delegate()
+                PhysScene.TaintedObject("BSPrim.setDensity", delegate()
                 {
                     UpdatePhysicalParameters();
                 });
@@ -739,93 +688,66 @@ public class BSPrim : BSPhysObject
             if (base.GravModifier != value)
             {
                 base.GravModifier = value;
-                PhysicsScene.TaintedObject("BSPrim.setGravityModifier", delegate()
+                PhysScene.TaintedObject("BSPrim.setGravityModifier", delegate()
                 {
                     UpdatePhysicalParameters();
                 });
             }
         }
     }
-    public override OMV.Vector3 RawVelocity
-    {
-        get { return _velocity; }
-        set { _velocity = value; }
-    }
     public override OMV.Vector3 Velocity {
-        get { return _velocity; }
+        get { return RawVelocity; }
         set {
-            _velocity = value;
-            PhysicsScene.TaintedObject("BSPrim.setVelocity", delegate()
+            RawVelocity = value;
+            PhysScene.TaintedObject("BSPrim.setVelocity", delegate()
             {
-                // DetailLog("{0},BSPrim.SetVelocity,taint,vel={1}", LocalID, _velocity);
-                ForceVelocity = _velocity;
+                // DetailLog("{0},BSPrim.SetVelocity,taint,vel={1}", LocalID, RawVelocity);
+                ForceVelocity = RawVelocity;
             });
         }
     }
     public override OMV.Vector3 ForceVelocity {
-        get { return _velocity; }
+        get { return RawVelocity; }
         set {
-            PhysicsScene.AssertInTaintTime("BSPrim.ForceVelocity");
+            PhysScene.AssertInTaintTime("BSPrim.ForceVelocity");
 
-            _velocity = Util.ClampV(value, BSParam.MaxLinearVelocity);
+            RawVelocity = Util.ClampV(value, BSParam.MaxLinearVelocity);
             if (PhysBody.HasPhysicalBody)
             {
-                DetailLog("{0},BSPrim.ForceVelocity,taint,vel={1}", LocalID, _velocity);
-                PhysicsScene.PE.SetLinearVelocity(PhysBody, _velocity);
+                DetailLog("{0},BSPrim.ForceVelocity,taint,vel={1}", LocalID, RawVelocity);
+                PhysScene.PE.SetLinearVelocity(PhysBody, RawVelocity);
                 ActivateIfPhysical(false);
             }
         }
     }
     public override OMV.Vector3 Torque {
-        get { return _torque; }
+        get { return RawTorque; }
         set {
-            _torque = value;
-            if (_torque != OMV.Vector3.Zero)
-            {
-                // If the torque is non-zero, it must be reapplied each tick because
-                //    Bullet clears the forces applied last frame.
-                RegisterPreStepAction("BSPrim.setTorque", LocalID,
-                    delegate(float timeStep)
-                    {
-                        if (!IsPhysicallyActive || _torque == OMV.Vector3.Zero)
-                        {
-                            UnRegisterPreStepAction("BSPrim.setTorque", LocalID);
-                            return;
-                        }
-
-                        if (PhysBody.HasPhysicalBody)
-                            AddAngularForce(_torque, false, true);
-                    }
-                );
-            }
-            else
+            RawTorque = value;
+            EnableActor(RawTorque != OMV.Vector3.Zero, SetTorqueActorName, delegate()
             {
-                UnRegisterPreStepAction("BSPrim.setTorque", LocalID);
-            }
-            // DetailLog("{0},BSPrim.SetTorque,call,torque={1}", LocalID, _torque);
+                return new BSActorSetTorque(PhysScene, this, SetTorqueActorName);
+            });
+            DetailLog("{0},BSPrim.SetTorque,call,torque={1}", LocalID, RawTorque);
         }
     }
     public override OMV.Vector3 Acceleration {
         get { return _acceleration; }
         set { _acceleration = value; }
     }
-    public override OMV.Quaternion RawOrientation
-    {
-        get { return _orientation; }
-        set { _orientation = value; }
-    }
+
     public override OMV.Quaternion Orientation {
         get {
-            return _orientation;
+            return RawOrientation;
         }
         set {
-            if (_orientation == value)
+            if (RawOrientation == value)
                 return;
-            _orientation = value;
+            RawOrientation = value;
 
-            PhysicsScene.TaintedObject("BSPrim.setOrientation", delegate()
+            PhysScene.TaintedObject("BSPrim.setOrientation", delegate()
             {
-                ForceOrientation = _orientation;
+                ForceOrientation = RawOrientation;
             });
         }
     }
@@ -834,14 +756,14 @@ public class BSPrim : BSPhysObject
     {
         get
         {
-            _orientation = PhysicsScene.PE.GetOrientation(PhysBody);
-            return _orientation;
+            RawOrientation = PhysScene.PE.GetOrientation(PhysBody);
+            return RawOrientation;
         }
         set
         {
-            _orientation = value;
+            RawOrientation = value;
             if (PhysBody.HasPhysicalBody)
-                PhysicsScene.PE.SetTranslation(PhysBody, _position, _orientation);
+                PhysScene.PE.SetTranslation(PhysBody, RawPosition, RawOrientation);
         }
     }
     public override int PhysicsActorType {
@@ -854,7 +776,7 @@ public class BSPrim : BSPhysObject
             if (_isPhysical != value)
             {
                 _isPhysical = value;
-                PhysicsScene.TaintedObject("BSPrim.setIsPhysical", delegate()
+                PhysScene.TaintedObject("BSPrim.setIsPhysical", delegate()
                 {
                     DetailLog("{0},setIsPhysical,taint,isPhys={1}", LocalID, _isPhysical);
                     SetObjectDynamic(true);
@@ -898,24 +820,25 @@ public class BSPrim : BSPhysObject
     //     isSolid: other objects bounce off of this object
     //     isVolumeDetect: other objects pass through but can generate collisions
     //     collisionEvents: whether this object returns collision events
+    // NOTE: overloaded by BSPrimLinkable to also update linkset physical parameters.
     public virtual void UpdatePhysicalParameters()
     {
         if (!PhysBody.HasPhysicalBody)
         {
             // This would only happen if updates are called for during initialization when the body is not set up yet.
-            DetailLog("{0},BSPrim.UpdatePhysicalParameters,taint,calledWithNoPhysBody", LocalID);
+            // DetailLog("{0},BSPrim.UpdatePhysicalParameters,taint,calledWithNoPhysBody", LocalID);
             return;
         }
 
         // Mangling all the physical properties requires the object not be in the physical world.
         // This is a NOOP if the object is not in the world (BulletSim and Bullet ignore objects not found).
-        PhysicsScene.PE.RemoveObjectFromWorld(PhysicsScene.World, PhysBody);
+        PhysScene.PE.RemoveObjectFromWorld(PhysScene.World, PhysBody);
 
         // Set up the object physicalness (does gravity and collisions move this object)
         MakeDynamic(IsStatic);
 
         // Update vehicle specific parameters (after MakeDynamic() so can change physical parameters)
-        VehicleController.Refresh();
+        PhysicalActors.Refresh();
 
         // Arrange for collision events if the simulator wants them
         EnableCollisions(SubscribedEvents());
@@ -926,10 +849,11 @@ public class BSPrim : BSPhysObject
         AddObjectToPhysicalWorld();
 
         // Rebuild its shape
-        PhysicsScene.PE.UpdateSingleAabb(PhysicsScene.World, PhysBody);
+        PhysScene.PE.UpdateSingleAabb(PhysScene.World, PhysBody);
 
         DetailLog("{0},BSPrim.UpdatePhysicalParameters,taintExit,static={1},solid={2},mass={3},collide={4},cf={5:X},cType={6},body={7},shape={8}",
-                        LocalID, IsStatic, IsSolid, Mass, SubscribedEvents(), CurrentCollisionFlags, PhysBody.collisionType, PhysBody, PhysShape);
+                                    LocalID, IsStatic, IsSolid, Mass, SubscribedEvents(),
+                                    CurrentCollisionFlags, PhysBody.collisionType, PhysBody, PhysShape);
     }
 
     // "Making dynamic" means changing to and from static.
@@ -942,28 +866,28 @@ public class BSPrim : BSPhysObject
         if (makeStatic)
         {
             // Become a Bullet 'static' object type
-            CurrentCollisionFlags = PhysicsScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.CF_STATIC_OBJECT);
+            CurrentCollisionFlags = PhysScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.CF_STATIC_OBJECT);
             // Stop all movement
             ZeroMotion(true);
 
             // Set various physical properties so other object interact properly
-            PhysicsScene.PE.SetFriction(PhysBody, Friction);
-            PhysicsScene.PE.SetRestitution(PhysBody, Restitution);
-            PhysicsScene.PE.SetContactProcessingThreshold(PhysBody, BSParam.ContactProcessingThreshold);
+            PhysScene.PE.SetFriction(PhysBody, Friction);
+            PhysScene.PE.SetRestitution(PhysBody, Restitution);
+            PhysScene.PE.SetContactProcessingThreshold(PhysBody, BSParam.ContactProcessingThreshold);
 
             // Mass is zero which disables a bunch of physics stuff in Bullet
             UpdatePhysicalMassProperties(0f, false);
             // Set collision detection parameters
             if (BSParam.CcdMotionThreshold > 0f)
             {
-                PhysicsScene.PE.SetCcdMotionThreshold(PhysBody, BSParam.CcdMotionThreshold);
-                PhysicsScene.PE.SetCcdSweptSphereRadius(PhysBody, BSParam.CcdSweptSphereRadius);
+                PhysScene.PE.SetCcdMotionThreshold(PhysBody, BSParam.CcdMotionThreshold);
+                PhysScene.PE.SetCcdSweptSphereRadius(PhysBody, BSParam.CcdSweptSphereRadius);
             }
 
             // The activation state is 'disabled' so Bullet will not try to act on it.
             // PhysicsScene.PE.ForceActivationState(PhysBody, ActivationState.DISABLE_SIMULATION);
             // Start it out sleeping and physical actions could wake it up.
-            PhysicsScene.PE.ForceActivationState(PhysBody, ActivationState.ISLAND_SLEEPING);
+            PhysScene.PE.ForceActivationState(PhysBody, ActivationState.ISLAND_SLEEPING);
 
             // This collides like a static object
             PhysBody.collisionType = CollisionType.Static;
@@ -971,11 +895,11 @@ public class BSPrim : BSPhysObject
         else
         {
             // Not a Bullet static object
-            CurrentCollisionFlags = PhysicsScene.PE.RemoveFromCollisionFlags(PhysBody, CollisionFlags.CF_STATIC_OBJECT);
+            CurrentCollisionFlags = PhysScene.PE.RemoveFromCollisionFlags(PhysBody, CollisionFlags.CF_STATIC_OBJECT);
 
             // Set various physical properties so other object interact properly
-            PhysicsScene.PE.SetFriction(PhysBody, Friction);
-            PhysicsScene.PE.SetRestitution(PhysBody, Restitution);
+            PhysScene.PE.SetFriction(PhysBody, Friction);
+            PhysScene.PE.SetRestitution(PhysBody, Restitution);
             // DetailLog("{0},BSPrim.MakeDynamic,frict={1},rest={2}", LocalID, Friction, Restitution);
 
             // per http://www.bulletphysics.org/Bullet/phpBB3/viewtopic.php?t=3382
@@ -983,8 +907,8 @@ public class BSPrim : BSPhysObject
             // PhysicsScene.PE.ClearAllForces(BSBody);
 
             // For good measure, make sure the transform is set through to the motion state
-            ForcePosition = _position;
-            ForceVelocity = _velocity;
+            ForcePosition = RawPosition;
+            ForceVelocity = RawVelocity;
             ForceRotationalVelocity = _rotationalVelocity;
 
             // A dynamic object has mass
@@ -993,22 +917,22 @@ public class BSPrim : BSPhysObject
             // Set collision detection parameters
             if (BSParam.CcdMotionThreshold > 0f)
             {
-                PhysicsScene.PE.SetCcdMotionThreshold(PhysBody, BSParam.CcdMotionThreshold);
-                PhysicsScene.PE.SetCcdSweptSphereRadius(PhysBody, BSParam.CcdSweptSphereRadius);
+                PhysScene.PE.SetCcdMotionThreshold(PhysBody, BSParam.CcdMotionThreshold);
+                PhysScene.PE.SetCcdSweptSphereRadius(PhysBody, BSParam.CcdSweptSphereRadius);
             }
 
             // Various values for simulation limits
-            PhysicsScene.PE.SetDamping(PhysBody, BSParam.LinearDamping, BSParam.AngularDamping);
-            PhysicsScene.PE.SetDeactivationTime(PhysBody, BSParam.DeactivationTime);
-            PhysicsScene.PE.SetSleepingThresholds(PhysBody, BSParam.LinearSleepingThreshold, BSParam.AngularSleepingThreshold);
-            PhysicsScene.PE.SetContactProcessingThreshold(PhysBody, BSParam.ContactProcessingThreshold);
+            PhysScene.PE.SetDamping(PhysBody, BSParam.LinearDamping, BSParam.AngularDamping);
+            PhysScene.PE.SetDeactivationTime(PhysBody, BSParam.DeactivationTime);
+            PhysScene.PE.SetSleepingThresholds(PhysBody, BSParam.LinearSleepingThreshold, BSParam.AngularSleepingThreshold);
+            PhysScene.PE.SetContactProcessingThreshold(PhysBody, BSParam.ContactProcessingThreshold);
 
             // This collides like an object.
             PhysBody.collisionType = CollisionType.Dynamic;
 
             // Force activation of the object so Bullet will act on it.
             // Must do the ForceActivationState2() to overcome the DISABLE_SIMULATION from static objects.
-            PhysicsScene.PE.ForceActivationState(PhysBody, ActivationState.ACTIVE_TAG);
+            PhysScene.PE.ForceActivationState(PhysBody, ActivationState.ACTIVE_TAG);
         }
     }
 
@@ -1018,7 +942,7 @@ public class BSPrim : BSPhysObject
     //     the functions after this one set up the state of a possibly newly created collision body.
     private void MakeSolid(bool makeSolid)
     {
-        CollisionObjectTypes bodyType = (CollisionObjectTypes)PhysicsScene.PE.GetBodyType(PhysBody);
+        CollisionObjectTypes bodyType = (CollisionObjectTypes)PhysScene.PE.GetBodyType(PhysBody);
         if (makeSolid)
         {
             // Verify the previous code created the correct shape for this type of thing.
@@ -1026,7 +950,7 @@ public class BSPrim : BSPhysObject
             {
                 m_log.ErrorFormat("{0} MakeSolid: physical body of wrong type for solidity. id={1}, type={2}", LogHeader, LocalID, bodyType);
             }
-            CurrentCollisionFlags = PhysicsScene.PE.RemoveFromCollisionFlags(PhysBody, CollisionFlags.CF_NO_CONTACT_RESPONSE);
+            CurrentCollisionFlags = PhysScene.PE.RemoveFromCollisionFlags(PhysBody, CollisionFlags.CF_NO_CONTACT_RESPONSE);
         }
         else
         {
@@ -1034,32 +958,23 @@ public class BSPrim : BSPhysObject
             {
                 m_log.ErrorFormat("{0} MakeSolid: physical body of wrong type for non-solidness. id={1}, type={2}", LogHeader, LocalID, bodyType);
             }
-            CurrentCollisionFlags = PhysicsScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.CF_NO_CONTACT_RESPONSE);
+            CurrentCollisionFlags = PhysScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.CF_NO_CONTACT_RESPONSE);
 
             // Change collision info from a static object to a ghosty collision object
             PhysBody.collisionType = CollisionType.VolumeDetect;
         }
     }
 
-    // Enable physical actions. Bullet will keep sleeping non-moving physical objects so
-    //     they need waking up when parameters are changed.
-    // Called in taint-time!!
-    private void ActivateIfPhysical(bool forceIt)
-    {
-        if (IsPhysical && PhysBody.HasPhysicalBody)
-            PhysicsScene.PE.Activate(PhysBody, forceIt);
-    }
-
     // Turn on or off the flag controlling whether collision events are returned to the simulator.
     private void EnableCollisions(bool wantsCollisionEvents)
     {
         if (wantsCollisionEvents)
         {
-            CurrentCollisionFlags = PhysicsScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
+            CurrentCollisionFlags = PhysScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
         }
         else
         {
-            CurrentCollisionFlags = PhysicsScene.PE.RemoveFromCollisionFlags(PhysBody, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
+            CurrentCollisionFlags = PhysScene.PE.RemoveFromCollisionFlags(PhysBody, CollisionFlags.BS_SUBSCRIBE_COLLISION_EVENTS);
         }
     }
 
@@ -1070,7 +985,7 @@ public class BSPrim : BSPhysObject
     {
         if (PhysBody.HasPhysicalBody)
         {
-            PhysicsScene.PE.AddObjectToWorld(PhysicsScene.World, PhysBody);
+            PhysScene.PE.AddObjectToWorld(PhysScene.World, PhysBody);
         }
         else
         {
@@ -1105,12 +1020,12 @@ public class BSPrim : BSPhysObject
     public override bool FloatOnWater {
         set {
             _floatOnWater = value;
-            PhysicsScene.TaintedObject("BSPrim.setFloatOnWater", delegate()
+            PhysScene.TaintedObject("BSPrim.setFloatOnWater", delegate()
             {
                 if (_floatOnWater)
-                    CurrentCollisionFlags = PhysicsScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.BS_FLOATS_ON_WATER);
+                    CurrentCollisionFlags = PhysScene.PE.AddToCollisionFlags(PhysBody, CollisionFlags.BS_FLOATS_ON_WATER);
                 else
-                    CurrentCollisionFlags = PhysicsScene.PE.RemoveFromCollisionFlags(PhysBody, CollisionFlags.BS_FLOATS_ON_WATER);
+                    CurrentCollisionFlags = PhysScene.PE.RemoveFromCollisionFlags(PhysBody, CollisionFlags.BS_FLOATS_ON_WATER);
             });
         }
     }
@@ -1122,7 +1037,7 @@ public class BSPrim : BSPhysObject
             _rotationalVelocity = value;
             Util.ClampV(_rotationalVelocity, BSParam.MaxAngularVelocity);
             // m_log.DebugFormat("{0}: RotationalVelocity={1}", LogHeader, _rotationalVelocity);
-            PhysicsScene.TaintedObject("BSPrim.setRotationalVelocity", delegate()
+            PhysScene.TaintedObject("BSPrim.setRotationalVelocity", delegate()
             {
                 ForceRotationalVelocity = _rotationalVelocity;
             });
@@ -1137,7 +1052,7 @@ public class BSPrim : BSPhysObject
             if (PhysBody.HasPhysicalBody)
             {
                 DetailLog("{0},BSPrim.ForceRotationalVel,taint,rotvel={1}", LocalID, _rotationalVelocity);
-                PhysicsScene.PE.SetAngularVelocity(PhysBody, _rotationalVelocity);
+                PhysScene.PE.SetAngularVelocity(PhysBody, _rotationalVelocity);
                 // PhysicsScene.PE.SetInterpolationAngularVelocity(PhysBody, _rotationalVelocity);
                 ActivateIfPhysical(false);
             }
@@ -1153,7 +1068,7 @@ public class BSPrim : BSPhysObject
         get { return _buoyancy; }
         set {
             _buoyancy = value;
-            PhysicsScene.TaintedObject("BSPrim.setBuoyancy", delegate()
+            PhysScene.TaintedObject("BSPrim.setBuoyancy", delegate()
             {
                 ForceBuoyancy = _buoyancy;
             });
@@ -1171,179 +1086,54 @@ public class BSPrim : BSPhysObject
         }
     }
 
-    // Used for MoveTo
-    public override OMV.Vector3 PIDTarget {
-        set
-        {
-            // TODO: add a sanity check -- don't move more than a region or something like that.
-            _PIDTarget = value;
-        }
-    }
-    public override float PIDTau {
-        set { _PIDTau = value; }
-    }
     public override bool PIDActive {
         set {
-            if (value)
+            base.MoveToTargetActive = value;
+            EnableActor(MoveToTargetActive, MoveToTargetActorName, delegate()
             {
-                // We're taking over after this.
-                ZeroMotion(true);
-
-                _targetMotor = new BSVMotor("BSPrim.PIDTarget",
-                                            _PIDTau,                    // timeScale
-                                            BSMotor.Infinite,           // decay time scale
-                                            BSMotor.InfiniteVector,     // friction timescale
-                                            1f                          // efficiency
-                );
-                _targetMotor.PhysicsScene = PhysicsScene; // DEBUG DEBUG so motor will output detail log messages.
-                _targetMotor.SetTarget(_PIDTarget);
-                _targetMotor.SetCurrent(RawPosition);
-                /*
-                _targetMotor = new BSPIDVMotor("BSPrim.PIDTarget");
-                _targetMotor.PhysicsScene = PhysicsScene; // DEBUG DEBUG so motor will output detail log messages.
-
-                _targetMotor.SetTarget(_PIDTarget);
-                _targetMotor.SetCurrent(RawPosition);
-                _targetMotor.TimeScale = _PIDTau;
-                _targetMotor.Efficiency = 1f;
-                 */
-
-                RegisterPreStepAction("BSPrim.PIDTarget", LocalID, delegate(float timeStep)
-                {
-                    if (!IsPhysicallyActive)
-                    {
-                        UnRegisterPreStepAction("BSPrim.PIDTarget", LocalID);
-                        return;
-                    }
-
-                    OMV.Vector3 origPosition = RawPosition;     // DEBUG DEBUG (for printout below)
-
-                    // 'movePosition' is where we'd like the prim to be at this moment.
-                    OMV.Vector3 movePosition = RawPosition + _targetMotor.Step(timeStep);
+                return new BSActorMoveToTarget(PhysScene, this, MoveToTargetActorName);
+            });
+        }
+    }
 
-                    // If we are very close to our target, turn off the movement motor.
-                    if (_targetMotor.ErrorIsZero())
-                    {
-                        DetailLog("{0},BSPrim.PIDTarget,zeroMovement,movePos={1},pos={2},mass={3}",
-                                                LocalID, movePosition, RawPosition, Mass);
-                        ForcePosition = _targetMotor.TargetValue;
-                        _targetMotor.Enabled = false;
-                    }
-                    else
-                    {
-                        _position = movePosition;
-                        PositionSanityCheck(true /* intaintTime */);
-                        ForcePosition = _position;
-                    }
-                    DetailLog("{0},BSPrim.PIDTarget,move,fromPos={1},movePos={2}", LocalID, origPosition, movePosition);
-                });
-            }
-            else
+    public override OMV.Vector3 PIDTarget
+    {
+        set
+        {
+            base.PIDTarget = value;
+            BSActor actor;
+            if (PhysicalActors.TryGetActor(MoveToTargetActorName, out actor))
             {
-                // Stop any targetting
-                UnRegisterPreStepAction("BSPrim.PIDTarget", LocalID);
+                // if the actor exists, tell it to refresh its values.
+                actor.Refresh();
             }
+            
         }
     }
-
     // Used for llSetHoverHeight and maybe vehicle height
     // Hover Height will override MoveTo target's Z
     public override bool PIDHoverActive {
         set {
-            if (value)
+            base.HoverActive = value;
+            EnableActor(HoverActive, HoverActorName, delegate()
             {
-                // Turning the target on
-                _hoverMotor = new BSFMotor("BSPrim.Hover",
-                                            _PIDHoverTau,               // timeScale
-                                            BSMotor.Infinite,           // decay time scale
-                                            BSMotor.Infinite,           // friction timescale
-                                            1f                          // efficiency
-                );
-                _hoverMotor.SetTarget(ComputeCurrentPIDHoverHeight());
-                _hoverMotor.SetCurrent(RawPosition.Z);
-                _hoverMotor.PhysicsScene = PhysicsScene; // DEBUG DEBUG so motor will output detail log messages.
-
-                RegisterPreStepAction("BSPrim.Hover", LocalID, delegate(float timeStep)
-                {
-                    // Don't do hovering while the object is selected.
-                    if (!IsPhysicallyActive)
-                        return;
-
-                    _hoverMotor.SetCurrent(RawPosition.Z);
-                    _hoverMotor.SetTarget(ComputeCurrentPIDHoverHeight());
-                    float targetHeight = _hoverMotor.Step(timeStep);
-
-                    // 'targetHeight' is where we'd like the Z of the prim to be at this moment.
-                    // Compute the amount of force to push us there.
-                    float moveForce = (targetHeight - RawPosition.Z) * Mass;
-                    // Undo anything the object thinks it's doing at the moment
-                    moveForce = -RawVelocity.Z * Mass;
-
-                    PhysicsScene.PE.ApplyCentralImpulse(PhysBody, new OMV.Vector3(0f, 0f, moveForce));
-                    DetailLog("{0},BSPrim.Hover,move,targHt={1},moveForce={2},mass={3}", LocalID, targetHeight, moveForce, Mass);
-                });
-            }
-            else
-            {
-                UnRegisterPreStepAction("BSPrim.Hover", LocalID);
-            }
-        }
-    }
-    public override float PIDHoverHeight {
-        set { _PIDHoverHeight = value; }
-    }
-    public override PIDHoverType PIDHoverType {
-        set { _PIDHoverType = value; }
-    }
-    public override float PIDHoverTau {
-        set { _PIDHoverTau = value; }
-    }
-    // Based on current position, determine what we should be hovering at now.
-    // Must recompute often. What if we walked offa cliff>
-    private float ComputeCurrentPIDHoverHeight()
-    {
-        float ret = _PIDHoverHeight;
-        float groundHeight = PhysicsScene.TerrainManager.GetTerrainHeightAtXYZ(RawPosition);
-
-        switch (_PIDHoverType)
-        {
-            case PIDHoverType.Ground:
-                ret = groundHeight + _PIDHoverHeight;
-                break;
-            case PIDHoverType.GroundAndWater:
-                float waterHeight = PhysicsScene.TerrainManager.GetWaterLevelAtXYZ(RawPosition);
-                if (groundHeight > waterHeight)
-                {
-                    ret = groundHeight + _PIDHoverHeight;
-                }
-                else
-                {
-                    ret = waterHeight + _PIDHoverHeight;
-                }
-                break;
+                return new BSActorHover(PhysScene, this, HoverActorName);
+            });
         }
-        return ret;
     }
 
-
-    // For RotLookAt
-    public override OMV.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 AddForce(OMV.Vector3 force, bool pushforce) {
         // Per documentation, max force is limited.
         OMV.Vector3 addForce = Util.ClampV(force, BSParam.MaxAddForceMagnitude);
 
         // Since this force is being applied in only one step, make this a force per second.
-        addForce /= PhysicsScene.LastTimeStep;
+        addForce /= PhysScene.LastTimeStep;
         AddForce(addForce, pushforce, false /* inTaintTime */);
     }
 
     // Applying a force just adds this to the total force on the object.
     // This added force will only last the next simulation tick.
-    public void AddForce(OMV.Vector3 force, bool pushforce, bool inTaintTime) {
+    public override void AddForce(OMV.Vector3 force, bool pushforce, bool inTaintTime) {
         // for an object, doesn't matter if force is a pushforce or not
         if (IsPhysicallyActive)
         {
@@ -1352,13 +1142,15 @@ public class BSPrim : BSPhysObject
                 // DetailLog("{0},BSPrim.addForce,call,force={1}", LocalID, addForce);
 
                 OMV.Vector3 addForce = force;
-                PhysicsScene.TaintedObject(inTaintTime, "BSPrim.AddForce", delegate()
+                PhysScene.TaintedObject(inTaintTime, "BSPrim.AddForce", delegate()
                 {
-                    // Bullet adds this central force to the total force for this tick
+                    // Bullet adds this central force to the total force for this tick.
+                    // Deep down in Bullet:
+                    //      linearVelocity += totalForce / mass * timeStep;
                     DetailLog("{0},BSPrim.addForce,taint,force={1}", LocalID, addForce);
                     if (PhysBody.HasPhysicalBody)
                     {
-                        PhysicsScene.PE.ApplyCentralForce(PhysBody, addForce);
+                        PhysScene.PE.ApplyCentralForce(PhysBody, addForce);
                         ActivateIfPhysical(false);
                     }
                 });
@@ -1380,13 +1172,13 @@ public class BSPrim : BSPhysObject
                 OMV.Vector3 addImpulse = Util.ClampV(impulse, BSParam.MaxAddForceMagnitude);
                 // DetailLog("{0},BSPrim.addForceImpulse,call,impulse={1}", LocalID, impulse);
 
-                PhysicsScene.TaintedObject(inTaintTime, "BSPrim.AddImpulse", delegate()
+                PhysScene.TaintedObject(inTaintTime, "BSPrim.AddImpulse", delegate()
                 {
                     // Bullet adds this impulse immediately to the velocity
                     DetailLog("{0},BSPrim.addForceImpulse,taint,impulseforce={1}", LocalID, addImpulse);
                     if (PhysBody.HasPhysicalBody)
                     {
-                        PhysicsScene.PE.ApplyCentralImpulse(PhysBody, addImpulse);
+                        PhysScene.PE.ApplyCentralImpulse(PhysBody, addImpulse);
                         ActivateIfPhysical(false);
                     }
                 });
@@ -1399,20 +1191,18 @@ public class BSPrim : BSPhysObject
         }
     }
 
-    public override void AddAngularForce(OMV.Vector3 force, bool pushforce) {
-        AddAngularForce(force, pushforce, false);
-    }
-    public void AddAngularForce(OMV.Vector3 force, bool pushforce, bool inTaintTime)
+    // BSPhysObject.AddAngularForce()
+    public override void AddAngularForce(OMV.Vector3 force, bool pushforce, bool inTaintTime)
     {
         if (force.IsFinite())
         {
             OMV.Vector3 angForce = force;
-            PhysicsScene.TaintedObject(inTaintTime, "BSPrim.AddAngularForce", delegate()
+            PhysScene.TaintedObject(inTaintTime, "BSPrim.AddAngularForce", delegate()
             {
                 if (PhysBody.HasPhysicalBody)
                 {
                     DetailLog("{0},BSPrim.AddAngularForce,taint,angForce={1}", LocalID, angForce);
-                    PhysicsScene.PE.ApplyTorque(PhysBody, angForce);
+                    PhysScene.PE.ApplyTorque(PhysBody, angForce);
                     ActivateIfPhysical(false);
                 }
             });
@@ -1431,11 +1221,11 @@ public class BSPrim : BSPhysObject
     public void ApplyTorqueImpulse(OMV.Vector3 impulse, bool inTaintTime)
     {
         OMV.Vector3 applyImpulse = impulse;
-        PhysicsScene.TaintedObject(inTaintTime, "BSPrim.ApplyTorqueImpulse", delegate()
+        PhysScene.TaintedObject(inTaintTime, "BSPrim.ApplyTorqueImpulse", delegate()
         {
             if (PhysBody.HasPhysicalBody)
             {
-                PhysicsScene.PE.ApplyTorqueImpulse(PhysBody, applyImpulse);
+                PhysScene.PE.ApplyTorqueImpulse(PhysBody, applyImpulse);
                 ActivateIfPhysical(false);
             }
         });
@@ -1721,9 +1511,11 @@ public class BSPrim : BSPhysObject
         volume *= (profileEnd - profileBegin);
 
         returnMass = Density * BSParam.DensityScaleFactor * volume;
-        DetailLog("{0},BSPrim.CalculateMass,den={1},vol={2},mass={3}", LocalID, Density, volume, returnMass);
 
         returnMass = Util.Clamp(returnMass, BSParam.MinimumObjectMass, BSParam.MaximumObjectMass);
+        // DetailLog("{0},BSPrim.CalculateMass,den={1},vol={2},mass={3}", LocalID, Density, volume, returnMass);
+        DetailLog("{0},BSPrim.CalculateMass,den={1},vol={2},mass={3},pathB={4},pathE={5},profB={6},profE={7},siz={8}",
+                            LocalID, Density, volume, returnMass, pathBegin, pathEnd, profileBegin, profileEnd, _size);
 
         return returnMass;
     }// end CalculateMass
@@ -1736,13 +1528,14 @@ public class BSPrim : BSPhysObject
     {
         // Create the correct physical representation for this type of object.
         // Updates base.PhysBody and base.PhysShape with the new information.
-        // Ignore 'forceRebuild'. This routine makes the right choices and changes of necessary.
-        PhysicsScene.Shapes.GetBodyAndShape(false /*forceRebuild */, PhysicsScene.World, this, null, delegate(BulletBody dBody)
+        // Ignore 'forceRebuild'. 'GetBodyAndShape' makes the right choices and changes of necessary.
+        PhysScene.Shapes.GetBodyAndShape(false /*forceRebuild */, PhysScene.World, this, delegate(BulletBody pBody, BulletShape pShape)
         {
             // Called if the current prim body is about to be destroyed.
             // Remove all the physical dependencies on the old body.
             // (Maybe someday make the changing of BSShape an event to be subscribed to by BSLinkset, ...)
-            RemoveBodyDependencies();
+            // Note: this virtual function is overloaded by BSPrimLinkable to remove linkset constraints.
+            RemoveDependencies();
         });
 
         // Make sure the properties are set on the new object
@@ -1750,33 +1543,74 @@ public class BSPrim : BSPhysObject
         return;
     }
 
-    protected virtual void RemoveBodyDependencies()
+    // Called at taint-time
+    protected virtual void RemoveDependencies()
     {
-        VehicleController.RemoveBodyDependencies(this);
+        PhysicalActors.RemoveDependencies();
+    }
+
+    #region Extension
+    public override object Extension(string pFunct, params object[] pParams)
+    {
+        object ret = null;
+        switch (pFunct)
+        {
+            case BSScene.PhysFunctGetLinksetType:
+            {
+                BSPrimLinkable myHandle = this as BSPrimLinkable;
+                if (myHandle != null)
+                {
+                    ret = (object)myHandle.LinksetType;
+                }
+                m_log.DebugFormat("{0} Extension.physGetLinksetType, type={1}", LogHeader, ret);
+                break;
+            }
+            case BSScene.PhysFunctSetLinksetType:
+            {
+                if (pParams.Length > 0)
+                {
+                    BSLinkset.LinksetImplementation linksetType = (BSLinkset.LinksetImplementation)pParams[0];
+                    BSPrimLinkable myHandle = this as BSPrimLinkable;
+                    if (myHandle != null && myHandle.Linkset.IsRoot(myHandle))
+                    {
+                        PhysScene.TaintedObject("BSPrim.PhysFunctSetLinksetType", delegate()
+                        {
+                            // Cause the linkset type to change
+                            m_log.DebugFormat("{0} Extension.physSetLinksetType, oldType={1}, newType={2}",
+                                                LogHeader, myHandle.Linkset.LinksetImpl, linksetType);
+                            myHandle.ConvertLinkset(linksetType);
+                        });
+                    }
+                    ret = (object)(int)linksetType;
+                }
+                break;
+            }
+            default:
+                ret = base.Extension(pFunct, pParams);
+                break;
+        }
+        return ret;
     }
+    #endregion  // Extension
 
     // The physics engine says that properties have updated. Update same and inform
     // the world that things have changed.
+    // NOTE: BSPrim.UpdateProperties is overloaded by BSPrimLinkable which modifies updates from root and children prims.
+    // NOTE: BSPrim.UpdateProperties is overloaded by BSPrimDisplaced which handles mapping physical position to simulator position.
     public override void UpdateProperties(EntityProperties entprop)
     {
+        // Let anyone (like the actors) modify the updated properties before they are pushed into the object and the simulator.
         TriggerPreUpdatePropertyAction(ref entprop);
 
-        // A temporary kludge to suppress the rotational effects introduced on vehicles by Bullet
-        // TODO: handle physics introduced by Bullet with computed vehicle physics.
-        if (VehicleController.IsActive)
-        {
-            entprop.RotationalVelocity = OMV.Vector3.Zero;
-        }
-
         // DetailLog("{0},BSPrim.UpdateProperties,entry,entprop={1}", LocalID, entprop);   // DEBUG DEBUG
 
         // Assign directly to the local variables so the normal set actions do not happen
-        _position = entprop.Position;
-        _orientation = entprop.Rotation;
+        RawPosition = entprop.Position;
+        RawOrientation = entprop.Rotation;
         // DEBUG DEBUG DEBUG -- smooth velocity changes a bit. The simulator seems to be
         //    very sensitive to velocity changes.
-        if (entprop.Velocity == OMV.Vector3.Zero || !entprop.Velocity.ApproxEquals(_velocity, BSParam.UpdateVelocityChangeThreshold))
-            _velocity = entprop.Velocity;
+        if (entprop.Velocity == OMV.Vector3.Zero || !entprop.Velocity.ApproxEquals(RawVelocity, BSParam.UpdateVelocityChangeThreshold))
+            RawVelocity = entprop.Velocity;
         _acceleration = entprop.Acceleration;
         _rotationalVelocity = entprop.RotationalVelocity;
 
@@ -1785,29 +1619,20 @@ public class BSPrim : BSPhysObject
         // The sanity check can change the velocity and/or position.
         if (PositionSanityCheck(true /* inTaintTime */ ))
         {
-            entprop.Position = _position;
-            entprop.Velocity = _velocity;
+            entprop.Position = RawPosition;
+            entprop.Velocity = RawVelocity;
             entprop.RotationalVelocity = _rotationalVelocity;
             entprop.Acceleration = _acceleration;
         }
 
-        OMV.Vector3 direction = OMV.Vector3.UnitX * _orientation;   // DEBUG DEBUG DEBUG
+        OMV.Vector3 direction = OMV.Vector3.UnitX * RawOrientation;   // DEBUG DEBUG DEBUG
         DetailLog("{0},BSPrim.UpdateProperties,call,entProp={1},dir={2}", LocalID, entprop, direction);
 
         // remember the current and last set values
         LastEntityProperties = CurrentEntityProperties;
         CurrentEntityProperties = entprop;
 
-        base.RequestPhysicsterseUpdate();
-            /*
-        else
-        {
-            // For debugging, report the movement of children
-            DetailLog("{0},BSPrim.UpdateProperties,child,pos={1},orient={2},vel={3},accel={4},rotVel={5}",
-                    LocalID, entprop.Position, entprop.Rotation, entprop.Velocity,
-                    entprop.Acceleration, entprop.RotationalVelocity);
-        }
-             */
+        PhysScene.PostUpdate(this);
     }
 }
 }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs
index f1c3b5c..2eb1440 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs
@@ -23,11 +23,6 @@
  * 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.
- *
- * The quotations from http://wiki.secondlife.com/wiki/Linden_Vehicle_Tutorial
- * are Copyright (c) 2009 Linden Research, Inc and are used under their license
- * of Creative Commons Attribution-Share Alike 3.0
- * (http://creativecommons.org/licenses/by-sa/3.0/).
  */
 
 using System;
@@ -44,14 +39,14 @@ namespace OpenSim.Region.Physics.BulletSPlugin
 {
 public class BSPrimDisplaced : BSPrim
 {
-    // The purpose of this module is to do any mapping between what the simulator thinks
+    // The purpose of this subclass is to do any mapping between what the simulator thinks
     //    the prim position and orientation is and what the physical position/orientation.
     //    This difference happens because Bullet assumes the center-of-mass is the <0,0,0>
-    //    of the prim/linkset. The simulator tracks the location of the prim/linkset by
-    //    the location of the root prim. So, if center-of-mass is anywhere but the origin
-    //    of the root prim, the physical origin is displaced from the simulator origin.
+    //    of the prim/linkset. The simulator, on the other hand, tracks the location of
+    //    the prim/linkset by the location of the root prim. So, if center-of-mass is anywhere
+    //    but the origin of the root prim, the physical origin is displaced from the simulator origin.
     //
-    // This routine works by capturing the Force* setting of position/orientation/... and
+    // This routine works by capturing ForcePosition and
     //    adjusting the simulator values (being set) into the physical values.
     //    The conversion is also done in the opposite direction (physical origin -> simulator origin).
     //
@@ -59,8 +54,8 @@ public class BSPrimDisplaced : BSPrim
     //    are converted into simulator origin values before being passed to the base
     //    class.
 
+    // PositionDisplacement is the vehicle relative distance from the root prim position to the center-of-mass.
     public virtual OMV.Vector3 PositionDisplacement { get; set; }
-    public virtual OMV.Quaternion OrientationDisplacement { get; set; }
 
     public BSPrimDisplaced(uint localID, String primName, BSScene parent_scene, OMV.Vector3 pos, OMV.Vector3 size,
                        OMV.Quaternion rotation, PrimitiveBaseShape pbs, bool pisPhysical)
@@ -69,68 +64,96 @@ public class BSPrimDisplaced : BSPrim
         ClearDisplacement();
     }
 
+    // Clears any center-of-mass displacement introduced by linksets, etc.
+    // Does not clear the displacement set by the user.
     public void ClearDisplacement()
     {
-        PositionDisplacement = OMV.Vector3.Zero;
-        OrientationDisplacement = OMV.Quaternion.Identity;
+        if (UserSetCenterOfMassDisplacement.HasValue)
+            PositionDisplacement = (OMV.Vector3)UserSetCenterOfMassDisplacement;
+        else
+            PositionDisplacement = OMV.Vector3.Zero;
     }
 
     // Set this sets and computes the displacement from the passed prim to the center-of-mass.
     // A user set value for center-of-mass overrides whatever might be passed in here.
     // The displacement is in local coordinates (relative to root prim in linkset oriented coordinates).
-    public virtual void SetEffectiveCenterOfMassW(Vector3 centerOfMassDisplacement)
+    // Returns the relative offset from the root position to the center-of-mass.
+    // Called at taint time.
+    public virtual Vector3 SetEffectiveCenterOfMassDisplacement(Vector3 centerOfMassDisplacement)
     {
+        PhysScene.AssertInTaintTime("BSPrimDisplaced.SetEffectiveCenterOfMassDisplacement");
         Vector3 comDisp;
-        if (UserSetCenterOfMass.HasValue)
-            comDisp = (OMV.Vector3)UserSetCenterOfMass;
+        if (UserSetCenterOfMassDisplacement.HasValue)
+            comDisp = (OMV.Vector3)UserSetCenterOfMassDisplacement;
         else
             comDisp = centerOfMassDisplacement;
 
-        if (comDisp == Vector3.Zero)
-        {
-            // If there is no diplacement. Things get reset.
-            PositionDisplacement = OMV.Vector3.Zero;
-            OrientationDisplacement = OMV.Quaternion.Identity;
-        }
-        else
+        // Eliminate any jitter caused be very slight differences in masses and positions
+        if (comDisp.ApproxEquals(Vector3.Zero, 0.01f) )
+            comDisp = Vector3.Zero;
+
+        DetailLog("{0},BSPrimDisplaced.SetEffectiveCenterOfMassDisplacement,userSet={1},comDisp={2}",
+                                    LocalID, UserSetCenterOfMassDisplacement.HasValue, comDisp);
+        if ( !comDisp.ApproxEquals(PositionDisplacement, 0.01f) )
         {
-            // Remember the displacement from root as well as the origional rotation of the
-            //    new center-of-mass.
+            // Displacement setting is changing.
+            // The relationship between the physical object and simulated object must be aligned.
             PositionDisplacement = comDisp;
-            OrientationDisplacement = OMV.Quaternion.Identity;
+            this.ForcePosition = RawPosition;
         }
+
+        return PositionDisplacement;
     }
 
+    // 'ForcePosition' is the one way to set the physical position of the body in the physics engine.
+    // Displace the simulator idea of position (center of root prim) to the physical position.
     public override Vector3 ForcePosition
     {
-        get { return base.ForcePosition; }
+        get {
+            OMV.Vector3 physPosition = PhysScene.PE.GetPosition(PhysBody);
+            if (PositionDisplacement != OMV.Vector3.Zero)
+            {
+                // If there is some displacement, return the physical position (center-of-mass)
+                //     location minus the displacement to give the center of the root prim.
+                OMV.Vector3 displacement = PositionDisplacement * ForceOrientation;
+                DetailLog("{0},BSPrimDisplaced.ForcePosition,get,physPos={1},disp={2},simPos={3}",
+                                LocalID, physPosition, displacement, physPosition - displacement);
+                physPosition -= displacement;
+            }
+            RawPosition = physPosition;
+            return physPosition;
+        }
         set
         {
             if (PositionDisplacement != OMV.Vector3.Zero)
-                base.ForcePosition = value - (PositionDisplacement * RawOrientation);
+            {
+                // This value is the simulator's idea of where the prim is: the center of the root prim
+                RawPosition = value;
+
+                // Move the passed root prim postion to the center-of-mass position and set in the physics engine.
+                OMV.Vector3 displacement = PositionDisplacement * RawOrientation;
+                OMV.Vector3 displacedPos = RawPosition + displacement;
+                DetailLog("{0},BSPrimDisplaced.ForcePosition,set,simPos={1},disp={2},physPos={3}",
+                                        LocalID, RawPosition, displacement, displacedPos);
+                if (PhysBody.HasPhysicalBody)
+                {
+                    PhysScene.PE.SetTranslation(PhysBody, displacedPos, RawOrientation);
+                    ActivateIfPhysical(false);
+                }
+            }
             else
+            {
                 base.ForcePosition = value;
+            }
         }
     }
 
-    public override Quaternion ForceOrientation
-    {
-        get { return base.ForceOrientation; }
-        set
-        {
-            base.ForceOrientation = value;
-        }
-    }
-
-    // TODO: decide if this is the right place for these variables.
-    //     Somehow incorporate the optional settability by the user.
-    // Is this used?
+    // These are also overridden by BSPrimLinkable if the prim can be part of a linkset
     public override OMV.Vector3 CenterOfMass
     {
         get { return RawPosition; }
     }
 
-    // Is this used?
     public override OMV.Vector3 GeometricCenter
     {
         get { return RawPosition; }
@@ -139,12 +162,18 @@ public class BSPrimDisplaced : BSPrim
     public override void UpdateProperties(EntityProperties entprop)
     {
         // Undo any center-of-mass displacement that might have been done.
-        if (PositionDisplacement != OMV.Vector3.Zero || OrientationDisplacement != OMV.Quaternion.Identity)
+        if (PositionDisplacement != OMV.Vector3.Zero)
         {
-            // Correct for any rotation around the center-of-mass
-            // TODO!!!
-            entprop.Position = entprop.Position + (PositionDisplacement * entprop.Rotation);
-            // entprop.Rotation = something;
+            // The origional shape was offset from 'zero' by PositionDisplacement.
+            // These physical location must be back converted to be centered around the displaced
+            //     root shape.
+
+            // Move the returned center-of-mass location to the root prim location.
+            OMV.Vector3 displacement = PositionDisplacement * entprop.Rotation;
+            OMV.Vector3 displacedPos = entprop.Position - displacement;
+            DetailLog("{0},BSPrimDisplaced.UpdateProperties,physPos={1},disp={2},simPos={3}",
+                                    LocalID, entprop.Position, displacement, displacedPos);
+            entprop.Position = displacedPos;
         }
 
         base.UpdateProperties(entprop);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
index d65d407..7179a6d 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimLinkable.cs
@@ -37,19 +37,28 @@ namespace OpenSim.Region.Physics.BulletSPlugin
 {
 public class BSPrimLinkable : BSPrimDisplaced
 {
+    // The purpose of this subclass is to add linkset functionality to the prim. This overrides
+    //    operations necessary for keeping the linkset created and, additionally, this
+    //    calls the linkset implementation for its creation and management.
+
+    // This adds the overrides for link() and delink() so the prim is linkable.
+
     public BSLinkset Linkset { get; set; }
     // The index of this child prim.
     public int LinksetChildIndex { get; set; }
 
-    public BSLinksetInfo LinksetInfo { get; set; }
+    public BSLinkset.LinksetImplementation LinksetType { get; set; }
 
     public BSPrimLinkable(uint localID, String primName, BSScene parent_scene, OMV.Vector3 pos, OMV.Vector3 size,
                        OMV.Quaternion rotation, PrimitiveBaseShape pbs, bool pisPhysical)
         : base(localID, primName, parent_scene, pos, size, rotation, pbs, pisPhysical)
     {
-        Linkset = BSLinkset.Factory(PhysicsScene, this);
+        // Default linkset implementation for this prim
+        LinksetType = (BSLinkset.LinksetImplementation)BSParam.LinksetImplementation;
+
+        Linkset = BSLinkset.Factory(PhysScene, this);
 
-        PhysicsScene.TaintedObject("BSPrimLinksetCompound.Refresh", delegate()
+        PhysScene.TaintedObject("BSPrimLinksetCompound.Refresh", delegate()
         {
             Linkset.Refresh(this);
         });
@@ -61,16 +70,13 @@ public class BSPrimLinkable : BSPrimDisplaced
         base.Destroy();
     }
 
-    public override BSPhysicsShapeType PreferredPhysicalShape
-        { get { return Linkset.PreferredPhysicalShape(this); } }
-
     public override void link(Manager.PhysicsActor obj)
     {
         BSPrimLinkable parent = obj as BSPrimLinkable;
         if (parent != null)
         {
-            BSPhysObject parentBefore = Linkset.LinksetRoot;
-            int childrenBefore = Linkset.NumberOfChildren;
+            BSPhysObject parentBefore = Linkset.LinksetRoot;    // DEBUG
+            int childrenBefore = Linkset.NumberOfChildren;      // DEBUG
 
             Linkset = parent.Linkset.AddMeToLinkset(this);
 
@@ -85,8 +91,8 @@ public class BSPrimLinkable : BSPrimDisplaced
         // TODO: decide if this parent checking needs to happen at taint time
         // Race condition here: if link() and delink() in same simulation tick, the delink will not happen
 
-        BSPhysObject parentBefore = Linkset.LinksetRoot;
-        int childrenBefore = Linkset.NumberOfChildren;
+        BSPhysObject parentBefore = Linkset.LinksetRoot;        // DEBUG
+        int childrenBefore = Linkset.NumberOfChildren;          // DEBUG
 
         Linkset = Linkset.RemoveMeFromLinkset(this);
 
@@ -102,7 +108,7 @@ public class BSPrimLinkable : BSPrimDisplaced
         set
         {
             base.Position = value;
-            PhysicsScene.TaintedObject("BSPrimLinkset.setPosition", delegate()
+            PhysScene.TaintedObject("BSPrimLinkset.setPosition", delegate()
             {
                 Linkset.UpdateProperties(UpdatedProperties.Position, this);
             });
@@ -116,7 +122,7 @@ public class BSPrimLinkable : BSPrimDisplaced
         set
         {
             base.Orientation = value;
-            PhysicsScene.TaintedObject("BSPrimLinkset.setOrientation", delegate()
+            PhysScene.TaintedObject("BSPrimLinkset.setOrientation", delegate()
             {
                 Linkset.UpdateProperties(UpdatedProperties.Orientation, this);
             });
@@ -128,6 +134,17 @@ public class BSPrimLinkable : BSPrimDisplaced
         get { return Linkset.LinksetMass; }
     }
 
+    public override OMV.Vector3 CenterOfMass
+    {
+        get { return Linkset.CenterOfMass; }
+    }
+
+    public override OMV.Vector3 GeometricCenter
+    {
+        get { return Linkset.GeometricCenter; }
+    }
+
+    // Refresh the linkset structure and parameters when the prim's physical parameters are changed.
     public override void UpdatePhysicalParameters()
     {
         base.UpdatePhysicalParameters();
@@ -139,22 +156,28 @@ public class BSPrimLinkable : BSPrimDisplaced
             Linkset.Refresh(this);
     }
 
+    // When the prim is made dynamic or static, the linkset needs to change.
     protected override void MakeDynamic(bool makeStatic)
     {
         base.MakeDynamic(makeStatic);
-        if (makeStatic)
-            Linkset.MakeStatic(this);
-        else
-            Linkset.MakeDynamic(this);
+        if (Linkset != null)    // null can happen during initialization
+        {
+            if (makeStatic)
+                Linkset.MakeStatic(this);
+            else
+                Linkset.MakeDynamic(this);
+        }
     }
 
     // Body is being taken apart. Remove physical dependencies and schedule a rebuild.
-    protected override void RemoveBodyDependencies()
+    protected override void RemoveDependencies()
     {
-        Linkset.RemoveBodyDependencies(this);
-        base.RemoveBodyDependencies();
+        Linkset.RemoveDependencies(this);
+        base.RemoveDependencies();
     }
 
+    // Called after a simulation step for the changes in physical object properties.
+    // Do any filtering/modification needed for linksets.
     public override void UpdateProperties(EntityProperties entprop)
     {
         if (Linkset.IsRoot(this))
@@ -163,20 +186,93 @@ public class BSPrimLinkable : BSPrimDisplaced
             // TODO: this will have to change when linksets are articulated.
             base.UpdateProperties(entprop);
         }
+            /*
+        else
+        {
+            // For debugging, report the movement of children
+            DetailLog("{0},BSPrim.UpdateProperties,child,pos={1},orient={2},vel={3},accel={4},rotVel={5}",
+                    LocalID, entprop.Position, entprop.Rotation, entprop.Velocity,
+                    entprop.Acceleration, entprop.RotationalVelocity);
+        }
+             */
         // The linkset might like to know about changing locations
         Linkset.UpdateProperties(UpdatedProperties.EntPropUpdates, this);
     }
 
+    // Called after a simulation step to post a collision with this object.
+    // This returns 'true' if the collision has been queued and the SendCollisions call must
+    //     be made at the end of the simulation step.
     public override bool Collide(uint collidingWith, BSPhysObject collidee,
                     OMV.Vector3 contactPoint, OMV.Vector3 contactNormal, float pentrationDepth)
     {
-        // prims in the same linkset cannot collide with each other
-        BSPrimLinkable convCollidee = collidee as BSPrimLinkable;
-        if (convCollidee != null && (this.Linkset.LinksetID == convCollidee.Linkset.LinksetID))
+        bool ret = false;
+        // Ask the linkset if it wants to handle the collision
+        if (!Linkset.HandleCollide(collidingWith, collidee, contactPoint, contactNormal, pentrationDepth))
+        {
+            // The linkset didn't handle it so pass the collision through normal processing
+            ret = base.Collide(collidingWith, collidee, contactPoint, contactNormal, pentrationDepth);
+        }
+        return ret;
+    }
+
+    // A linkset reports any collision on any part of the linkset.
+    public long SomeCollisionSimulationStep = 0;
+    public override bool HasSomeCollision
+    {
+        get
+        {
+            return (SomeCollisionSimulationStep == PhysScene.SimulationStep) || base.IsColliding;
+        }
+        set
+        {
+            if (value)
+                SomeCollisionSimulationStep = PhysScene.SimulationStep;
+            else
+                SomeCollisionSimulationStep = 0;
+
+            base.HasSomeCollision = value;
+        }
+    }
+
+    // Convert the existing linkset of this prim into a new type.
+    public bool ConvertLinkset(BSLinkset.LinksetImplementation newType)
+    {
+        bool ret = false;
+        if (LinksetType != newType)
         {
-            return false;
+            // Set the implementation type first so the call to BSLinkset.Factory gets the new type.
+            this.LinksetType = newType;
+
+            BSLinkset oldLinkset = this.Linkset;
+            BSLinkset newLinkset = BSLinkset.Factory(PhysScene, this);
+
+            this.Linkset = newLinkset;
+
+            // Pick up any physical dependencies this linkset might have in the physics engine.
+            oldLinkset.RemoveDependencies(this);
+
+            // Create a list of the children (mainly because can't interate through a list that's changing)
+            List<BSPrimLinkable> children = new List<BSPrimLinkable>();
+            oldLinkset.ForEachMember((child) =>
+            {
+                if (!oldLinkset.IsRoot(child))
+                    children.Add(child);
+                return false;   // 'false' says to continue to next member
+            });
+
+            // Remove the children from the old linkset and add to the new (will be a new instance from the factory)
+            foreach (BSPrimLinkable child in children)
+            {
+                oldLinkset.RemoveMeFromLinkset(child);
+                newLinkset.AddMeToLinkset(child);
+                child.Linkset = newLinkset;
+            }
+
+            // Force the shape and linkset to get reconstructed
+            newLinkset.Refresh(this);
+            this.ForceBodyShapeRebuild(true /* inTaintTime */);
         }
-        return base.Collide(collidingWith, collidee, contactPoint, contactNormal, pentrationDepth);
+        return ret;
     }
 }
 }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index e6aefd5..c92c9b9 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -56,12 +56,23 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
     public string BulletEngineName { get; private set; }
     public BSAPITemplate PE;
 
+    // If the physics engine is running on a separate thread
+    public Thread m_physicsThread;
+
     public Dictionary<uint, BSPhysObject> PhysObjects;
     public BSShapeCollection Shapes;
 
     // Keeping track of the objects with collisions so we can report begin and end of a collision
     public HashSet<BSPhysObject> ObjectsWithCollisions = new HashSet<BSPhysObject>();
     public HashSet<BSPhysObject> ObjectsWithNoMoreCollisions = new HashSet<BSPhysObject>();
+
+    // All the collision processing is protected with this lock object
+    public Object CollisionLock = new Object();
+
+    // Properties are updated here
+    public Object UpdateLock = new Object();
+    public HashSet<BSPhysObject> ObjectsWithUpdates = new HashSet<BSPhysObject>();
+
     // Keep track of all the avatars so we can send them a collision event
     //    every tick so OpenSim will update its animation.
     private HashSet<BSPhysObject> m_avatars = new HashSet<BSPhysObject>();
@@ -77,12 +88,22 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
     public BSConstraintCollection Constraints { get; private set; }
 
     // Simulation parameters
+    internal float m_physicsStepTime;   // if running independently, the interval simulated by default
+
     internal int m_maxSubSteps;
     internal float m_fixedTimeStep;
-    internal long m_simulationStep = 0;
-    internal float NominalFrameRate { get; set; }
+
+    internal float m_simulatedTime;     // the time simulated previously. Used for physics framerate calc.
+
+    internal long m_simulationStep = 0; // The current simulation step.
     public long SimulationStep { get { return m_simulationStep; } }
-    internal float LastTimeStep { get; private set; }
+    // A number to use for SimulationStep that is probably not any step value
+    // Used by the collision code (which remembers the step when a collision happens) to remember not any simulation step.
+    public static long NotASimulationStep = -1234;
+
+    internal float LastTimeStep { get; private set; }   // The simulation time from the last invocation of Simulate()
+
+    internal float NominalFrameRate { get; set; }       // Parameterized ideal frame rate that simulation is scaled to
 
     // Physical objects can register for prestep or poststep events
     public delegate void PreStepAction(float timeStep);
@@ -90,7 +111,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
     public event PreStepAction BeforeStep;
     public event PostStepAction AfterStep;
 
-    // A value of the time now so all the collision and update routines do not have to get their own
+    // A value of the time 'now' so all the collision and update routines do not have to get their own
     // Set to 'now' just before all the prims and actors are called for collisions and updates
     public int SimulationNowTime { get; private set; }
 
@@ -188,6 +209,9 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
         PhysObjects = new Dictionary<uint, BSPhysObject>();
         Shapes = new BSShapeCollection(this);
 
+        m_simulatedTime = 0f;
+        LastTimeStep = 0.1f;
+
         // Allocate pinned memory to pass parameters.
         UnmanagedParams = new ConfigurationParameters[1];
 
@@ -202,8 +226,8 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
         //     can be left in and every call doesn't have to check for null.
         if (m_physicsLoggingEnabled)
         {
-            PhysicsLogging = new Logging.LogWriter(m_physicsLoggingDir, m_physicsLoggingPrefix, m_physicsLoggingFileMinutes);
-            PhysicsLogging.ErrorLogger = m_log; // for DEBUG. Let's the logger output error messages.
+            PhysicsLogging = new Logging.LogWriter(m_physicsLoggingDir, m_physicsLoggingPrefix, m_physicsLoggingFileMinutes, m_physicsLoggingDoFlush);
+            PhysicsLogging.ErrorLogger = m_log; // for DEBUG. Let's the logger output its own error messages.
         }
         else
         {
@@ -227,10 +251,20 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
         TerrainManager = new BSTerrainManager(this);
         TerrainManager.CreateInitialGroundPlaneAndTerrain();
 
-        m_log.WarnFormat("{0} Linksets implemented with {1}", LogHeader, (BSLinkset.LinksetImplementation)BSParam.LinksetImplementation);
+        // Put some informational messages into the log file.
+        m_log.InfoFormat("{0} Linksets implemented with {1}", LogHeader, (BSLinkset.LinksetImplementation)BSParam.LinksetImplementation);
 
         InTaintTime = false;
         m_initialized = true;
+
+        // If the physics engine runs on its own thread, start same.
+        if (BSParam.UseSeparatePhysicsThread)
+        {
+            // The physics simulation should happen independently of the heartbeat loop
+            m_physicsThread = new Thread(BulletSPluginPhysicsThread);
+            m_physicsThread.Name = BulletEngineName;
+            m_physicsThread.Start();
+        }
     }
 
     // All default parameter values are set here. There should be no values set in the
@@ -268,6 +302,13 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
                 // Do any replacements in the parameters
                 m_physicsLoggingPrefix = m_physicsLoggingPrefix.Replace("%REGIONNAME%", RegionName);
             }
+            else
+            {
+                // Nothing in the configuration INI file so assume unmanaged and other defaults.
+                BulletEngineName = "BulletUnmanaged";
+                m_physicsLoggingEnabled = false;
+                VehicleLoggingEnabled = false;
+            }
 
             // The material characteristics.
             BSMaterials.InitializeFromDefaults(Params);
@@ -311,11 +352,22 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
 
         switch (selectionName)
         {
+            case "bullet":
             case "bulletunmanaged":
                 ret = new BSAPIUnman(engineName, this);
                 break;
             case "bulletxna":
                 ret = new BSAPIXNA(engineName, this);
+                // Disable some features that are not implemented in BulletXNA
+                m_log.InfoFormat("{0} Disabling some physics features not implemented by BulletXNA", LogHeader);
+                m_log.InfoFormat("{0}    Disabling ShouldUseBulletHACD", LogHeader);
+                BSParam.ShouldUseBulletHACD = false;
+                m_log.InfoFormat("{0}    Disabling ShouldUseSingleConvexHullForPrims", LogHeader);
+                BSParam.ShouldUseSingleConvexHullForPrims = false;
+                m_log.InfoFormat("{0}    Disabling ShouldUseGImpactShapeForPrims", LogHeader);
+                BSParam.ShouldUseGImpactShapeForPrims = false;
+                m_log.InfoFormat("{0}    Setting terrain implimentation to Heightmap", LogHeader);
+                BSParam.TerrainImplementation = (float)BSTerrainPhys.TerrainImplementation.Heightmap;
                 break;
         }
 
@@ -325,7 +377,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
         }
         else
         {
-            m_log.WarnFormat("{0} Selected bullet engine {1} -> {2}/{3}", LogHeader, engineName, ret.BulletEngineName, ret.BulletEngineVersion);
+            m_log.InfoFormat("{0} Selected bullet engine {1} -> {2}/{3}", LogHeader, engineName, ret.BulletEngineName, ret.BulletEngineVersion);
         }
 
         return ret;
@@ -463,7 +515,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
 
         if (!m_initialized) return null;
 
-        DetailLog("{0},BSScene.AddPrimShape,call", localID);
+        // DetailLog("{0},BSScene.AddPrimShape,call", localID);
 
         BSPhysObject prim = new BSPrimLinkable(localID, primName, this, position, size, rotation, pbs, isPhysical);
         lock (PhysObjects) PhysObjects.Add(localID, prim);
@@ -478,25 +530,41 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
     #endregion // Prim and Avatar addition and removal
 
     #region Simulation
-    // Simulate one timestep
+
+    // Call from the simulator to send physics information to the simulator objects.
+    // This pushes all the collision and property update events into the objects in
+    //    the simulator and, since it is on the heartbeat thread, there is an implicit
+    //    locking of those data structures from other heartbeat events.
+    // If the physics engine is running on a separate thread, the update information
+    //    will be in the ObjectsWithCollions and ObjectsWithUpdates structures.
     public override float Simulate(float timeStep)
     {
+        if (!BSParam.UseSeparatePhysicsThread)
+        {
+            DoPhysicsStep(timeStep);
+        }
+        return SendUpdatesToSimulator(timeStep);
+    }
+
+    // Call the physics engine to do one 'timeStep' and collect collisions and updates
+    //    into ObjectsWithCollisions and ObjectsWithUpdates data structures.
+    private void DoPhysicsStep(float timeStep)
+    {
         // prevent simulation until we've been initialized
-        if (!m_initialized) return 5.0f;
+        if (!m_initialized) return;
 
         LastTimeStep = timeStep;
 
         int updatedEntityCount = 0;
         int collidersCount = 0;
 
-        int beforeTime = 0;
+        int beforeTime = Util.EnvironmentTickCount();
         int simTime = 0;
 
-        // update the prim states while we know the physics engine is not busy
         int numTaints = _taintOperations.Count;
-
         InTaintTime = true; // Only used for debugging so locking is not necessary.
 
+        // update the prim states while we know the physics engine is not busy
         ProcessTaints();
 
         // Some of the physical objects requre individual, pre-step calls
@@ -519,18 +587,8 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
         int numSubSteps = 0;
         try
         {
-            if (PhysicsLogging.Enabled)
-                beforeTime = Util.EnvironmentTickCount();
-
             numSubSteps = PE.PhysicsStep(World, timeStep, m_maxSubSteps, m_fixedTimeStep, out updatedEntityCount, out collidersCount);
 
-            if (PhysicsLogging.Enabled)
-            {
-                simTime = Util.EnvironmentTickCountSubtract(beforeTime);
-                DetailLog("{0},Simulate,call, frame={1}, nTaints={2}, simTime={3}, substeps={4}, updates={5}, colliders={6}, objWColl={7}",
-                                        DetailLogZero, m_simulationStep, numTaints, simTime, numSubSteps,
-                                        updatedEntityCount, collidersCount, ObjectsWithCollisions.Count);
-            }
         }
         catch (Exception e)
         {
@@ -542,77 +600,63 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
             collidersCount = 0;
         }
 
+        // Make the physics engine dump useful statistics periodically
         if (PhysicsMetricDumpFrames != 0 && ((m_simulationStep % PhysicsMetricDumpFrames) == 0))
             PE.DumpPhysicsStatistics(World);
 
         // Get a value for 'now' so all the collision and update routines don't have to get their own.
         SimulationNowTime = Util.EnvironmentTickCount();
 
-        // If there were collisions, process them by sending the event to the prim.
-        // Collisions must be processed before updates.
-        if (collidersCount > 0)
+        // Send collision information to the colliding objects. The objects decide if the collision
+        //     is 'real' (like linksets don't collide with themselves) and the individual objects
+        //     know if the simulator has subscribed to collisions.
+        lock (CollisionLock)
         {
-            for (int ii = 0; ii < collidersCount; ii++)
+            if (collidersCount > 0)
             {
-                uint cA = m_collisionArray[ii].aID;
-                uint cB = m_collisionArray[ii].bID;
-                Vector3 point = m_collisionArray[ii].point;
-                Vector3 normal = m_collisionArray[ii].normal;
-                float penetration = m_collisionArray[ii].penetration;
-                SendCollision(cA, cB, point, normal, penetration);
-                SendCollision(cB, cA, point, -normal, penetration);
-            }
-        }
-
-        // The above SendCollision's batch up the collisions on the objects.
-        //      Now push the collisions into the simulator.
-        if (ObjectsWithCollisions.Count > 0)
-        {
-            foreach (BSPhysObject bsp in ObjectsWithCollisions)
-                if (!bsp.SendCollisions())
+                for (int ii = 0; ii < collidersCount; ii++)
                 {
-                    // If the object is done colliding, see that it's removed from the colliding list
-                    ObjectsWithNoMoreCollisions.Add(bsp);
+                    uint cA = m_collisionArray[ii].aID;
+                    uint cB = m_collisionArray[ii].bID;
+                    Vector3 point = m_collisionArray[ii].point;
+                    Vector3 normal = m_collisionArray[ii].normal;
+                    float penetration = m_collisionArray[ii].penetration;
+                    SendCollision(cA, cB, point, normal, penetration);
+                    SendCollision(cB, cA, point, -normal, penetration);
                 }
+            }
         }
 
-        // This is a kludge to get avatar movement updates.
-        // The simulator expects collisions for avatars even if there are have been no collisions.
-        //    The event updates avatar animations and stuff.
-        // If you fix avatar animation updates, remove this overhead and let normal collision processing happen.
-        foreach (BSPhysObject bsp in m_avatars)
-            if (!ObjectsWithCollisions.Contains(bsp))   // don't call avatars twice
-                bsp.SendCollisions();
-
-        // Objects that are done colliding are removed from the ObjectsWithCollisions list.
-        // Not done above because it is inside an iteration of ObjectWithCollisions.
-        // This complex collision processing is required to create an empty collision
-        //     event call after all real collisions have happened on an object. This enables
-        //     the simulator to generate the 'collision end' event.
-        if (ObjectsWithNoMoreCollisions.Count > 0)
-        {
-            foreach (BSPhysObject po in ObjectsWithNoMoreCollisions)
-                ObjectsWithCollisions.Remove(po);
-            ObjectsWithNoMoreCollisions.Clear();
-        }
-        // Done with collisions.
-
-        // If any of the objects had updated properties, tell the object it has been changed by the physics engine
-        if (updatedEntityCount > 0)
+        // If any of the objects had updated properties, tell the managed objects about the update
+        //     and remember that there was a change so it will be passed to the simulator.
+        lock (UpdateLock)
         {
-            for (int ii = 0; ii < updatedEntityCount; ii++)
+            if (updatedEntityCount > 0)
             {
-                EntityProperties entprop = m_updateArray[ii];
-                BSPhysObject pobj;
-                if (PhysObjects.TryGetValue(entprop.ID, out pobj))
+                for (int ii = 0; ii < updatedEntityCount; ii++)
                 {
-                    pobj.UpdateProperties(entprop);
+                    EntityProperties entprop = m_updateArray[ii];
+                    BSPhysObject pobj;
+                    if (PhysObjects.TryGetValue(entprop.ID, out pobj))
+                    {
+                        if (pobj.IsInitialized)
+                            pobj.UpdateProperties(entprop);
+                    }
                 }
             }
         }
 
+        // Some actors want to know when the simulation step is complete.
         TriggerPostStepEvent(timeStep);
 
+        simTime = Util.EnvironmentTickCountSubtract(beforeTime);
+        if (PhysicsLogging.Enabled)
+        {
+            DetailLog("{0},DoPhysicsStep,complete,frame={1}, nTaints={2}, simTime={3}, substeps={4}, updates={5}, colliders={6}, objWColl={7}",
+                                    DetailLogZero, m_simulationStep, numTaints, simTime, numSubSteps,
+                                    updatedEntityCount, collidersCount, ObjectsWithCollisions.Count);
+        }
+
         // The following causes the unmanaged code to output ALL the values found in ALL the objects in the world.
         // Only enable this in a limited test world with few objects.
         if (m_physicsPhysicalDumpEnabled)
@@ -621,7 +665,84 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
         // The physics engine returns the number of milliseconds it simulated this call.
         // These are summed and normalized to one second and divided by 1000 to give the reported physics FPS.
         // Multiply by a fixed nominal frame rate to give a rate similar to the simulator (usually 55).
-        return (float)numSubSteps * m_fixedTimeStep * 1000f * NominalFrameRate;
+        m_simulatedTime +=  (float)numSubSteps * m_fixedTimeStep * 1000f * NominalFrameRate;
+    }
+
+    // Called by a BSPhysObject to note that it has changed properties and this information
+    //    should be passed up to the simulator at the proper time.
+    // Note: this is called by the BSPhysObject from invocation via DoPhysicsStep() above so
+    //    this is is under UpdateLock.
+    public void PostUpdate(BSPhysObject updatee)
+    {
+        ObjectsWithUpdates.Add(updatee);
+    }
+
+    // The simulator thinks it is physics time so return all the collisions and position
+    //     updates that were collected in actual physics simulation.
+    private float SendUpdatesToSimulator(float timeStep)
+    {
+        if (!m_initialized) return 5.0f;
+
+        DetailLog("{0},SendUpdatesToSimulator,collisions={1},updates={2},simedTime={3}",
+            BSScene.DetailLogZero, ObjectsWithCollisions.Count, ObjectsWithUpdates.Count, m_simulatedTime);
+        // Push the collisions into the simulator.
+        lock (CollisionLock)
+        {
+            if (ObjectsWithCollisions.Count > 0)
+            {
+                foreach (BSPhysObject bsp in ObjectsWithCollisions)
+                    if (!bsp.SendCollisions())
+                    {
+                        // If the object is done colliding, see that it's removed from the colliding list
+                        ObjectsWithNoMoreCollisions.Add(bsp);
+                    }
+            }
+
+            // This is a kludge to get avatar movement updates.
+            // The simulator expects collisions for avatars even if there are have been no collisions.
+            //    The event updates avatar animations and stuff.
+            // If you fix avatar animation updates, remove this overhead and let normal collision processing happen.
+            foreach (BSPhysObject bsp in m_avatars)
+                if (!ObjectsWithCollisions.Contains(bsp))   // don't call avatars twice
+                    bsp.SendCollisions();
+
+            // Objects that are done colliding are removed from the ObjectsWithCollisions list.
+            // Not done above because it is inside an iteration of ObjectWithCollisions.
+            // This complex collision processing is required to create an empty collision
+            //     event call after all real collisions have happened on an object. This allows
+            //     the simulator to generate the 'collision end' event.
+            if (ObjectsWithNoMoreCollisions.Count > 0)
+            {
+                foreach (BSPhysObject po in ObjectsWithNoMoreCollisions)
+                    ObjectsWithCollisions.Remove(po);
+                ObjectsWithNoMoreCollisions.Clear();
+            }
+        }
+
+        // Call the simulator for each object that has physics property updates.
+        HashSet<BSPhysObject> updatedObjects = null;
+        lock (UpdateLock)
+        {
+            if (ObjectsWithUpdates.Count > 0)
+            {
+                updatedObjects = ObjectsWithUpdates;
+                ObjectsWithUpdates = new HashSet<BSPhysObject>();
+            }
+        }
+        if (updatedObjects != null)
+        {
+            foreach (BSPhysObject obj in updatedObjects)
+            {
+                obj.RequestPhysicsterseUpdate();
+            }
+            updatedObjects.Clear();
+        }
+
+        // Return the framerate simulated to give the above returned results.
+        // (Race condition here but this is just bookkeeping so rare mistakes do not merit a lock).
+        float simTime = m_simulatedTime;
+        m_simulatedTime = 0f;
+        return simTime;
     }
 
     // Something has collided
@@ -640,21 +761,49 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
             return;
         }
 
-        // The terrain is not in the physical object list so 'collidee' can be null when Collide() is called.
+        // Note: the terrain is not in the physical object list so 'collidee' can be null when Collide() is called.
         BSPhysObject collidee = null;
         PhysObjects.TryGetValue(collidingWith, out collidee);
 
         // DetailLog("{0},BSScene.SendCollision,collide,id={1},with={2}", DetailLogZero, localID, collidingWith);
 
-        if (collider.Collide(collidingWith, collidee, collidePoint, collideNormal, penetration))
+        if (collider.IsInitialized)
         {
-            // If a collision was posted, remember to send it to the simulator
-            ObjectsWithCollisions.Add(collider);
+            if (collider.Collide(collidingWith, collidee, collidePoint, collideNormal, penetration))
+            {
+                // If a collision was 'good', remember to send it to the simulator
+                ObjectsWithCollisions.Add(collider);
+            }
         }
 
         return;
     }
 
+    public void BulletSPluginPhysicsThread()
+    {
+        while (m_initialized)
+        {
+            int beginSimulationRealtimeMS = Util.EnvironmentTickCount();
+            DoPhysicsStep(BSParam.PhysicsTimeStep);
+            int simulationRealtimeMS = Util.EnvironmentTickCountSubtract(beginSimulationRealtimeMS);
+            int simulationTimeVsRealtimeDifferenceMS = ((int)(BSParam.PhysicsTimeStep*1000f)) - simulationRealtimeMS;
+
+            if (simulationTimeVsRealtimeDifferenceMS > 0)
+            {
+                // The simulation of the time interval took less than realtime.
+                // Do a sleep for the rest of realtime.
+                Thread.Sleep(simulationTimeVsRealtimeDifferenceMS);
+            }
+            else
+            {
+                // The simulation took longer than realtime.
+                // Do some scaling of simulation time.
+                // TODO.
+                DetailLog("{0},BulletSPluginPhysicsThread,longerThanRealtime={1}", BSScene.DetailLogZero, simulationTimeVsRealtimeDifferenceMS);
+            }
+        }
+    }
+
     #endregion // Simulation
 
     public override void GetResults() { }
@@ -717,6 +866,23 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
 
     public override bool IsThreaded { get { return false;  } }
 
+    #region Extensions
+    // =============================================================
+    // Per scene functions. See below.
+
+    // Per avatar functions. See BSCharacter.
+
+    // Per prim functions. See BSPrim.
+    public const string PhysFunctGetLinksetType = "BulletSim.GetLinksetType";
+    public const string PhysFunctSetLinksetType = "BulletSim.SetLinksetType";
+    // =============================================================
+
+    public override object Extension(string pFunct, params object[] pParams)
+    {
+        return base.Extension(pFunct, pParams);
+    }
+    #endregion // Extensions
+
     #region Taints
     // The simulation execution order is:
     // Simulate()
@@ -780,7 +946,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
 
     private void ProcessRegularTaints()
     {
-        if (_taintOperations.Count > 0)  // save allocating new list if there is nothing to process
+        if (m_initialized && _taintOperations.Count > 0)  // save allocating new list if there is nothing to process
         {
             // swizzle a new list into the list location so we can process what's there
             List<TaintCallbackEntry> oldList;
@@ -823,7 +989,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
     // Taints that happen after the normal taint processing but before the simulation step.
     private void ProcessPostTaintTaints()
     {
-        if (_postTaintOperations.Count > 0)
+        if (m_initialized && _postTaintOperations.Count > 0)
         {
             Dictionary<string, TaintCallbackEntry> oldList;
             lock (_taintLock)
@@ -963,8 +1129,6 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
     public void DetailLog(string msg, params Object[] args)
     {
         PhysicsLogging.Write(msg, args);
-        // Add the Flush() if debugging crashes. Gets all the messages written out.
-        if (m_physicsLoggingDoFlush) PhysicsLogging.Flush();
     }
     // Used to fill in the LocalID when there isn't one. It's the correct number of characters.
     public const string DetailLogZero = "0000000000";
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
index 220fbbc..32bbc8f 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
@@ -38,38 +38,15 @@ public sealed class BSShapeCollection : IDisposable
 {
     private static string LogHeader = "[BULLETSIM SHAPE COLLECTION]";
 
-    private BSScene PhysicsScene { get; set; }
+    private BSScene m_physicsScene { get; set; }
 
     private Object m_collectionActivityLock = new Object();
 
-    // Description of a Mesh
-    private struct MeshDesc
-    {
-        public BulletShape shape;
-        public int referenceCount;
-        public DateTime lastReferenced;
-        public UInt64 shapeKey;
-    }
-
-    // Description of a hull.
-    // Meshes and hulls have the same shape hash key but we only need hulls for efficient collision calculations.
-    private struct HullDesc
-    {
-        public BulletShape shape;
-        public int referenceCount;
-        public DateTime lastReferenced;
-        public UInt64 shapeKey;
-    }
-
-    // The sharable set of meshes and hulls. Indexed by their shape hash.
-    private Dictionary<System.UInt64, MeshDesc> Meshes = new Dictionary<System.UInt64, MeshDesc>();
-    private Dictionary<System.UInt64, HullDesc> Hulls = new Dictionary<System.UInt64, HullDesc>();
-
     private bool DDetail = false;
 
     public BSShapeCollection(BSScene physScene)
     {
-        PhysicsScene = physScene;
+        m_physicsScene = physScene;
         // Set the next to 'true' for very detailed shape update detailed logging (detailed details?)
         // While detailed debugging is still active, this is better than commenting out all the
         //     DetailLog statements. When debugging slows down, this and the protected logging
@@ -86,22 +63,18 @@ public sealed class BSShapeCollection : IDisposable
     // Mostly used for changing bodies out from under Linksets.
     // Useful for other cases where parameters need saving.
     // Passing 'null' says no callback.
-    public delegate void ShapeDestructionCallback(BulletShape shape);
-    public delegate void BodyDestructionCallback(BulletBody body);
+    public delegate void PhysicalDestructionCallback(BulletBody pBody, BulletShape pShape);
 
     // Called to update/change the body and shape for an object.
-    // First checks the shape and updates that if necessary then makes
-    //    sure the body is of the right type.
+    // The object has some shape and body on it. Here we decide if that is the correct shape
+    //    for the current state of the object (static/dynamic/...).
+    // If bodyCallback is not null, it is called if either the body or the shape are changed
+    //    so dependencies (like constraints) can be removed before the physical object is dereferenced.
     // Return 'true' if either the body or the shape changed.
-    // 'shapeCallback' and 'bodyCallback' are, if non-null, functions called just before
-    //    the current shape or body is destroyed. This allows the caller to remove any
-    //    higher level dependencies on the shape or body. Mostly used for LinkSets to
-    //    remove the physical constraints before the body is destroyed.
-    // Called at taint-time!!
-    public bool GetBodyAndShape(bool forceRebuild, BulletWorld sim, BSPhysObject prim,
-                    ShapeDestructionCallback shapeCallback, BodyDestructionCallback bodyCallback)
+    // Called at taint-time.
+    public bool GetBodyAndShape(bool forceRebuild, BulletWorld sim, BSPhysObject prim, PhysicalDestructionCallback bodyCallback)
     {
-        PhysicsScene.AssertInTaintTime("BSShapeCollection.GetBodyAndShape");
+        m_physicsScene.AssertInTaintTime("BSShapeCollection.GetBodyAndShape");
 
         bool ret = false;
 
@@ -111,12 +84,12 @@ public sealed class BSShapeCollection : IDisposable
             // Do we have the correct geometry for this type of object?
             // Updates prim.BSShape with information/pointers to shape.
             // Returns 'true' of BSShape is changed to a new shape.
-            bool newGeom = CreateGeom(forceRebuild, prim, shapeCallback);
+            bool newGeom = CreateGeom(forceRebuild, prim, bodyCallback);
             // If we had to select a new shape geometry for the object,
             //    rebuild the body around it.
             // Updates prim.BSBody with information/pointers to requested body
             // Returns 'true' if BSBody was changed.
-            bool newBody = CreateBody((newGeom || forceRebuild), prim, PhysicsScene.World, bodyCallback);
+            bool newBody = CreateBody((newGeom || forceRebuild), prim, m_physicsScene.World, bodyCallback);
             ret = newGeom || newBody;
         }
         DetailLog("{0},BSShapeCollection.GetBodyAndShape,taintExit,force={1},ret={2},body={3},shape={4}",
@@ -127,274 +100,20 @@ public sealed class BSShapeCollection : IDisposable
 
     public bool GetBodyAndShape(bool forceRebuild, BulletWorld sim, BSPhysObject prim)
     {
-        return GetBodyAndShape(forceRebuild, sim, prim, null, null);
-    }
-
-    // Track another user of a body.
-    // We presume the caller has allocated the body.
-    // Bodies only have one user so the body is just put into the world if not already there.
-    private void ReferenceBody(BulletBody body)
-    {
-        lock (m_collectionActivityLock)
-        {
-            if (DDetail) DetailLog("{0},BSShapeCollection.ReferenceBody,newBody,body={1}", body.ID, body);
-            if (!PhysicsScene.PE.IsInWorld(PhysicsScene.World, body))
-            {
-                PhysicsScene.PE.AddObjectToWorld(PhysicsScene.World, body);
-                if (DDetail) DetailLog("{0},BSShapeCollection.ReferenceBody,addedToWorld,ref={1}", body.ID, body);
-            }
-        }
-    }
-
-    // Release the usage of a body.
-    // Called when releasing use of a BSBody. BSShape is handled separately.
-    // Called in taint time.
-    public void DereferenceBody(BulletBody body, BodyDestructionCallback bodyCallback )
-    {
-        if (!body.HasPhysicalBody)
-            return;
-
-        PhysicsScene.AssertInTaintTime("BSShapeCollection.DereferenceBody");
-
-        lock (m_collectionActivityLock)
-        {
-            if (DDetail) DetailLog("{0},BSShapeCollection.DereferenceBody,DestroyingBody,body={1}", body.ID, body);
-            // If the caller needs to know the old body is going away, pass the event up.
-            if (bodyCallback != null) bodyCallback(body);
-
-            if (PhysicsScene.PE.IsInWorld(PhysicsScene.World, body))
-            {
-                PhysicsScene.PE.RemoveObjectFromWorld(PhysicsScene.World, body);
-                if (DDetail) DetailLog("{0},BSShapeCollection.DereferenceBody,removingFromWorld. Body={1}", body.ID, body);
-            }
-
-            // Zero any reference to the shape so it is not freed when the body is deleted.
-            PhysicsScene.PE.SetCollisionShape(PhysicsScene.World, body, null);
-            PhysicsScene.PE.DestroyObject(PhysicsScene.World, body);
-        }
-    }
-
-    // Track the datastructures and use count for a shape.
-    // When creating a hull, this is called first to reference the mesh
-    //     and then again to reference the hull.
-    // Meshes and hulls for the same shape have the same hash key.
-    // NOTE that native shapes are not added to the mesh list or removed.
-    // Returns 'true' if this is the initial reference to the shape. Otherwise reused.
-    public bool ReferenceShape(BulletShape shape)
-    {
-        bool ret = false;
-        switch (shape.type)
-        {
-            case BSPhysicsShapeType.SHAPE_MESH:
-                MeshDesc meshDesc;
-                if (Meshes.TryGetValue(shape.shapeKey, out meshDesc))
-                {
-                    // There is an existing instance of this mesh.
-                    meshDesc.referenceCount++;
-                    if (DDetail) DetailLog("{0},BSShapeCollection.ReferenceShape,existingMesh,key={1},cnt={2}",
-                                BSScene.DetailLogZero, shape.shapeKey.ToString("X"), meshDesc.referenceCount);
-                }
-                else
-                {
-                    // This is a new reference to a mesh
-                    meshDesc.shape = shape.Clone();
-                    meshDesc.shapeKey = shape.shapeKey;
-                    // We keep a reference to the underlying IMesh data so a hull can be built
-                    meshDesc.referenceCount = 1;
-                    if (DDetail) DetailLog("{0},BSShapeCollection.ReferenceShape,newMesh,key={1},cnt={2}",
-                                BSScene.DetailLogZero, shape.shapeKey.ToString("X"), meshDesc.referenceCount);
-                    ret = true;
-                }
-                meshDesc.lastReferenced = System.DateTime.Now;
-                Meshes[shape.shapeKey] = meshDesc;
-                break;
-            case BSPhysicsShapeType.SHAPE_HULL:
-                HullDesc hullDesc;
-                if (Hulls.TryGetValue(shape.shapeKey, out hullDesc))
-                {
-                    // There is an existing instance of this hull.
-                    hullDesc.referenceCount++;
-                    if (DDetail) DetailLog("{0},BSShapeCollection.ReferenceShape,existingHull,key={1},cnt={2}",
-                                BSScene.DetailLogZero, shape.shapeKey.ToString("X"), hullDesc.referenceCount);
-                }
-                else
-                {
-                    // This is a new reference to a hull
-                    hullDesc.shape = shape.Clone();
-                    hullDesc.shapeKey = shape.shapeKey;
-                    hullDesc.referenceCount = 1;
-                    if (DDetail) DetailLog("{0},BSShapeCollection.ReferenceShape,newHull,key={1},cnt={2}",
-                                BSScene.DetailLogZero, shape.shapeKey.ToString("X"), hullDesc.referenceCount);
-                    ret = true;
-
-                }
-                hullDesc.lastReferenced = System.DateTime.Now;
-                Hulls[shape.shapeKey] = hullDesc;
-                break;
-            case BSPhysicsShapeType.SHAPE_UNKNOWN:
-                break;
-            default:
-                // Native shapes are not tracked and they don't go into any list
-                break;
-        }
-        return ret;
+        return GetBodyAndShape(forceRebuild, sim, prim, null);
     }
 
-    // Release the usage of a shape.
-    public void DereferenceShape(BulletShape shape, ShapeDestructionCallback shapeCallback)
+    // If the existing prim's shape is to be replaced, remove the tie to the existing shape
+    //     before replacing it.
+    private void DereferenceExistingShape(BSPhysObject prim, PhysicalDestructionCallback shapeCallback)
     {
-        if (!shape.HasPhysicalShape)
-            return;
-
-        PhysicsScene.AssertInTaintTime("BSShapeCollection.DereferenceShape");
-
-        if (shape.HasPhysicalShape)
-        {
-            if (shape.isNativeShape)
-            {
-                // Native shapes are not tracked and are released immediately
-                if (DDetail) DetailLog("{0},BSShapeCollection.DereferenceShape,deleteNativeShape,ptr={1}",
-                                    BSScene.DetailLogZero, shape.AddrString);
-                if (shapeCallback != null) shapeCallback(shape);
-                PhysicsScene.PE.DeleteCollisionShape(PhysicsScene.World, shape);
-            }
-            else
-            {
-                switch (shape.type)
-                {
-                    case BSPhysicsShapeType.SHAPE_HULL:
-                        DereferenceHull(shape, shapeCallback);
-                        break;
-                    case BSPhysicsShapeType.SHAPE_MESH:
-                        DereferenceMesh(shape, shapeCallback);
-                        break;
-                    case BSPhysicsShapeType.SHAPE_COMPOUND:
-                        DereferenceCompound(shape, shapeCallback);
-                        break;
-                    case BSPhysicsShapeType.SHAPE_UNKNOWN:
-                        break;
-                    default:
-                        break;
-                }
-            }
-        }
-    }
-
-    // Count down the reference count for a mesh shape
-    // Called at taint-time.
-    private void DereferenceMesh(BulletShape shape, ShapeDestructionCallback shapeCallback)
-    {
-        MeshDesc meshDesc;
-        if (Meshes.TryGetValue(shape.shapeKey, out meshDesc))
+        if (prim.PhysShape.HasPhysicalShape)
         {
-            meshDesc.referenceCount--;
-            // TODO: release the Bullet storage
-            if (shapeCallback != null) shapeCallback(shape);
-            meshDesc.lastReferenced = System.DateTime.Now;
-            Meshes[shape.shapeKey] = meshDesc;
-            if (DDetail) DetailLog("{0},BSShapeCollection.DereferenceMesh,shape={1},refCnt={2}",
-                                BSScene.DetailLogZero, shape, meshDesc.referenceCount);
-
-        }
-    }
-
-    // Count down the reference count for a hull shape
-    // Called at taint-time.
-    private void DereferenceHull(BulletShape shape, ShapeDestructionCallback shapeCallback)
-    {
-        HullDesc hullDesc;
-        if (Hulls.TryGetValue(shape.shapeKey, out hullDesc))
-        {
-            hullDesc.referenceCount--;
-            // TODO: release the Bullet storage (aging old entries?)
-
-            // Tell upper layers that, if they have dependencies on this shape, this link is going away
-            if (shapeCallback != null) shapeCallback(shape);
-
-            hullDesc.lastReferenced = System.DateTime.Now;
-            Hulls[shape.shapeKey] = hullDesc;
-            if (DDetail) DetailLog("{0},BSShapeCollection.DereferenceHull,shape={1},refCnt={2}",
-                    BSScene.DetailLogZero, shape, hullDesc.referenceCount);
-        }
-    }
-
-    // Remove a reference to a compound shape.
-    // Taking a compound shape apart is a little tricky because if you just delete the
-    //      physical shape, it will free all the underlying children. We can't do that because
-    //      they could be shared. So, this removes each of the children from the compound and
-    //      dereferences them separately before destroying the compound collision object itself.
-    // Called at taint-time.
-    private void DereferenceCompound(BulletShape shape, ShapeDestructionCallback shapeCallback)
-    {
-        if (!PhysicsScene.PE.IsCompound(shape))
-        {
-            // Failed the sanity check!!
-            PhysicsScene.Logger.ErrorFormat("{0} Attempt to free a compound shape that is not compound!! type={1}, ptr={2}",
-                                        LogHeader, shape.type, shape.AddrString);
-            if (DDetail) DetailLog("{0},BSShapeCollection.DereferenceCompound,notACompoundShape,type={1},ptr={2}",
-                                        BSScene.DetailLogZero, shape.type, shape.AddrString);
-            return;
-        }
-
-        int numChildren = PhysicsScene.PE.GetNumberOfCompoundChildren(shape);
-        if (DDetail) DetailLog("{0},BSShapeCollection.DereferenceCompound,shape={1},children={2}", BSScene.DetailLogZero, shape, numChildren);
-
-        for (int ii = numChildren - 1; ii >= 0; ii--)
-        {
-            BulletShape childShape = PhysicsScene.PE.RemoveChildShapeFromCompoundShapeIndex(shape, ii);
-            DereferenceAnonCollisionShape(childShape);
-        }
-        PhysicsScene.PE.DeleteCollisionShape(PhysicsScene.World, shape);
-    }
-
-    // Sometimes we have a pointer to a collision shape but don't know what type it is.
-    // Figure out type and call the correct dereference routine.
-    // Called at taint-time.
-    private void DereferenceAnonCollisionShape(BulletShape shapeInfo)
-    {
-        MeshDesc meshDesc;
-        HullDesc hullDesc;
-
-        if (TryGetMeshByPtr(shapeInfo, out meshDesc))
-        {
-            shapeInfo.type = BSPhysicsShapeType.SHAPE_MESH;
-            shapeInfo.shapeKey = meshDesc.shapeKey;
-        }
-        else
-        {
-            if (TryGetHullByPtr(shapeInfo, out hullDesc))
-            {
-                shapeInfo.type = BSPhysicsShapeType.SHAPE_HULL;
-                shapeInfo.shapeKey = hullDesc.shapeKey;
-            }
-            else
-            {
-                if (PhysicsScene.PE.IsCompound(shapeInfo))
-                {
-                    shapeInfo.type = BSPhysicsShapeType.SHAPE_COMPOUND;
-                }
-                else
-                {
-                    if (PhysicsScene.PE.IsNativeShape(shapeInfo))
-                    {
-                        shapeInfo.isNativeShape = true;
-                        shapeInfo.type = BSPhysicsShapeType.SHAPE_BOX; // (technically, type doesn't matter)
-                    }
-                }
-            }
-        }
-
-        if (DDetail) DetailLog("{0},BSShapeCollection.DereferenceAnonCollisionShape,shape={1}", BSScene.DetailLogZero, shapeInfo);
-
-        if (shapeInfo.type != BSPhysicsShapeType.SHAPE_UNKNOWN)
-        {
-            DereferenceShape(shapeInfo, null);
-        }
-        else
-        {
-            PhysicsScene.Logger.ErrorFormat("{0} Could not decypher shape type. Region={1}, addr={2}",
-                                    LogHeader, PhysicsScene.RegionName, shapeInfo.AddrString);
+            if (shapeCallback != null)
+                shapeCallback(prim.PhysBody, prim.PhysShape.physShapeInfo);
+            prim.PhysShape.Dereference(m_physicsScene);
         }
+        prim.PhysShape = new BSShapeNull();
     }
 
     // Create the geometry information in Bullet for later use.
@@ -405,60 +124,41 @@ public sealed class BSShapeCollection : IDisposable
     // Info in prim.BSShape is updated to the new shape.
     // Returns 'true' if the geometry was rebuilt.
     // Called at taint-time!
-    private bool CreateGeom(bool forceRebuild, BSPhysObject prim, ShapeDestructionCallback shapeCallback)
+    private bool CreateGeom(bool forceRebuild, BSPhysObject prim, PhysicalDestructionCallback shapeCallback)
     {
         bool ret = false;
         bool haveShape = false;
+        bool nativeShapePossible = true;
+        PrimitiveBaseShape pbs = prim.BaseShape;
 
-        if (!haveShape && prim.PreferredPhysicalShape == BSPhysicsShapeType.SHAPE_CAPSULE)
+        // Kludge to create the capsule for the avatar.
+        // TDOD: Remove/redo this when BSShapeAvatar is working!!
+        BSCharacter theChar = prim as BSCharacter;
+        if (theChar != null)
         {
-            // an avatar capsule is close to a native shape (it is not shared)
-            GetReferenceToNativeShape(prim, BSPhysicsShapeType.SHAPE_CAPSULE, FixedShapeKey.KEY_CAPSULE, shapeCallback);
-            if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,avatarCapsule,shape={1}", prim.LocalID, prim.PhysShape);
+            DereferenceExistingShape(prim, shapeCallback);
+            prim.PhysShape = BSShapeNative.GetReference(m_physicsScene, prim,
+                                            BSPhysicsShapeType.SHAPE_CAPSULE, FixedShapeKey.KEY_CAPSULE);
             ret = true;
             haveShape = true;
         }
 
-        // Compound shapes are handled special as they are rebuilt from scratch.
-        // This isn't too great a hardship since most of the child shapes will have already been created.
-        if (!haveShape && prim.PreferredPhysicalShape == BSPhysicsShapeType.SHAPE_COMPOUND)
-        {
-            ret = GetReferenceToCompoundShape(prim, shapeCallback);
-            if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,compoundShape,shape={1}", prim.LocalID, prim.PhysShape);
-            haveShape = true;
-        }
-
-        if (!haveShape)
-        {
-            ret = CreateGeomNonSpecial(forceRebuild, prim, shapeCallback);
-        }
-
-        return ret;
-    }
-
-    // Create a mesh, hull or native shape.
-    // Return 'true' if the prim's shape was changed.
-    public bool CreateGeomNonSpecial(bool forceRebuild, BSPhysObject prim, ShapeDestructionCallback shapeCallback)
-    {
-        bool ret = false;
-        bool haveShape = false;
-        bool nativeShapePossible = true;
-        PrimitiveBaseShape pbs = prim.BaseShape;
-
         // If the prim attributes are simple, this could be a simple Bullet native shape
+        // Native shapes work whether to object is static or physical.
         if (!haveShape
                 && nativeShapePossible
                 && pbs != null
-                && !pbs.SculptEntry
-                && ((pbs.SculptEntry && !BSParam.ShouldMeshSculptedPrim) || PrimHasNoCuts(pbs)) )
+                && PrimHasNoCuts(pbs)
+                && ( !pbs.SculptEntry || (pbs.SculptEntry && !BSParam.ShouldMeshSculptedPrim) )
+            )
         {
             // Get the scale of any existing shape so we can see if the new shape is same native type and same size.
             OMV.Vector3 scaleOfExistingShape = OMV.Vector3.Zero;
             if (prim.PhysShape.HasPhysicalShape)
-                scaleOfExistingShape = PhysicsScene.PE.GetLocalScaling(prim.PhysShape);
+                scaleOfExistingShape = m_physicsScene.PE.GetLocalScaling(prim.PhysShape.physShapeInfo);
 
             if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,maybeNative,force={1},primScale={2},primSize={3},primShape={4}",
-                        prim.LocalID, forceRebuild, prim.Scale, prim.Size, prim.PhysShape.type);
+                        prim.LocalID, forceRebuild, prim.Scale, prim.Size, prim.PhysShape.physShapeInfo.shapeType);
 
             // It doesn't look like Bullet scales native spheres so make sure the scales are all equal
             if ((pbs.ProfileShape == ProfileShape.HalfCircle && pbs.PathCurve == (byte)Extrusion.Curve1)
@@ -466,26 +166,30 @@ public sealed class BSShapeCollection : IDisposable
             {
                 haveShape = true;
                 if (forceRebuild
-                        || prim.Scale != scaleOfExistingShape
-                        || prim.PhysShape.type != BSPhysicsShapeType.SHAPE_SPHERE
-                        )
+                        || prim.PhysShape.ShapeType != BSPhysicsShapeType.SHAPE_SPHERE
+                    )
                 {
-                    ret = GetReferenceToNativeShape(prim, BSPhysicsShapeType.SHAPE_SPHERE,
-                                            FixedShapeKey.KEY_SPHERE, shapeCallback);
+                    DereferenceExistingShape(prim, shapeCallback);
+                    prim.PhysShape = BSShapeNative.GetReference(m_physicsScene, prim,
+                                            BSPhysicsShapeType.SHAPE_SPHERE, FixedShapeKey.KEY_SPHERE);
+                    ret = true;
                 }
                 if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,sphere,force={1},rebuilt={2},shape={3}",
                                         prim.LocalID, forceRebuild, ret, prim.PhysShape);
             }
+            // If we didn't make a sphere, maybe a box will work.
             if (!haveShape && pbs.ProfileShape == ProfileShape.Square && pbs.PathCurve == (byte)Extrusion.Straight)
             {
                 haveShape = true;
                 if (forceRebuild
                         || prim.Scale != scaleOfExistingShape
-                        || prim.PhysShape.type != BSPhysicsShapeType.SHAPE_BOX
+                        || prim.PhysShape.ShapeType != BSPhysicsShapeType.SHAPE_BOX
                         )
                 {
-                    ret = GetReferenceToNativeShape( prim, BSPhysicsShapeType.SHAPE_BOX,
-                                            FixedShapeKey.KEY_BOX, shapeCallback);
+                    DereferenceExistingShape(prim, shapeCallback);
+                    prim.PhysShape = BSShapeNative.GetReference(m_physicsScene, prim,
+                                            BSPhysicsShapeType.SHAPE_BOX, FixedShapeKey.KEY_BOX);
+                    ret = true;
                 }
                 if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,box,force={1},rebuilt={2},shape={3}",
                                         prim.LocalID, forceRebuild, ret, prim.PhysShape);
@@ -502,7 +206,7 @@ public sealed class BSShapeCollection : IDisposable
     }
 
     // return 'true' if this shape description does not include any cutting or twisting.
-    private bool PrimHasNoCuts(PrimitiveBaseShape pbs)
+    public static bool PrimHasNoCuts(PrimitiveBaseShape pbs)
     {
         return pbs.ProfileBegin == 0 && pbs.ProfileEnd == 0
             && pbs.ProfileHollow == 0
@@ -514,7 +218,7 @@ public sealed class BSShapeCollection : IDisposable
     }
 
     // return 'true' if the prim's shape was changed.
-    public bool CreateGeomMeshOrHull(BSPhysObject prim, ShapeDestructionCallback shapeCallback)
+    private bool CreateGeomMeshOrHull(BSPhysObject prim, PhysicalDestructionCallback shapeCallback)
     {
 
         bool ret = false;
@@ -522,503 +226,121 @@ public sealed class BSShapeCollection : IDisposable
         //     made. Native shapes work in either case.
         if (prim.IsPhysical && BSParam.ShouldUseHullsForPhysicalObjects)
         {
-            // Update prim.BSShape to reference a hull of this shape.
-            ret = GetReferenceToHull(prim, shapeCallback);
-            if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,hull,shape={1},key={2}",
-                                    prim.LocalID, prim.PhysShape, prim.PhysShape.shapeKey.ToString("X"));
-        }
-        else
-        {
-            ret = GetReferenceToMesh(prim, shapeCallback);
-            if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,mesh,shape={1},key={2}",
-                                    prim.LocalID, prim.PhysShape, prim.PhysShape.shapeKey.ToString("X"));
-        }
-        return ret;
-    }
-
-    // Creates a native shape and assignes it to prim.BSShape.
-    // "Native" shapes are never shared. they are created here and destroyed in DereferenceShape().
-    private bool GetReferenceToNativeShape(BSPhysObject prim,
-                            BSPhysicsShapeType shapeType, FixedShapeKey shapeKey,
-                            ShapeDestructionCallback shapeCallback)
-    {
-        // release any previous shape
-        DereferenceShape(prim.PhysShape, shapeCallback);
-
-        BulletShape newShape = BuildPhysicalNativeShape(prim, shapeType, shapeKey);
-
-        // Don't need to do a 'ReferenceShape()' here because native shapes are not shared.
-        if (DDetail) DetailLog("{0},BSShapeCollection.AddNativeShapeToPrim,create,newshape={1},scale={2}",
-                                prim.LocalID, newShape, prim.Scale);
-
-        // native shapes are scaled by Bullet
-        prim.PhysShape = newShape;
-        return true;
-    }
-
-    private BulletShape BuildPhysicalNativeShape(BSPhysObject prim, BSPhysicsShapeType shapeType,
-                                    FixedShapeKey shapeKey)
-    {
-        BulletShape newShape;
-        // Need to make sure the passed shape information is for the native type.
-        ShapeData nativeShapeData = new ShapeData();
-        nativeShapeData.Type = shapeType;
-        nativeShapeData.ID = prim.LocalID;
-        nativeShapeData.Scale = prim.Scale;
-        nativeShapeData.Size = prim.Scale;  // unneeded, I think.
-        nativeShapeData.MeshKey = (ulong)shapeKey;
-        nativeShapeData.HullKey = (ulong)shapeKey;
-
-        if (shapeType == BSPhysicsShapeType.SHAPE_CAPSULE)
-        {
+            // Use a simple, single mesh convex hull shape if the object is simple enough
+            BSShape potentialHull = null;
 
-            newShape = PhysicsScene.PE.BuildCapsuleShape(PhysicsScene.World, 1f, 1f, prim.Scale);
-            if (DDetail) DetailLog("{0},BSShapeCollection.BuildPhysicalNativeShape,capsule,scale={1}", prim.LocalID, prim.Scale);
-        }
-        else
-        {
-            // Native shapes are scaled in Bullet so set the scaling to the size
-            newShape = PhysicsScene.PE.BuildNativeShape(PhysicsScene.World, nativeShapeData);
-
-        }
-        if (!newShape.HasPhysicalShape)
-        {
-            PhysicsScene.Logger.ErrorFormat("{0} BuildPhysicalNativeShape failed. ID={1}, shape={2}",
-                                    LogHeader, prim.LocalID, shapeType);
-        }
-        newShape.shapeKey = (System.UInt64)shapeKey;
-        newShape.isNativeShape = true;
-
-        return newShape;
-    }
-
-    // Builds a mesh shape in the physical world and updates prim.BSShape.
-    // Dereferences previous shape in BSShape and adds a reference for this new shape.
-    // Returns 'true' of a mesh was actually built. Otherwise .
-    // Called at taint-time!
-    private bool GetReferenceToMesh(BSPhysObject prim, ShapeDestructionCallback shapeCallback)
-    {
-        BulletShape newShape = new BulletShape();
-
-        float lod;
-        System.UInt64 newMeshKey = ComputeShapeKey(prim.Size, prim.BaseShape, out lod);
-
-        // if this new shape is the same as last time, don't recreate the mesh
-        if (newMeshKey == prim.PhysShape.shapeKey && prim.PhysShape.type == BSPhysicsShapeType.SHAPE_MESH)
-            return false;
-
-        if (DDetail) DetailLog("{0},BSShapeCollection.GetReferenceToMesh,create,oldKey={1},newKey={2},size={3},lod={4}",
-                                prim.LocalID, prim.PhysShape.shapeKey.ToString("X"), newMeshKey.ToString("X"), prim.Size, lod);
-
-        // Since we're recreating new, get rid of the reference to the previous shape
-        DereferenceShape(prim.PhysShape, shapeCallback);
-
-        newShape = CreatePhysicalMesh(prim, newMeshKey, prim.BaseShape, prim.Size, lod);
-        // Take evasive action if the mesh was not constructed.
-        newShape = VerifyMeshCreated(newShape, prim);
-
-        ReferenceShape(newShape);
-
-        prim.PhysShape = newShape;
-
-        return true;        // 'true' means a new shape has been added to this prim
-    }
-
-    private BulletShape CreatePhysicalMesh(BSPhysObject prim, System.UInt64 newMeshKey, PrimitiveBaseShape pbs, OMV.Vector3 size, float lod)
-    {
-        BulletShape newShape = new BulletShape();
+            PrimitiveBaseShape pbs = prim.BaseShape;
+            // Use a simple, one section convex shape for prims that are probably convex (no cuts or twists)
+            if (BSParam.ShouldUseSingleConvexHullForPrims
+                && pbs != null
+                && !pbs.SculptEntry
+                && PrimHasNoCuts(pbs)
+                )
+            {
+                potentialHull = BSShapeConvexHull.GetReference(m_physicsScene, false /* forceRebuild */, prim);
+            }
+            // Use the GImpact shape if it is a prim that has some concaveness
+            if (potentialHull == null
+                && BSParam.ShouldUseGImpactShapeForPrims
+                && pbs != null
+                && !pbs.SculptEntry
+                )
+            {
+                    potentialHull = BSShapeGImpact.GetReference(m_physicsScene, false /* forceRebuild */, prim);
+            }
+            // If not any of the simple cases, just make a hull
+            if (potentialHull == null)
+            {
+                potentialHull = BSShapeHull.GetReference(m_physicsScene, false /*forceRebuild*/, prim);
+            }
 
-        MeshDesc meshDesc;
-        if (Meshes.TryGetValue(newMeshKey, out meshDesc))
-        {
-            // If the mesh has already been built just use it.
-            newShape = meshDesc.shape.Clone();
+            // If the current shape is not what is on the prim at the moment, time to change.
+            if (!prim.PhysShape.HasPhysicalShape
+                        || potentialHull.ShapeType != prim.PhysShape.ShapeType
+                        || potentialHull.physShapeInfo.shapeKey != prim.PhysShape.physShapeInfo.shapeKey)
+            {
+                DereferenceExistingShape(prim, shapeCallback);
+                prim.PhysShape = potentialHull;
+                ret = true;
+            }
+            else
+            {
+                // The current shape on the prim is the correct one. We don't need the potential reference.
+                potentialHull.Dereference(m_physicsScene);
+            }
+            if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,hull,shape={1}", prim.LocalID, prim.PhysShape);
         }
         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   // It's NOT for ODE
-                                        );
-
-            if (meshData != null)
+            // Non-physical objects should be just meshes.
+            BSShape potentialMesh = BSShapeMesh.GetReference(m_physicsScene, false /*forceRebuild*/, prim);
+            // If the current shape is not what is on the prim at the moment, time to change.
+            if (!prim.PhysShape.HasPhysicalShape
+                        || potentialMesh.ShapeType != prim.PhysShape.ShapeType
+                        || potentialMesh.physShapeInfo.shapeKey != prim.PhysShape.physShapeInfo.shapeKey)
             {
-
-                int[] indices = meshData.getIndexListAsInt();
-                int realIndicesIndex = indices.Length;
-                float[] verticesAsFloats = meshData.getVertexListAsFloat();
-
-                if (BSParam.ShouldRemoveZeroWidthTriangles)
-                {
-                    // Remove degenerate triangles. These are triangles with two of the vertices
-                    //    are the same. This is complicated by the problem that vertices are not
-                    //    made unique in sculpties so we have to compare the values in the vertex.
-                    realIndicesIndex = 0;
-                    for (int tri = 0; tri < indices.Length; tri += 3)
-                    {
-                        // Compute displacements into vertex array for each vertex of the triangle
-                        int v1 = indices[tri + 0] * 3;
-                        int v2 = indices[tri + 1] * 3;
-                        int v3 = indices[tri + 2] * 3;
-                        // Check to see if any two of the vertices are the same
-                        if (!( (  verticesAsFloats[v1 + 0] == verticesAsFloats[v2 + 0]
-                               && verticesAsFloats[v1 + 1] == verticesAsFloats[v2 + 1]
-                               && verticesAsFloats[v1 + 2] == verticesAsFloats[v2 + 2])
-                            || (  verticesAsFloats[v2 + 0] == verticesAsFloats[v3 + 0]
-                               && verticesAsFloats[v2 + 1] == verticesAsFloats[v3 + 1]
-                               && verticesAsFloats[v2 + 2] == verticesAsFloats[v3 + 2])
-                            || (  verticesAsFloats[v1 + 0] == verticesAsFloats[v3 + 0]
-                               && verticesAsFloats[v1 + 1] == verticesAsFloats[v3 + 1]
-                               && verticesAsFloats[v1 + 2] == verticesAsFloats[v3 + 2]) )
-                        )
-                        {
-                            // None of the vertices of the triangles are the same. This is a good triangle;
-                            indices[realIndicesIndex + 0] = indices[tri + 0];
-                            indices[realIndicesIndex + 1] = indices[tri + 1];
-                            indices[realIndicesIndex + 2] = indices[tri + 2];
-                            realIndicesIndex += 3;
-                        }
-                    }
-                }
-                DetailLog("{0},BSShapeCollection.CreatePhysicalMesh,origTri={1},realTri={2},numVerts={3}",
-                            BSScene.DetailLogZero, indices.Length / 3, realIndicesIndex / 3, verticesAsFloats.Length / 3);
-
-                if (realIndicesIndex != 0)
-                {
-                    newShape = PhysicsScene.PE.CreateMeshShape(PhysicsScene.World,
-                                        realIndicesIndex, indices, verticesAsFloats.Length / 3, verticesAsFloats);
-                }
-                else
-                {
-                    PhysicsScene.Logger.DebugFormat("{0} All mesh triangles degenerate. Prim {1} at {2} in {3}",
-                                        LogHeader, prim.PhysObjectName, prim.RawPosition, PhysicsScene.Name);
-                }
+                DereferenceExistingShape(prim, shapeCallback);
+                prim.PhysShape = potentialMesh;
+                ret = true;
             }
+            else
+            {
+                // We don't need this reference to the mesh that is already being using.
+                potentialMesh.Dereference(m_physicsScene);
+            }
+            if (DDetail) DetailLog("{0},BSShapeCollection.CreateGeom,mesh,shape={1}", prim.LocalID, prim.PhysShape);
         }
-        newShape.shapeKey = newMeshKey;
-
-        return newShape;
-    }
-
-    // See that hull shape exists in the physical world and update prim.BSShape.
-    // We could be creating the hull because scale changed or whatever.
-    // Return 'true' if a new hull was built. Otherwise, returning a shared hull instance.
-    private bool GetReferenceToHull(BSPhysObject prim, ShapeDestructionCallback shapeCallback)
-    {
-        BulletShape newShape;
-
-        float lod;
-        System.UInt64 newHullKey = ComputeShapeKey(prim.Size, prim.BaseShape, out lod);
-
-        // if the hull hasn't changed, don't rebuild it
-        if (newHullKey == prim.PhysShape.shapeKey && prim.PhysShape.type == BSPhysicsShapeType.SHAPE_HULL)
-            return false;
-
-        if (DDetail) DetailLog("{0},BSShapeCollection.GetReferenceToHull,create,oldKey={1},newKey={2}",
-                        prim.LocalID, prim.PhysShape.shapeKey.ToString("X"), newHullKey.ToString("X"));
-
-        // Remove usage of the previous shape.
-        DereferenceShape(prim.PhysShape, shapeCallback);
-
-        newShape = CreatePhysicalHull(prim.PhysObjectName, newHullKey, prim.BaseShape, prim.Size, lod);
-        // It might not have been created if we're waiting for an asset.
-        newShape = VerifyMeshCreated(newShape, prim);
-
-        ReferenceShape(newShape);
-
-        prim.PhysShape = newShape;
-        return true;        // 'true' means a new shape has been added to this prim
+        return ret;
     }
 
-    List<ConvexResult> m_hulls;
-    private BulletShape CreatePhysicalHull(string objName, System.UInt64 newHullKey, PrimitiveBaseShape pbs, OMV.Vector3 size, float lod)
+    // Track another user of a body.
+    // We presume the caller has allocated the body.
+    // Bodies only have one user so the body is just put into the world if not already there.
+    private void ReferenceBody(BulletBody body)
     {
-
-        BulletShape newShape = new BulletShape();
-        IntPtr hullPtr = IntPtr.Zero;
-
-        HullDesc hullDesc;
-        if (Hulls.TryGetValue(newHullKey, out hullDesc))
-        {
-            // If the hull shape already has been created, just use the one shared instance.
-            newShape = hullDesc.shape.Clone();
-        }
-        else
+        lock (m_collectionActivityLock)
         {
-            // Build a new hull in the physical world.
-            // Pass true for physicalness as this prevents the creation of bounding box which is not needed
-            IMesh meshData = PhysicsScene.mesher.CreateMesh(objName, pbs, size, lod, true, false, false, false);
-            if (meshData != null)
+            if (DDetail) DetailLog("{0},BSShapeCollection.ReferenceBody,newBody,body={1}", body.ID, body);
+            if (!m_physicsScene.PE.IsInWorld(m_physicsScene.World, body))
             {
-
-                int[] indices = meshData.getIndexListAsInt();
-                List<OMV.Vector3> vertices = meshData.getVertexList();
-
-                //format conversion from IMesh format to DecompDesc format
-                List<int> convIndices = new List<int>();
-                List<float3> convVertices = new List<float3>();
-                for (int ii = 0; ii < indices.GetLength(0); ii++)
-                {
-                    convIndices.Add(indices[ii]);
-                }
-                foreach (OMV.Vector3 vv in vertices)
-                {
-                    convVertices.Add(new float3(vv.X, vv.Y, vv.Z));
-                }
-
-                uint maxDepthSplit = (uint)BSParam.CSHullMaxDepthSplit;
-                if (BSParam.CSHullMaxDepthSplit != BSParam.CSHullMaxDepthSplitForSimpleShapes)
-                {
-                    // Simple primitive shapes we know are convex so they are better implemented with
-                    //    fewer hulls.
-                    // Check for simple shape (prim without cuts) and reduce split parameter if so.
-                    if (PrimHasNoCuts(pbs))
-                    {
-                        maxDepthSplit = (uint)BSParam.CSHullMaxDepthSplitForSimpleShapes;
-                    }
-                }
-
-                // setup and do convex hull conversion
-                m_hulls = new List<ConvexResult>();
-                DecompDesc dcomp = new DecompDesc();
-                dcomp.mIndices = convIndices;
-                dcomp.mVertices = convVertices;
-                dcomp.mDepth = maxDepthSplit;
-                dcomp.mCpercent = BSParam.CSHullConcavityThresholdPercent;
-                dcomp.mPpercent = BSParam.CSHullVolumeConservationThresholdPercent;
-                dcomp.mMaxVertices = (uint)BSParam.CSHullMaxVertices;
-                dcomp.mSkinWidth = BSParam.CSHullMaxSkinWidth;
-                ConvexBuilder convexBuilder = new ConvexBuilder(HullReturn);
-                // create the hull into the _hulls variable
-                convexBuilder.process(dcomp);
-
-                DetailLog("{0},BSShapeCollection.CreatePhysicalHull,key={1},inVert={2},inInd={3},split={4},hulls={5}",
-                                    BSScene.DetailLogZero, newHullKey, indices.GetLength(0), vertices.Count, maxDepthSplit, m_hulls.Count);
-
-                // Convert the vertices and indices for passing to unmanaged.
-                // The hull information is passed as a large floating point array.
-                // The format is:
-                //  convHulls[0] = number of hulls
-                //  convHulls[1] = number of vertices in first hull
-                //  convHulls[2] = hull centroid X coordinate
-                //  convHulls[3] = hull centroid Y coordinate
-                //  convHulls[4] = hull centroid Z coordinate
-                //  convHulls[5] = first hull vertex X
-                //  convHulls[6] = first hull vertex Y
-                //  convHulls[7] = first hull vertex Z
-                //  convHulls[8] = second hull vertex X
-                //  ...
-                //  convHulls[n] = number of vertices in second hull
-                //  convHulls[n+1] = second hull centroid X coordinate
-                //  ...
-                //
-                // TODO: is is very inefficient. Someday change the convex hull generator to return
-                //   data structures that do not need to be converted in order to pass to Bullet.
-                //   And maybe put the values directly into pinned memory rather than marshaling.
-                int hullCount = m_hulls.Count;
-                int totalVertices = 1;          // include one for the count of the hulls
-                foreach (ConvexResult cr in m_hulls)
-                {
-                    totalVertices += 4;                         // add four for the vertex count and centroid
-                    totalVertices += cr.HullIndices.Count * 3;  // we pass just triangles
-                }
-                float[] convHulls = new float[totalVertices];
-
-                convHulls[0] = (float)hullCount;
-                int jj = 1;
-                foreach (ConvexResult cr in m_hulls)
-                {
-                    // copy vertices for index access
-                    float3[] verts = new float3[cr.HullVertices.Count];
-                    int kk = 0;
-                    foreach (float3 ff in cr.HullVertices)
-                    {
-                        verts[kk++] = ff;
-                    }
-
-                    // add to the array one hull's worth of data
-                    convHulls[jj++] = cr.HullIndices.Count;
-                    convHulls[jj++] = 0f;   // centroid x,y,z
-                    convHulls[jj++] = 0f;
-                    convHulls[jj++] = 0f;
-                    foreach (int ind in cr.HullIndices)
-                    {
-                        convHulls[jj++] = verts[ind].x;
-                        convHulls[jj++] = verts[ind].y;
-                        convHulls[jj++] = verts[ind].z;
-                    }
-                }
-                // create the hull data structure in Bullet
-                newShape = PhysicsScene.PE.CreateHullShape(PhysicsScene.World, hullCount, convHulls);
+                m_physicsScene.PE.AddObjectToWorld(m_physicsScene.World, body);
+                if (DDetail) DetailLog("{0},BSShapeCollection.ReferenceBody,addedToWorld,ref={1}", body.ID, body);
             }
         }
-
-        newShape.shapeKey = newHullKey;
-
-        return newShape;
-    }
-
-    // Callback from convex hull creater with a newly created hull.
-    // Just add it to our collection of hulls for this shape.
-    private void HullReturn(ConvexResult result)
-    {
-        m_hulls.Add(result);
-        return;
     }
 
-    // Compound shapes are always built from scratch.
-    // This shouldn't be to bad since most of the parts will be meshes that had been built previously.
-    private bool GetReferenceToCompoundShape(BSPhysObject prim, ShapeDestructionCallback shapeCallback)
-    {
-        // Remove reference to the old shape
-        // Don't need to do this as the shape is freed when the new root shape is created below.
-        // DereferenceShape(prim.PhysShape, true, shapeCallback);
-
-        BulletShape cShape = PhysicsScene.PE.CreateCompoundShape(PhysicsScene.World, false);
-
-        // Create the shape for the root prim and add it to the compound shape. Cannot be a native shape.
-        CreateGeomMeshOrHull(prim, shapeCallback);
-        PhysicsScene.PE.AddChildShapeToCompoundShape(cShape, prim.PhysShape, OMV.Vector3.Zero, OMV.Quaternion.Identity);
-        if (DDetail) DetailLog("{0},BSShapeCollection.GetReferenceToCompoundShape,addRootPrim,compShape={1},rootShape={2}",
-                                    prim.LocalID, cShape, prim.PhysShape);
-
-        prim.PhysShape = cShape;
-
-        return true;
-    }
-
-    // Create a hash of all the shape parameters to be used as a key
-    //    for this particular shape.
-    private System.UInt64 ComputeShapeKey(OMV.Vector3 size, PrimitiveBaseShape pbs, out float retLod)
-    {
-        // level of detail based on size and type of the object
-        float lod = BSParam.MeshLOD;
-
-        // prims with curvy internal cuts need higher lod
-        if (pbs.HollowShape == HollowShape.Circle)
-            lod = BSParam.MeshCircularLOD;
-
-        if (pbs.SculptEntry)
-            lod = BSParam.SculptLOD;
-
-        // Mega prims usually get more detail because one can interact with shape approximations at this size.
-        float maxAxis = Math.Max(size.X, Math.Max(size.Y, size.Z));
-        if (maxAxis > BSParam.MeshMegaPrimThreshold)
-            lod = BSParam.MeshMegaPrimLOD;
-
-        retLod = lod;
-        return pbs.GetMeshKey(size, lod);
-    }
-    // For those who don't want the LOD
-    private System.UInt64 ComputeShapeKey(OMV.Vector3 size, PrimitiveBaseShape pbs)
+    // Release the usage of a body.
+    // Called when releasing use of a BSBody. BSShape is handled separately.
+    // Called in taint time.
+    public void DereferenceBody(BulletBody body, PhysicalDestructionCallback bodyCallback )
     {
-        float lod;
-        return ComputeShapeKey(size, pbs, out lod);
-    }
+        if (!body.HasPhysicalBody)
+            return;
 
-    // The creation of a mesh or hull can fail if an underlying asset is not available.
-    // There are two cases: 1) the asset is not in the cache and it needs to be fetched;
-    //     and 2) the asset cannot be converted (like failed decompression of JPEG2000s).
-    //     The first case causes the asset to be fetched. The second case requires
-    //     us to not loop forever.
-    // Called after creating a physical mesh or hull. If the physical shape was created,
-    //     just return.
-    private BulletShape VerifyMeshCreated(BulletShape newShape, BSPhysObject prim)
-    {
-        // If the shape was successfully created, nothing more to do
-        if (newShape.HasPhysicalShape)
-            return newShape;
+        m_physicsScene.AssertInTaintTime("BSShapeCollection.DereferenceBody");
 
-        // VerifyMeshCreated is called after trying to create the mesh. If we think the asset had been
-        //    fetched but we end up here again, the meshing of the asset must have failed.
-        // Prevent trying to keep fetching the mesh by declaring failure.
-        if (prim.PrimAssetState == BSPhysObject.PrimAssetCondition.Fetched)
-        {
-            prim.PrimAssetState = BSPhysObject.PrimAssetCondition.Failed;
-            PhysicsScene.Logger.WarnFormat("{0} Fetched asset would not mesh. {1}, texture={2}",
-                                            LogHeader, prim.PhysObjectName, prim.BaseShape.SculptTexture);
-        }
-        else
+        lock (m_collectionActivityLock)
         {
-            // If this mesh has an underlying asset and we have not failed getting it before, fetch the asset
-            if (prim.BaseShape.SculptEntry 
-                && prim.PrimAssetState != BSPhysObject.PrimAssetCondition.Failed
-                && prim.PrimAssetState != BSPhysObject.PrimAssetCondition.Waiting
-                && prim.BaseShape.SculptTexture != OMV.UUID.Zero
-                )
-            {
-                DetailLog("{0},BSShapeCollection.VerifyMeshCreated,fetchAsset", prim.LocalID);
-                // Multiple requestors will know we're waiting for this asset
-                prim.PrimAssetState = BSPhysObject.PrimAssetCondition.Waiting;
-
-                BSPhysObject xprim = prim;
-                Util.FireAndForget(delegate
-                    {
-                        RequestAssetDelegate assetProvider = PhysicsScene.RequestAssetMethod;
-                        if (assetProvider != null)
-                        {
-                            BSPhysObject yprim = xprim; // probably not necessary, but, just in case.
-                            assetProvider(yprim.BaseShape.SculptTexture, delegate(AssetBase asset)
-                            {
-                                bool assetFound = false;
-                                string mismatchIDs = String.Empty;  // DEBUG DEBUG
-                                if (asset != null && yprim.BaseShape.SculptEntry)
-                                {
-                                    if (yprim.BaseShape.SculptTexture.ToString() == asset.ID)
-                                    {
-                                        yprim.BaseShape.SculptData = asset.Data;
-                                        // This will cause the prim to see that the filler shape is not the right
-                                        //    one and try again to build the object.
-                                        // No race condition with the normal shape setting since the rebuild is at taint time.
-                                        yprim.ForceBodyShapeRebuild(false /* inTaintTime */);
-                                        assetFound = true;
-                                    }
-                                    else
-                                    {
-                                        mismatchIDs = yprim.BaseShape.SculptTexture.ToString() + "/" + asset.ID;
-                                    }
-                                }
-                                if (assetFound)
-                                    yprim.PrimAssetState = BSPhysObject.PrimAssetCondition.Fetched;
-                                else
-                                    yprim.PrimAssetState = BSPhysObject.PrimAssetCondition.Failed;
-                                DetailLog("{0},BSShapeCollection,fetchAssetCallback,found={1},isSculpt={2},ids={3}",
-                                            yprim.LocalID, assetFound, yprim.BaseShape.SculptEntry, mismatchIDs );
+            if (DDetail) DetailLog("{0},BSShapeCollection.DereferenceBody,DestroyingBody,body={1}", body.ID, body);
+            // If the caller needs to know the old body is going away, pass the event up.
+            if (bodyCallback != null)
+                bodyCallback(body, null);
 
-                            });
-                        }
-                        else
-                        {
-                            xprim.PrimAssetState = BSPhysObject.PrimAssetCondition.Failed;
-                            PhysicsScene.Logger.ErrorFormat("{0} Physical object requires asset but no asset provider. Name={1}",
-                                                        LogHeader, PhysicsScene.Name);
-                        }
-                    });
-            }
-            else
-            {
-                if (prim.PrimAssetState == BSPhysObject.PrimAssetCondition.Failed)
-                {
-                    PhysicsScene.Logger.WarnFormat("{0} Mesh failed to fetch asset. obj={1}, texture={2}",
-                                                LogHeader, prim.PhysObjectName, prim.BaseShape.SculptTexture);
-                }
-            }
-        }
+            // Removing an object not in the world is a NOOP
+            m_physicsScene.PE.RemoveObjectFromWorld(m_physicsScene.World, body);
 
-        // While we wait for the mesh defining asset to be loaded, stick in a simple box for the object.
-        BulletShape fillinShape = BuildPhysicalNativeShape(prim, BSPhysicsShapeType.SHAPE_BOX, FixedShapeKey.KEY_BOX);
-        DetailLog("{0},BSShapeCollection.VerifyMeshCreated,boxTempShape", prim.LocalID);
+            // Zero any reference to the shape so it is not freed when the body is deleted.
+            m_physicsScene.PE.SetCollisionShape(m_physicsScene.World, body, null);
 
-        return fillinShape;
+            m_physicsScene.PE.DestroyObject(m_physicsScene.World, body);
+        }
     }
 
     // Create a body object in Bullet.
     // Updates prim.BSBody with the information about the new body if one is created.
     // Returns 'true' if an object was actually created.
     // Called at taint-time.
-    private bool CreateBody(bool forceRebuild, BSPhysObject prim, BulletWorld sim, BodyDestructionCallback bodyCallback)
+    private bool CreateBody(bool forceRebuild, BSPhysObject prim, BulletWorld sim, PhysicalDestructionCallback bodyCallback)
     {
         bool ret = false;
 
@@ -1029,7 +351,7 @@ public sealed class BSShapeCollection : IDisposable
         // If not a solid object, body is a GhostObject. Otherwise a RigidBody.
         if (!mustRebuild)
         {
-            CollisionObjectTypes bodyType = (CollisionObjectTypes)PhysicsScene.PE.GetBodyType(prim.PhysBody);
+            CollisionObjectTypes bodyType = (CollisionObjectTypes)m_physicsScene.PE.GetBodyType(prim.PhysBody);
             if (prim.IsSolid && bodyType != CollisionObjectTypes.CO_RIGID_BODY
                 || !prim.IsSolid && bodyType != CollisionObjectTypes.CO_GHOST_OBJECT)
             {
@@ -1047,12 +369,12 @@ public sealed class BSShapeCollection : IDisposable
             BulletBody aBody;
             if (prim.IsSolid)
             {
-                aBody = PhysicsScene.PE.CreateBodyFromShape(sim, prim.PhysShape, prim.LocalID, prim.RawPosition, prim.RawOrientation);
-                if (DDetail) DetailLog("{0},BSShapeCollection.CreateBody,mesh,body={1}", prim.LocalID, aBody);
+                aBody = m_physicsScene.PE.CreateBodyFromShape(sim, prim.PhysShape.physShapeInfo, prim.LocalID, prim.RawPosition, prim.RawOrientation);
+                if (DDetail) DetailLog("{0},BSShapeCollection.CreateBody,rigid,body={1}", prim.LocalID, aBody);
             }
             else
             {
-                aBody = PhysicsScene.PE.CreateGhostFromShape(sim, prim.PhysShape, prim.LocalID, prim.RawPosition, prim.RawOrientation);
+                aBody = m_physicsScene.PE.CreateGhostFromShape(sim, prim.PhysShape.physShapeInfo, prim.LocalID, prim.RawPosition, prim.RawOrientation);
                 if (DDetail) DetailLog("{0},BSShapeCollection.CreateBody,ghost,body={1}", prim.LocalID, aBody);
             }
 
@@ -1066,46 +388,10 @@ public sealed class BSShapeCollection : IDisposable
         return ret;
     }
 
-    private bool TryGetMeshByPtr(BulletShape shape, out MeshDesc outDesc)
-    {
-        bool ret = false;
-        MeshDesc foundDesc = new MeshDesc();
-        foreach (MeshDesc md in Meshes.Values)
-        {
-            if (md.shape.ReferenceSame(shape))
-            {
-                foundDesc = md;
-                ret = true;
-                break;
-            }
-
-        }
-        outDesc = foundDesc;
-        return ret;
-    }
-
-    private bool TryGetHullByPtr(BulletShape shape, out HullDesc outDesc)
-    {
-        bool ret = false;
-        HullDesc foundDesc = new HullDesc();
-        foreach (HullDesc hd in Hulls.Values)
-        {
-            if (hd.shape.ReferenceSame(shape))
-            {
-                foundDesc = hd;
-                ret = true;
-                break;
-            }
-
-        }
-        outDesc = foundDesc;
-        return ret;
-    }
-
     private void DetailLog(string msg, params Object[] args)
     {
-        if (PhysicsScene.PhysicsLogging.Enabled)
-            PhysicsScene.DetailLog(msg, args);
+        if (m_physicsScene.PhysicsLogging.Enabled)
+            m_physicsScene.DetailLog(msg, args);
     }
 }
 }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
index ee18379..5a0a14c 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
@@ -29,115 +29,312 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
+using OpenSim.Framework;
+using OpenSim.Region.Physics.Manager;
+using OpenSim.Region.Physics.Meshing;
+using OpenSim.Region.Physics.ConvexDecompositionDotNet;
+
 using OMV = OpenMetaverse;
 
 namespace OpenSim.Region.Physics.BulletSPlugin
 {
 public abstract class BSShape
 {
+    private static string LogHeader = "[BULLETSIM SHAPE]";
+
     public int referenceCount { get; set; }
     public DateTime lastReferenced { get; set; }
+    public BulletShape physShapeInfo { get; set; }
 
     public BSShape()
     {
-        referenceCount = 0;
+        referenceCount = 1;
         lastReferenced = DateTime.Now;
+        physShapeInfo = new BulletShape();
     }
-
-    // Get a reference to a physical shape. Create if it doesn't exist
-    public static BSShape GetShapeReference(BSScene physicsScene, bool forceRebuild, BSPhysObject prim)
+    public BSShape(BulletShape pShape)
     {
-        BSShape ret = null;
-
-        if (prim.PreferredPhysicalShape == BSPhysicsShapeType.SHAPE_CAPSULE)
-        {
-            // an avatar capsule is close to a native shape (it is not shared)
-            ret = BSShapeNative.GetReference(physicsScene, prim, BSPhysicsShapeType.SHAPE_CAPSULE,
-                                        FixedShapeKey.KEY_CAPSULE);
-            physicsScene.DetailLog("{0},BSShape.GetShapeReference,avatarCapsule,shape={1}", prim.LocalID, ret);
-        }
-
-        // Compound shapes are handled special as they are rebuilt from scratch.
-        // This isn't too great a hardship since most of the child shapes will have already been created.
-        if (ret == null  && prim.PreferredPhysicalShape == BSPhysicsShapeType.SHAPE_COMPOUND)
-        {
-            // Getting a reference to a compound shape gets you the compound shape with the root prim shape added
-            ret = BSShapeCompound.GetReference(prim);
-            physicsScene.DetailLog("{0},BSShapeCollection.CreateGeom,compoundShape,shape={1}", prim.LocalID, ret);
-        }
-
-        // Avatars have their own unique shape
-        if (ret == null  && prim.PreferredPhysicalShape == BSPhysicsShapeType.SHAPE_AVATAR)
-        {
-            // Getting a reference to a compound shape gets you the compound shape with the root prim shape added
-            ret = BSShapeAvatar.GetReference(prim);
-            physicsScene.DetailLog("{0},BSShapeCollection.CreateGeom,avatarShape,shape={1}", prim.LocalID, ret);
-        }
+        referenceCount = 1;
+        lastReferenced = DateTime.Now;
+        physShapeInfo = pShape;
+    }
 
-        if (ret == null)
-            ret = GetShapeReferenceNonSpecial(physicsScene, forceRebuild, prim);
+    // Get another reference to this shape.
+    public abstract BSShape GetReference(BSScene pPhysicsScene, BSPhysObject pPrim);
 
-        return ret;
-    }
-    public static BSShape GetShapeReferenceNonSpecial(BSScene physicsScene, bool forceRebuild, BSPhysObject prim)
+    // Called when this shape is being used again.
+    // Used internally. External callers should call instance.GetReference() to properly copy/reference
+    //       the shape.
+    protected virtual void IncrementReference()
     {
-        return null;
+        referenceCount++;
+        lastReferenced = DateTime.Now;
     }
-    public static BSShape GetShapeReferenceNonNative(BSScene physicsScene, bool forceRebuild, BSPhysObject prim)
+
+    // Called when this shape is being used again.
+    protected virtual void DecrementReference()
     {
-        return null;
+        referenceCount--;
+        lastReferenced = DateTime.Now;
     }
 
     // Release the use of a physical shape.
     public abstract void Dereference(BSScene physicsScene);
 
-    // All shapes have a static call to get a reference to the physical shape
-    // protected abstract static BSShape GetReference();
+    // Return 'true' if there is an allocated physics physical shape under this class instance.
+    public virtual bool HasPhysicalShape
+    {
+        get
+        {
+            if (physShapeInfo != null)
+                return physShapeInfo.HasPhysicalShape;
+            return false;
+        }
+    }
+    public virtual BSPhysicsShapeType ShapeType
+    {
+        get
+        {
+            BSPhysicsShapeType ret = BSPhysicsShapeType.SHAPE_UNKNOWN;
+            if (physShapeInfo != null && physShapeInfo.HasPhysicalShape)
+                ret = physShapeInfo.shapeType;
+            return ret;
+        }
+    }
 
     // Returns a string for debugging that uniquily identifies the memory used by this instance
     public virtual string AddrString
     {
-        get { return "unknown"; }
+        get
+        {
+            if (physShapeInfo != null)
+                return physShapeInfo.AddrString;
+            return "unknown";
+        }
     }
 
     public override string ToString()
     {
         StringBuilder buff = new StringBuilder();
-        buff.Append("<p=");
-        buff.Append(AddrString);
+        if (physShapeInfo == null)
+        {
+            buff.Append("<noPhys");
+        }
+        else
+        {
+            buff.Append("<phy=");
+            buff.Append(physShapeInfo.ToString());
+        }
         buff.Append(",c=");
         buff.Append(referenceCount.ToString());
         buff.Append(">");
         return buff.ToString();
     }
+
+    #region Common shape routines
+    // Create a hash of all the shape parameters to be used as a key for this particular shape.
+    public static System.UInt64 ComputeShapeKey(OMV.Vector3 size, PrimitiveBaseShape pbs, out float retLod)
+    {
+        // level of detail based on size and type of the object
+        float lod = BSParam.MeshLOD;
+        if (pbs.SculptEntry)
+            lod = BSParam.SculptLOD;
+
+        // Mega prims usually get more detail because one can interact with shape approximations at this size.
+        float maxAxis = Math.Max(size.X, Math.Max(size.Y, size.Z));
+        if (maxAxis > BSParam.MeshMegaPrimThreshold)
+            lod = BSParam.MeshMegaPrimLOD;
+
+        retLod = lod;
+        return pbs.GetMeshKey(size, lod);
+    }
+
+    // The creation of a mesh or hull can fail if an underlying asset is not available.
+    // There are two cases: 1) the asset is not in the cache and it needs to be fetched;
+    //     and 2) the asset cannot be converted (like failed decompression of JPEG2000s).
+    //     The first case causes the asset to be fetched. The second case requires
+    //     us to not loop forever.
+    // Called after creating a physical mesh or hull. If the physical shape was created,
+    //     just return.
+    public static BulletShape VerifyMeshCreated(BSScene physicsScene, BulletShape newShape, BSPhysObject prim)
+    {
+        // If the shape was successfully created, nothing more to do
+        if (newShape.HasPhysicalShape)
+            return newShape;
+
+        // VerifyMeshCreated is called after trying to create the mesh. If we think the asset had been
+        //    fetched but we end up here again, the meshing of the asset must have failed.
+        // Prevent trying to keep fetching the mesh by declaring failure.
+        if (prim.PrimAssetState == BSPhysObject.PrimAssetCondition.Fetched)
+        {
+            prim.PrimAssetState = BSPhysObject.PrimAssetCondition.FailedMeshing;
+            physicsScene.Logger.WarnFormat("{0} Fetched asset would not mesh. prim={1}, texture={2}",
+                                            LogHeader, UsefulPrimInfo(physicsScene, prim), prim.BaseShape.SculptTexture);
+            physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,setFailed,prim={1},tex={2}",
+                                            prim.LocalID, UsefulPrimInfo(physicsScene, prim), prim.BaseShape.SculptTexture);
+        }
+        else
+        {
+            // If this mesh has an underlying asset and we have not failed getting it before, fetch the asset
+            if (prim.BaseShape.SculptEntry
+                && prim.PrimAssetState != BSPhysObject.PrimAssetCondition.FailedAssetFetch
+                && prim.PrimAssetState != BSPhysObject.PrimAssetCondition.FailedMeshing
+                && prim.PrimAssetState != BSPhysObject.PrimAssetCondition.Waiting
+                && prim.BaseShape.SculptTexture != OMV.UUID.Zero
+                )
+            {
+                physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,fetchAsset,objNam={1},tex={2}",
+                                            prim.LocalID, prim.PhysObjectName, prim.BaseShape.SculptTexture);
+                // Multiple requestors will know we're waiting for this asset
+                prim.PrimAssetState = BSPhysObject.PrimAssetCondition.Waiting;
+
+                BSPhysObject xprim = prim;
+                Util.FireAndForget(delegate
+                    {
+                        // physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,inFireAndForget", xprim.LocalID);
+                        RequestAssetDelegate assetProvider = physicsScene.RequestAssetMethod;
+                        if (assetProvider != null)
+                        {
+                            BSPhysObject yprim = xprim; // probably not necessary, but, just in case.
+                            assetProvider(yprim.BaseShape.SculptTexture, delegate(AssetBase asset)
+                            {
+                                // physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,assetProviderCallback", xprim.LocalID);
+                                bool assetFound = false;
+                                string mismatchIDs = String.Empty;  // DEBUG DEBUG
+                                if (asset != null && yprim.BaseShape.SculptEntry)
+                                {
+                                    if (yprim.BaseShape.SculptTexture.ToString() == asset.ID)
+                                    {
+                                        yprim.BaseShape.SculptData = asset.Data;
+                                        // This will cause the prim to see that the filler shape is not the right
+                                        //    one and try again to build the object.
+                                        // No race condition with the normal shape setting since the rebuild is at taint time.
+                                        yprim.PrimAssetState = BSPhysObject.PrimAssetCondition.Fetched;
+                                        yprim.ForceBodyShapeRebuild(false /* inTaintTime */);
+                                        assetFound = true;
+                                    }
+                                    else
+                                    {
+                                        mismatchIDs = yprim.BaseShape.SculptTexture.ToString() + "/" + asset.ID;
+                                    }
+                                }
+                                if (!assetFound)
+                                {
+                                    yprim.PrimAssetState = BSPhysObject.PrimAssetCondition.FailedAssetFetch;
+                                }
+                                physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,fetchAssetCallback,found={1},isSculpt={2},ids={3}",
+                                            yprim.LocalID, assetFound, yprim.BaseShape.SculptEntry, mismatchIDs );
+                            });
+                        }
+                        else
+                        {
+                            xprim.PrimAssetState = BSPhysObject.PrimAssetCondition.FailedAssetFetch;
+                            physicsScene.Logger.ErrorFormat("{0} Physical object requires asset but no asset provider. Name={1}",
+                                                        LogHeader, physicsScene.Name);
+                        }
+                    });
+            }
+            else
+            {
+                if (prim.PrimAssetState == BSPhysObject.PrimAssetCondition.FailedAssetFetch)
+                {
+                    physicsScene.Logger.WarnFormat("{0} Mesh failed to fetch asset. prim={1}, texture={2}",
+                                                LogHeader, UsefulPrimInfo(physicsScene, prim), prim.BaseShape.SculptTexture);
+                    physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,wasFailed,prim={1},tex={2}",
+                                                prim.LocalID, UsefulPrimInfo(physicsScene, prim), prim.BaseShape.SculptTexture);
+                }
+                if (prim.PrimAssetState == BSPhysObject.PrimAssetCondition.FailedMeshing)
+                {
+                    physicsScene.Logger.WarnFormat("{0} Mesh asset would not mesh. prim={1}, texture={2}",
+                                                LogHeader, UsefulPrimInfo(physicsScene, prim), prim.BaseShape.SculptTexture);
+                    physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,wasFailedMeshing,prim={1},tex={2}",
+                                                prim.LocalID, UsefulPrimInfo(physicsScene, prim), prim.BaseShape.SculptTexture);
+                }
+            }
+         }
+
+        // While we wait for the mesh defining asset to be loaded, stick in a simple box for the object.
+        BSShape fillShape = BSShapeNative.GetReference(physicsScene, prim, BSPhysicsShapeType.SHAPE_BOX, FixedShapeKey.KEY_BOX);
+        physicsScene.DetailLog("{0},BSShape.VerifyMeshCreated,boxTempShape", prim.LocalID);
+
+        return fillShape.physShapeInfo;
+     }
+
+    public static String UsefulPrimInfo(BSScene pScene, BSPhysObject prim)
+    {
+        StringBuilder buff = new StringBuilder(prim.PhysObjectName);
+        buff.Append("/pos=");
+        buff.Append(prim.RawPosition.ToString());
+        if (pScene != null)
+        {
+            buff.Append("/rgn=");
+            buff.Append(pScene.Name);
+        }
+        return buff.ToString();
+    }
+
+    #endregion // Common shape routines
 }
 
+// ============================================================================================================
 public class BSShapeNull : BSShape
 {
     public BSShapeNull() : base()
     {
     }
     public static BSShape GetReference() { return new BSShapeNull();  }
+    public override BSShape GetReference(BSScene pPhysicsScene, BSPhysObject pPrim) { return new BSShapeNull();  }
     public override void Dereference(BSScene physicsScene) { /* The magic of garbage collection will make this go away */ }
 }
 
+// ============================================================================================================
 public class BSShapeNative : BSShape
 {
     private static string LogHeader = "[BULLETSIM SHAPE NATIVE]";
-    public BSShapeNative() : base()
+    public BSShapeNative(BulletShape pShape) : base(pShape)
     {
     }
-    public static BSShape GetReference(BSScene physicsScene, BSPhysObject prim, 
-                    BSPhysicsShapeType shapeType, FixedShapeKey shapeKey) 
+
+    public static BSShape GetReference(BSScene physicsScene, BSPhysObject prim,
+                                            BSPhysicsShapeType shapeType, FixedShapeKey shapeKey)
     {
         // Native shapes are not shared and are always built anew.
-        //return new BSShapeNative(physicsScene, prim, shapeType, shapeKey);
-        return null;
+        return new BSShapeNative(CreatePhysicalNativeShape(physicsScene, prim, shapeType, shapeKey));
     }
 
-    private BSShapeNative(BSScene physicsScene, BSPhysObject prim,
-                    BSPhysicsShapeType shapeType, FixedShapeKey shapeKey)
+    public override BSShape GetReference(BSScene pPhysicsScene, BSPhysObject pPrim)
     {
+        // Native shapes are not shared so we return a new shape.
+        BSShape ret = null;
+        lock (physShapeInfo)
+        {
+            ret = new BSShapeNative(CreatePhysicalNativeShape(pPhysicsScene, pPrim,
+                                        physShapeInfo.shapeType, (FixedShapeKey)physShapeInfo.shapeKey));
+        }
+        return ret;
+    }
+
+    // Make this reference to the physical shape go away since native shapes are not shared.
+    public override void Dereference(BSScene physicsScene)
+    {
+        // Native shapes are not tracked and are released immediately
+        lock (physShapeInfo)
+        {
+            if (physShapeInfo.HasPhysicalShape)
+            {
+                physicsScene.DetailLog("{0},BSShapeNative.Dereference,deleteNativeShape,shape={1}", BSScene.DetailLogZero, this);
+                physicsScene.PE.DeleteCollisionShape(physicsScene.World, physShapeInfo);
+            }
+            physShapeInfo.Clear();
+            // Garbage collection will free up this instance.
+        }
+    }
+
+    private static BulletShape CreatePhysicalNativeShape(BSScene physicsScene, BSPhysObject prim,
+                                            BSPhysicsShapeType shapeType, FixedShapeKey shapeKey)
+    {
+        BulletShape newShape;
+
         ShapeData nativeShapeData = new ShapeData();
         nativeShapeData.Type = shapeType;
         nativeShapeData.ID = prim.LocalID;
@@ -146,84 +343,855 @@ public class BSShapeNative : BSShape
         nativeShapeData.MeshKey = (ulong)shapeKey;
         nativeShapeData.HullKey = (ulong)shapeKey;
 
-       
-        /*
         if (shapeType == BSPhysicsShapeType.SHAPE_CAPSULE)
         {
-            ptr = PhysicsScene.PE.BuildCapsuleShape(physicsScene.World, 1f, 1f, prim.Scale);
-            physicsScene.DetailLog("{0},BSShapeCollection.BuiletPhysicalNativeShape,capsule,scale={1}", prim.LocalID, prim.Scale);
+            newShape = physicsScene.PE.BuildCapsuleShape(physicsScene.World, 1f, 1f, prim.Scale);
+            physicsScene.DetailLog("{0},BSShapeNative,capsule,scale={1}", prim.LocalID, prim.Scale);
         }
         else
         {
-            ptr = PhysicsScene.PE.BuildNativeShape(physicsScene.World, nativeShapeData);
+            newShape = physicsScene.PE.BuildNativeShape(physicsScene.World, nativeShapeData);
         }
-        if (ptr == IntPtr.Zero)
+        if (!newShape.HasPhysicalShape)
         {
             physicsScene.Logger.ErrorFormat("{0} BuildPhysicalNativeShape failed. ID={1}, shape={2}",
                                     LogHeader, prim.LocalID, shapeType);
         }
-        type = shapeType;
-        key = (UInt64)shapeKey;
-         */
-    }
-    // Make this reference to the physical shape go away since native shapes are not shared.
-    public override void Dereference(BSScene physicsScene)
-    {
-        /*
-        // Native shapes are not tracked and are released immediately
-        physicsScene.DetailLog("{0},BSShapeCollection.DereferenceShape,deleteNativeShape,shape={1}", BSScene.DetailLogZero, this);
-        PhysicsScene.PE.DeleteCollisionShape(physicsScene.World, this);
-        ptr = IntPtr.Zero;
-        // Garbage collection will free up this instance.
-         */
+        newShape.shapeType = shapeType;
+        newShape.isNativeShape = true;
+        newShape.shapeKey = (UInt64)shapeKey;
+        return newShape;
     }
+
 }
 
+// ============================================================================================================
 public class BSShapeMesh : BSShape
 {
     private static string LogHeader = "[BULLETSIM SHAPE MESH]";
-    private static Dictionary<System.UInt64, BSShapeMesh> Meshes = new Dictionary<System.UInt64, BSShapeMesh>();
+    public static Dictionary<System.UInt64, BSShapeMesh> Meshes = new Dictionary<System.UInt64, BSShapeMesh>();
 
-    public BSShapeMesh() : base()
+    public BSShapeMesh(BulletShape pShape) : base(pShape)
     {
     }
-    public static BSShape GetReference() { return new BSShapeNull();  }
-    public override void Dereference(BSScene physicsScene) { }
+    public static BSShape GetReference(BSScene physicsScene, bool forceRebuild, BSPhysObject prim)
+    {
+        float lod;
+        System.UInt64 newMeshKey = BSShape.ComputeShapeKey(prim.Size, prim.BaseShape, out lod);
+
+        BSShapeMesh retMesh = null;
+        lock (Meshes)
+        {
+            if (Meshes.TryGetValue(newMeshKey, out retMesh))
+            {
+                // The mesh has already been created. Return a new reference to same.
+                retMesh.IncrementReference();
+            }
+            else
+            {
+                retMesh = new BSShapeMesh(new BulletShape());
+                // An instance of this mesh has not been created. Build and remember same.
+                BulletShape newShape = retMesh.CreatePhysicalMesh(physicsScene, prim, newMeshKey, prim.BaseShape, prim.Size, lod);
+
+                // Check to see if mesh was created (might require an asset).
+                newShape = VerifyMeshCreated(physicsScene, newShape, prim);
+                if (!newShape.isNativeShape
+                            || prim.PrimAssetState == BSPhysObject.PrimAssetCondition.FailedMeshing
+                            || prim.PrimAssetState == BSPhysObject.PrimAssetCondition.FailedAssetFetch)
+                {
+                    // If a mesh was what was created, remember the built shape for later sharing.
+                    // Also note that if meshing failed we put it in the mesh list as there is nothing else to do about the mesh.
+                    Meshes.Add(newMeshKey, retMesh);
+                }
+
+                retMesh.physShapeInfo = newShape;
+            }
+        }
+        physicsScene.DetailLog("{0},BSShapeMesh,getReference,mesh={1},size={2},lod={3}", prim.LocalID, retMesh, prim.Size, lod);
+        return retMesh;
+    }
+    public override BSShape GetReference(BSScene pPhysicsScene, BSPhysObject pPrim)
+    {
+        BSShape ret = null;
+        // If the underlying shape is native, the actual shape has not been build (waiting for asset)
+        //     and we must create a copy of the native shape since they are never shared.
+        if (physShapeInfo.HasPhysicalShape && physShapeInfo.isNativeShape)
+        {
+            // TODO: decide when the native shapes should be freed. Check in Dereference?
+            ret = BSShapeNative.GetReference(pPhysicsScene, pPrim, BSPhysicsShapeType.SHAPE_BOX, FixedShapeKey.KEY_BOX);
+        }
+        else
+        {
+            // Another reference to this shape is just counted.
+            IncrementReference();
+            ret = this;
+        }
+        return ret;
+    }
+    public override void Dereference(BSScene physicsScene)
+    {
+        lock (Meshes)
+        {
+            this.DecrementReference();
+            physicsScene.DetailLog("{0},BSShapeMesh.Dereference,shape={1}", BSScene.DetailLogZero, this);
+            // TODO: schedule aging and destruction of unused meshes.
+        }
+    }
+    // Loop through all the known meshes and return the description based on the physical address.
+    public static bool TryGetMeshByPtr(BulletShape pShape, out BSShapeMesh outMesh)
+    {
+        bool ret = false;
+        BSShapeMesh foundDesc = null;
+        lock (Meshes)
+        {
+            foreach (BSShapeMesh sm in Meshes.Values)
+            {
+                if (sm.physShapeInfo.ReferenceSame(pShape))
+                {
+                    foundDesc = sm;
+                    ret = true;
+                    break;
+                }
+
+            }
+        }
+        outMesh = foundDesc;
+        return ret;
+    }
+
+    public delegate BulletShape CreateShapeCall(BulletWorld world, int indicesCount, int[] indices, int verticesCount, float[] vertices );
+    private BulletShape CreatePhysicalMesh(BSScene physicsScene, BSPhysObject prim, System.UInt64 newMeshKey,
+                                            PrimitiveBaseShape pbs, OMV.Vector3 size, float lod)
+    {
+        return BSShapeMesh.CreatePhysicalMeshShape(physicsScene, prim, newMeshKey, pbs, size, lod,
+                            (w, iC, i, vC, v) => physicsScene.PE.CreateMeshShape(w, iC, i, vC, v) );
+    }
+
+    // Code that uses the mesher to create the index/vertices info for a trimesh shape.
+    // This is used by the passed 'makeShape' call to create the Bullet mesh shape.
+    // The actual build call is passed so this logic can be used by several of the shapes that use a
+    //     simple mesh as their base shape.
+    public static BulletShape CreatePhysicalMeshShape(BSScene physicsScene, BSPhysObject prim, System.UInt64 newMeshKey,
+                                            PrimitiveBaseShape pbs, OMV.Vector3 size, float lod, CreateShapeCall makeShape)
+    {
+        BulletShape newShape = new BulletShape();
+
+        IMesh meshData = null;
+        lock (physicsScene.mesher)
+        {
+            meshData = physicsScene.mesher.CreateMesh(prim.PhysObjectName, pbs, size, lod,
+                                            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,
+                                            false
+                                            );
+        }
+
+        if (meshData != null)
+        {
+            if (prim.PrimAssetState == BSPhysObject.PrimAssetCondition.Fetched)
+            {
+                // Release the fetched asset data once it has been used.
+                pbs.SculptData = new byte[0];
+                prim.PrimAssetState = BSPhysObject.PrimAssetCondition.Unknown;
+            }
+
+            int[] indices = meshData.getIndexListAsInt();
+            int realIndicesIndex = indices.Length;
+            float[] verticesAsFloats = meshData.getVertexListAsFloat();
+
+            if (BSParam.ShouldRemoveZeroWidthTriangles)
+            {
+                // Remove degenerate triangles. These are triangles with two of the vertices
+                //    are the same. This is complicated by the problem that vertices are not
+                //    made unique in sculpties so we have to compare the values in the vertex.
+                realIndicesIndex = 0;
+                for (int tri = 0; tri < indices.Length; tri += 3)
+                {
+                    // Compute displacements into vertex array for each vertex of the triangle
+                    int v1 = indices[tri + 0] * 3;
+                    int v2 = indices[tri + 1] * 3;
+                    int v3 = indices[tri + 2] * 3;
+                // Check to see if any two of the vertices are the same
+                    if (!( (  verticesAsFloats[v1 + 0] == verticesAsFloats[v2 + 0]
+                           && verticesAsFloats[v1 + 1] == verticesAsFloats[v2 + 1]
+                           && verticesAsFloats[v1 + 2] == verticesAsFloats[v2 + 2])
+                        || (  verticesAsFloats[v2 + 0] == verticesAsFloats[v3 + 0]
+                           && verticesAsFloats[v2 + 1] == verticesAsFloats[v3 + 1]
+                           && verticesAsFloats[v2 + 2] == verticesAsFloats[v3 + 2])
+                        || (  verticesAsFloats[v1 + 0] == verticesAsFloats[v3 + 0]
+                           && verticesAsFloats[v1 + 1] == verticesAsFloats[v3 + 1]
+                           && verticesAsFloats[v1 + 2] == verticesAsFloats[v3 + 2]) )
+                    )
+                    {
+                        // None of the vertices of the triangles are the same. This is a good triangle;
+                        indices[realIndicesIndex + 0] = indices[tri + 0];
+                        indices[realIndicesIndex + 1] = indices[tri + 1];
+                        indices[realIndicesIndex + 2] = indices[tri + 2];
+                        realIndicesIndex += 3;
+                    }
+                }
+            }
+            physicsScene.DetailLog("{0},BSShapeMesh.CreatePhysicalMesh,key={1},origTri={2},realTri={3},numVerts={4}",
+                        BSScene.DetailLogZero, newMeshKey.ToString("X"), indices.Length / 3, realIndicesIndex / 3, verticesAsFloats.Length / 3);
+
+            if (realIndicesIndex != 0)
+            {
+                newShape = makeShape(physicsScene.World, realIndicesIndex, indices, verticesAsFloats.Length / 3, verticesAsFloats);
+            }
+            else
+            {
+                // Force the asset condition to 'failed' so we won't try to keep fetching and processing this mesh.
+                prim.PrimAssetState = BSPhysObject.PrimAssetCondition.FailedMeshing;
+                physicsScene.Logger.DebugFormat("{0} All mesh triangles degenerate. Prim={1}", LogHeader, UsefulPrimInfo(physicsScene, prim) );
+                physicsScene.DetailLog("{0},BSShapeMesh.CreatePhysicalMesh,allDegenerate,key={1}", prim.LocalID, newMeshKey);
+            }
+        }
+        newShape.shapeKey = newMeshKey;
+
+        return newShape;
+    }
 }
 
+// ============================================================================================================
 public class BSShapeHull : BSShape
 {
     private static string LogHeader = "[BULLETSIM SHAPE HULL]";
-    private static Dictionary<System.UInt64, BSShapeHull> Hulls = new Dictionary<System.UInt64, BSShapeHull>();
+    public static Dictionary<System.UInt64, BSShapeHull> Hulls = new Dictionary<System.UInt64, BSShapeHull>();
 
-    public BSShapeHull() : base()
+    public BSShapeHull(BulletShape pShape) : base(pShape)
     {
     }
-    public static BSShape GetReference() { return new BSShapeNull();  }
-    public override void Dereference(BSScene physicsScene) { }
+    public static BSShape GetReference(BSScene physicsScene, bool forceRebuild, BSPhysObject prim)
+    {
+        float lod;
+        System.UInt64 newHullKey = BSShape.ComputeShapeKey(prim.Size, prim.BaseShape, out lod);
+
+        BSShapeHull retHull = null;
+        lock (Hulls)
+        {
+            if (Hulls.TryGetValue(newHullKey, out retHull))
+            {
+                // The mesh has already been created. Return a new reference to same.
+                retHull.IncrementReference();
+            }
+            else
+            {
+                retHull = new BSShapeHull(new BulletShape());
+                // An instance of this mesh has not been created. Build and remember same.
+                BulletShape newShape = retHull.CreatePhysicalHull(physicsScene, prim, newHullKey, prim.BaseShape, prim.Size, lod);
+
+                // Check to see if hull was created (might require an asset).
+                newShape = VerifyMeshCreated(physicsScene, newShape, prim);
+                if (!newShape.isNativeShape
+                            || prim.PrimAssetState == BSPhysObject.PrimAssetCondition.FailedMeshing
+                            || prim.PrimAssetState == BSPhysObject.PrimAssetCondition.FailedAssetFetch)
+                {
+                    // If a mesh was what was created, remember the built shape for later sharing.
+                    Hulls.Add(newHullKey, retHull);
+                }
+                retHull.physShapeInfo = newShape;
+            }
+        }
+        physicsScene.DetailLog("{0},BSShapeHull,getReference,hull={1},size={2},lod={3}", prim.LocalID, retHull, prim.Size, lod);
+        return retHull;
+    }
+    public override BSShape GetReference(BSScene pPhysicsScene, BSPhysObject pPrim)
+    {
+        BSShape ret = null;
+        // If the underlying shape is native, the actual shape has not been build (waiting for asset)
+        //     and we must create a copy of the native shape since they are never shared.
+        if (physShapeInfo.HasPhysicalShape && physShapeInfo.isNativeShape)
+        {
+            // TODO: decide when the native shapes should be freed. Check in Dereference?
+            ret = BSShapeNative.GetReference(pPhysicsScene, pPrim, BSPhysicsShapeType.SHAPE_BOX, FixedShapeKey.KEY_BOX);
+        }
+        else
+        {
+            // Another reference to this shape is just counted.
+            IncrementReference();
+            ret = this;
+        }
+        return ret;
+    }
+    public override void Dereference(BSScene physicsScene)
+    {
+        lock (Hulls)
+        {
+            this.DecrementReference();
+            physicsScene.DetailLog("{0},BSShapeHull.Dereference,shape={1}", BSScene.DetailLogZero, this);
+            // TODO: schedule aging and destruction of unused meshes.
+        }
+    }
+    List<ConvexResult> m_hulls;
+    private BulletShape CreatePhysicalHull(BSScene physicsScene, BSPhysObject prim, System.UInt64 newHullKey,
+                                            PrimitiveBaseShape pbs, OMV.Vector3 size, float lod)
+    {
+        BulletShape newShape = new BulletShape();
+
+        IMesh meshData = null;
+        List<List<OMV.Vector3>> allHulls = null;
+        lock (physicsScene.mesher)
+        {
+            // Pass true for physicalness as this prevents the creation of bounding box which is not needed
+            meshData = physicsScene.mesher.CreateMesh(prim.PhysObjectName, pbs, size, lod, true /* isPhysical */, false /* shouldCache */, false, false);
+
+            // If we should use the asset's hull info, fetch it out of the locked mesher
+            if (meshData != null && BSParam.ShouldUseAssetHulls)
+            {
+                Meshmerizer realMesher = physicsScene.mesher as Meshmerizer;
+                if (realMesher != null)
+                {
+                    allHulls = realMesher.GetConvexHulls(size);
+                }
+                if (allHulls == null)
+                {
+                    physicsScene.DetailLog("{0},BSShapeHull.CreatePhysicalHull,assetHulls,noAssetHull", prim.LocalID);
+                }
+            }
+        }
+
+        // If there is hull data in the mesh asset, build the hull from that
+        if (allHulls != null && BSParam.ShouldUseAssetHulls)
+        {
+            int hullCount = allHulls.Count;
+            int totalVertices = 1;      // include one for the count of the hulls
+            // Using the structure described for HACD hulls, create the memory sturcture
+            //     to pass the hull data to the creater.
+            foreach (List<OMV.Vector3> hullVerts in allHulls)
+            {
+                totalVertices += 4;                     // add four for the vertex count and centroid
+                totalVertices += hullVerts.Count * 3;   // one vertex is three dimensions
+            }
+            float[] convHulls = new float[totalVertices];
+
+            convHulls[0] = (float)hullCount;
+            int jj = 1;
+            foreach (List<OMV.Vector3> hullVerts in allHulls)
+            {
+                convHulls[jj + 0] = hullVerts.Count;
+                convHulls[jj + 1] = 0f;   // centroid x,y,z
+                convHulls[jj + 2] = 0f;
+                convHulls[jj + 3] = 0f;
+                jj += 4;
+                foreach (OMV.Vector3 oneVert in hullVerts)
+                {
+                    convHulls[jj + 0] = oneVert.X;
+                    convHulls[jj + 1] = oneVert.Y;
+                    convHulls[jj + 2] = oneVert.Z;
+                    jj += 3;
+                }
+            }
+
+            // create the hull data structure in Bullet
+            newShape = physicsScene.PE.CreateHullShape(physicsScene.World, hullCount, convHulls);
+
+            physicsScene.DetailLog("{0},BSShapeHull.CreatePhysicalHull,assetHulls,hulls={1},totVert={2},shape={3}",
+                                        prim.LocalID, hullCount, totalVertices, newShape);
+        }
+
+        // If no hull specified in the asset and we should use Bullet's HACD approximation...
+        if (!newShape.HasPhysicalShape && BSParam.ShouldUseBulletHACD)
+        {
+            // Build the hull shape from an existing mesh shape.
+            // The mesh should have already been created in Bullet.
+            physicsScene.DetailLog("{0},BSShapeHull.CreatePhysicalHull,bulletHACD,entry", prim.LocalID);
+            BSShape meshShape = BSShapeMesh.GetReference(physicsScene, true, prim);
+
+            if (meshShape.physShapeInfo.HasPhysicalShape)
+            {
+                HACDParams parms;
+                parms.maxVerticesPerHull = BSParam.BHullMaxVerticesPerHull;
+                parms.minClusters = BSParam.BHullMinClusters;
+                parms.compacityWeight = BSParam.BHullCompacityWeight;
+                parms.volumeWeight = BSParam.BHullVolumeWeight;
+                parms.concavity = BSParam.BHullConcavity;
+                parms.addExtraDistPoints = BSParam.NumericBool(BSParam.BHullAddExtraDistPoints);
+                parms.addNeighboursDistPoints = BSParam.NumericBool(BSParam.BHullAddNeighboursDistPoints);
+                parms.addFacesPoints = BSParam.NumericBool(BSParam.BHullAddFacesPoints);
+                parms.shouldAdjustCollisionMargin = BSParam.NumericBool(BSParam.BHullShouldAdjustCollisionMargin);
+
+                physicsScene.DetailLog("{0},BSShapeHull.CreatePhysicalHull,hullFromMesh,beforeCall", prim.LocalID, newShape.HasPhysicalShape);
+                newShape = physicsScene.PE.BuildHullShapeFromMesh(physicsScene.World, meshShape.physShapeInfo, parms);
+                physicsScene.DetailLog("{0},BSShapeHull.CreatePhysicalHull,hullFromMesh,shape={1}", prim.LocalID, newShape);
+
+                // Now done with the mesh shape.
+                meshShape.Dereference(physicsScene);
+            }
+            physicsScene.DetailLog("{0},BSShapeHull.CreatePhysicalHull,bulletHACD,exit,hasBody={1}", prim.LocalID, newShape.HasPhysicalShape);
+        }
+
+        // If no other hull specifications, use our HACD hull approximation.
+        if (!newShape.HasPhysicalShape && meshData != null)
+        {
+            if (prim.PrimAssetState == BSPhysObject.PrimAssetCondition.Fetched)
+            {
+                // Release the fetched asset data once it has been used.
+                pbs.SculptData = new byte[0];
+                prim.PrimAssetState = BSPhysObject.PrimAssetCondition.Unknown;
+            }
+
+            int[] indices = meshData.getIndexListAsInt();
+            List<OMV.Vector3> vertices = meshData.getVertexList();
+
+            //format conversion from IMesh format to DecompDesc format
+            List<int> convIndices = new List<int>();
+            List<float3> convVertices = new List<float3>();
+            for (int ii = 0; ii < indices.GetLength(0); ii++)
+            {
+                convIndices.Add(indices[ii]);
+            }
+            foreach (OMV.Vector3 vv in vertices)
+            {
+                convVertices.Add(new float3(vv.X, vv.Y, vv.Z));
+            }
+
+            uint maxDepthSplit = (uint)BSParam.CSHullMaxDepthSplit;
+            if (BSParam.CSHullMaxDepthSplit != BSParam.CSHullMaxDepthSplitForSimpleShapes)
+            {
+                // Simple primitive shapes we know are convex so they are better implemented with
+                //    fewer hulls.
+                // Check for simple shape (prim without cuts) and reduce split parameter if so.
+                if (BSShapeCollection.PrimHasNoCuts(pbs))
+                {
+                    maxDepthSplit = (uint)BSParam.CSHullMaxDepthSplitForSimpleShapes;
+                }
+            }
+
+            // setup and do convex hull conversion
+            m_hulls = new List<ConvexResult>();
+            DecompDesc dcomp = new DecompDesc();
+            dcomp.mIndices = convIndices;
+            dcomp.mVertices = convVertices;
+            dcomp.mDepth = maxDepthSplit;
+            dcomp.mCpercent = BSParam.CSHullConcavityThresholdPercent;
+            dcomp.mPpercent = BSParam.CSHullVolumeConservationThresholdPercent;
+            dcomp.mMaxVertices = (uint)BSParam.CSHullMaxVertices;
+            dcomp.mSkinWidth = BSParam.CSHullMaxSkinWidth;
+            ConvexBuilder convexBuilder = new ConvexBuilder(HullReturn);
+            // create the hull into the _hulls variable
+            convexBuilder.process(dcomp);
+
+            physicsScene.DetailLog("{0},BSShapeCollection.CreatePhysicalHull,key={1},inVert={2},inInd={3},split={4},hulls={5}",
+                                BSScene.DetailLogZero, newHullKey, indices.GetLength(0), vertices.Count, maxDepthSplit, m_hulls.Count);
+
+            // Convert the vertices and indices for passing to unmanaged.
+            // The hull information is passed as a large floating point array.
+            // The format is:
+            //  convHulls[0] = number of hulls
+            //  convHulls[1] = number of vertices in first hull
+            //  convHulls[2] = hull centroid X coordinate
+            //  convHulls[3] = hull centroid Y coordinate
+            //  convHulls[4] = hull centroid Z coordinate
+            //  convHulls[5] = first hull vertex X
+            //  convHulls[6] = first hull vertex Y
+            //  convHulls[7] = first hull vertex Z
+            //  convHulls[8] = second hull vertex X
+            //  ...
+            //  convHulls[n] = number of vertices in second hull
+            //  convHulls[n+1] = second hull centroid X coordinate
+            //  ...
+            //
+            // TODO: is is very inefficient. Someday change the convex hull generator to return
+            //   data structures that do not need to be converted in order to pass to Bullet.
+            //   And maybe put the values directly into pinned memory rather than marshaling.
+            int hullCount = m_hulls.Count;
+            int totalVertices = 1;          // include one for the count of the hulls
+            foreach (ConvexResult cr in m_hulls)
+            {
+                totalVertices += 4;                         // add four for the vertex count and centroid
+                totalVertices += cr.HullIndices.Count * 3;  // we pass just triangles
+            }
+            float[] convHulls = new float[totalVertices];
+
+            convHulls[0] = (float)hullCount;
+            int jj = 1;
+            foreach (ConvexResult cr in m_hulls)
+            {
+                // copy vertices for index access
+                float3[] verts = new float3[cr.HullVertices.Count];
+                int kk = 0;
+                foreach (float3 ff in cr.HullVertices)
+                {
+                    verts[kk++] = ff;
+                }
+
+                // add to the array one hull's worth of data
+                convHulls[jj++] = cr.HullIndices.Count;
+                convHulls[jj++] = 0f;   // centroid x,y,z
+                convHulls[jj++] = 0f;
+                convHulls[jj++] = 0f;
+                foreach (int ind in cr.HullIndices)
+                {
+                    convHulls[jj++] = verts[ind].x;
+                    convHulls[jj++] = verts[ind].y;
+                    convHulls[jj++] = verts[ind].z;
+                }
+            }
+            // create the hull data structure in Bullet
+            newShape = physicsScene.PE.CreateHullShape(physicsScene.World, hullCount, convHulls);
+        }
+        newShape.shapeKey = newHullKey;
+        return newShape;
+    }
+    // Callback from convex hull creater with a newly created hull.
+    // Just add it to our collection of hulls for this shape.
+    private void HullReturn(ConvexResult result)
+    {
+        m_hulls.Add(result);
+        return;
+    }
+    // Loop through all the known hulls and return the description based on the physical address.
+    public static bool TryGetHullByPtr(BulletShape pShape, out BSShapeHull outHull)
+    {
+        bool ret = false;
+        BSShapeHull foundDesc = null;
+        lock (Hulls)
+        {
+            foreach (BSShapeHull sh in Hulls.Values)
+            {
+                if (sh.physShapeInfo.ReferenceSame(pShape))
+                {
+                    foundDesc = sh;
+                    ret = true;
+                    break;
+                }
+
+            }
+        }
+        outHull = foundDesc;
+        return ret;
+    }
 }
 
+// ============================================================================================================
 public class BSShapeCompound : BSShape
 {
     private static string LogHeader = "[BULLETSIM SHAPE COMPOUND]";
-    public BSShapeCompound() : base()
+    public BSShapeCompound(BulletShape pShape) : base(pShape)
     {
     }
-    public static BSShape GetReference(BSPhysObject prim) 
-    { 
-        return new BSShapeNull();
+    public static BSShape GetReference(BSScene physicsScene)
+    {
+        // Base compound shapes are not shared so this returns a raw shape.
+        // A built compound shape can be reused in linksets.
+        return new BSShapeCompound(CreatePhysicalCompoundShape(physicsScene));
+    }
+    public override BSShape GetReference(BSScene physicsScene, BSPhysObject prim)
+    {
+        // Calling this reference means we want another handle to an existing compound shape
+        //     (usually linksets) so return this copy.
+        IncrementReference();
+        return this;
+    }
+    // Dereferencing a compound shape releases the hold on all the child shapes.
+    public override void Dereference(BSScene physicsScene)
+    {
+        lock (physShapeInfo)
+        {
+            this.DecrementReference();
+            physicsScene.DetailLog("{0},BSShapeCompound.Dereference,shape={1}", BSScene.DetailLogZero, this);
+            if (referenceCount <= 0)
+            {
+                if (!physicsScene.PE.IsCompound(physShapeInfo))
+                {
+                    // Failed the sanity check!!
+                    physicsScene.Logger.ErrorFormat("{0} Attempt to free a compound shape that is not compound!! type={1}, ptr={2}",
+                                                LogHeader, physShapeInfo.shapeType, physShapeInfo.AddrString);
+                    physicsScene.DetailLog("{0},BSShapeCollection.DereferenceCompound,notACompoundShape,type={1},ptr={2}",
+                                                BSScene.DetailLogZero, physShapeInfo.shapeType, physShapeInfo.AddrString);
+                    return;
+                }
+
+                int numChildren = physicsScene.PE.GetNumberOfCompoundChildren(physShapeInfo);
+                physicsScene.DetailLog("{0},BSShapeCollection.DereferenceCompound,shape={1},children={2}",
+                                        BSScene.DetailLogZero, physShapeInfo, numChildren);
+
+                // Loop through all the children dereferencing each.
+                for (int ii = numChildren - 1; ii >= 0; ii--)
+                {
+                    BulletShape childShape = physicsScene.PE.RemoveChildShapeFromCompoundShapeIndex(physShapeInfo, ii);
+                    DereferenceAnonCollisionShape(physicsScene, childShape);
+                }
+                physicsScene.PE.DeleteCollisionShape(physicsScene.World, physShapeInfo);
+            }
+        }
+    }
+    private static BulletShape CreatePhysicalCompoundShape(BSScene physicsScene)
+    {
+        BulletShape cShape = physicsScene.PE.CreateCompoundShape(physicsScene.World, false);
+        return cShape;
+    }
+    // Sometimes we have a pointer to a collision shape but don't know what type it is.
+    // Figure out type and call the correct dereference routine.
+    // Called at taint-time.
+    private void DereferenceAnonCollisionShape(BSScene physicsScene, BulletShape pShape)
+    {
+        // TODO: figure a better way to go through all the shape types and find a possible instance.
+        BSShapeMesh meshDesc;
+        if (BSShapeMesh.TryGetMeshByPtr(pShape, out meshDesc))
+        {
+            meshDesc.Dereference(physicsScene);
+        }
+        else
+        {
+            BSShapeHull hullDesc;
+            if (BSShapeHull.TryGetHullByPtr(pShape, out hullDesc))
+            {
+                hullDesc.Dereference(physicsScene);
+            }
+            else
+            {
+                BSShapeConvexHull chullDesc;
+                if (BSShapeConvexHull.TryGetHullByPtr(pShape, out chullDesc))
+                {
+                    chullDesc.Dereference(physicsScene);
+                }
+                else
+                {
+                    BSShapeGImpact gImpactDesc;
+                    if (BSShapeGImpact.TryGetGImpactByPtr(pShape, out gImpactDesc))
+                    {
+                        gImpactDesc.Dereference(physicsScene);
+                    }
+                    else
+                    {
+                        // Didn't find it in the lists of specific types. It could be compound.
+                        if (physicsScene.PE.IsCompound(pShape))
+                        {
+                            BSShapeCompound recursiveCompound = new BSShapeCompound(pShape);
+                            recursiveCompound.Dereference(physicsScene);
+                        }
+                        else
+                        {
+                            // If none of the above, maybe it is a simple native shape.
+                            if (physicsScene.PE.IsNativeShape(pShape))
+                            {
+                                BSShapeNative nativeShape = new BSShapeNative(pShape);
+                                nativeShape.Dereference(physicsScene);
+                            }
+                        }
+                    }
+                }
+            }
+        }
     }
-    public override void Dereference(BSScene physicsScene) { }
 }
 
+// ============================================================================================================
+public class BSShapeConvexHull : BSShape
+{
+    private static string LogHeader = "[BULLETSIM SHAPE CONVEX HULL]";
+    public static Dictionary<System.UInt64, BSShapeConvexHull> ConvexHulls = new Dictionary<System.UInt64, BSShapeConvexHull>();
+
+    public BSShapeConvexHull(BulletShape pShape) : base(pShape)
+    {
+    }
+    public static BSShape GetReference(BSScene physicsScene, bool forceRebuild, BSPhysObject prim)
+    {
+        float lod;
+        System.UInt64 newMeshKey = BSShape.ComputeShapeKey(prim.Size, prim.BaseShape, out lod);
+
+        physicsScene.DetailLog("{0},BSShapeConvexHull,getReference,newKey={1},size={2},lod={3}",
+                                prim.LocalID, newMeshKey.ToString("X"), prim.Size, lod);
+
+        BSShapeConvexHull retConvexHull = null;
+        lock (ConvexHulls)
+        {
+            if (ConvexHulls.TryGetValue(newMeshKey, out retConvexHull))
+            {
+                // The mesh has already been created. Return a new reference to same.
+                retConvexHull.IncrementReference();
+            }
+            else
+            {
+                retConvexHull = new BSShapeConvexHull(new BulletShape());
+                BulletShape convexShape = null;
+
+                // Get a handle to a mesh to build the hull from
+                BSShape baseMesh = BSShapeMesh.GetReference(physicsScene, false /* forceRebuild */, prim);
+                if (baseMesh.physShapeInfo.isNativeShape)
+                {
+                    // We get here if the mesh was not creatable. Could be waiting for an asset from the disk.
+                    // In the short term, we return the native shape and a later ForceBodyShapeRebuild should
+                    //     get back to this code with a buildable mesh.
+                    // TODO: not sure the temp native shape is freed when the mesh is rebuilt. When does this get freed?
+                    convexShape = baseMesh.physShapeInfo;
+                }
+                else
+                {
+                    convexShape = physicsScene.PE.BuildConvexHullShapeFromMesh(physicsScene.World, baseMesh.physShapeInfo);
+                    convexShape.shapeKey = newMeshKey;
+                    ConvexHulls.Add(convexShape.shapeKey, retConvexHull);
+                }
+
+                // Done with the base mesh
+                baseMesh.Dereference(physicsScene);
+
+                retConvexHull.physShapeInfo = convexShape;
+            }
+        }
+        return retConvexHull;
+    }
+    public override BSShape GetReference(BSScene physicsScene, BSPhysObject prim)
+    {
+        // Calling this reference means we want another handle to an existing shape
+        //     (usually linksets) so return this copy.
+        IncrementReference();
+        return this;
+    }
+    // Dereferencing a compound shape releases the hold on all the child shapes.
+    public override void Dereference(BSScene physicsScene)
+    {
+        lock (ConvexHulls)
+        {
+            this.DecrementReference();
+            physicsScene.DetailLog("{0},BSShapeConvexHull.Dereference,shape={1}", BSScene.DetailLogZero, this);
+            // TODO: schedule aging and destruction of unused meshes.
+        }
+    }
+    // Loop through all the known hulls and return the description based on the physical address.
+    public static bool TryGetHullByPtr(BulletShape pShape, out BSShapeConvexHull outHull)
+    {
+        bool ret = false;
+        BSShapeConvexHull foundDesc = null;
+        lock (ConvexHulls)
+        {
+            foreach (BSShapeConvexHull sh in ConvexHulls.Values)
+            {
+                if (sh.physShapeInfo.ReferenceSame(pShape))
+                {
+                    foundDesc = sh;
+                    ret = true;
+                    break;
+                }
+
+            }
+        }
+        outHull = foundDesc;
+        return ret;
+    }
+}
+// ============================================================================================================
+public class BSShapeGImpact : BSShape
+{
+    private static string LogHeader = "[BULLETSIM SHAPE GIMPACT]";
+    public static Dictionary<System.UInt64, BSShapeGImpact> GImpacts = new Dictionary<System.UInt64, BSShapeGImpact>();
+
+    public BSShapeGImpact(BulletShape pShape) : base(pShape)
+    {
+    }
+    public static BSShape GetReference(BSScene physicsScene, bool forceRebuild, BSPhysObject prim)
+    {
+        float lod;
+        System.UInt64 newMeshKey = BSShape.ComputeShapeKey(prim.Size, prim.BaseShape, out lod);
+
+        physicsScene.DetailLog("{0},BSShapeGImpact,getReference,newKey={1},size={2},lod={3}",
+                                prim.LocalID, newMeshKey.ToString("X"), prim.Size, lod);
+
+        BSShapeGImpact retGImpact = null;
+        lock (GImpacts)
+        {
+            if (GImpacts.TryGetValue(newMeshKey, out retGImpact))
+            {
+                // The mesh has already been created. Return a new reference to same.
+                retGImpact.IncrementReference();
+            }
+            else
+            {
+                retGImpact = new BSShapeGImpact(new BulletShape());
+                BulletShape newShape = retGImpact.CreatePhysicalGImpact(physicsScene, prim, newMeshKey, prim.BaseShape, prim.Size, lod);
+
+                // Check to see if mesh was created (might require an asset).
+                newShape = VerifyMeshCreated(physicsScene, newShape, prim);
+                newShape.shapeKey = newMeshKey;
+                if (!newShape.isNativeShape 
+                            || prim.PrimAssetState == BSPhysObject.PrimAssetCondition.FailedMeshing
+                            || prim.PrimAssetState == BSPhysObject.PrimAssetCondition.FailedAssetFetch)
+                {
+                    // If a mesh was what was created, remember the built shape for later sharing.
+                    // Also note that if meshing failed we put it in the mesh list as there is nothing
+                    //         else to do about the mesh.
+                    GImpacts.Add(newMeshKey, retGImpact);
+                }
+
+                retGImpact.physShapeInfo = newShape;
+            }
+        }
+        return retGImpact;
+    }
+
+    private BulletShape CreatePhysicalGImpact(BSScene physicsScene, BSPhysObject prim, System.UInt64 newMeshKey,
+                                            PrimitiveBaseShape pbs, OMV.Vector3 size, float lod)
+    {
+        return BSShapeMesh.CreatePhysicalMeshShape(physicsScene, prim, newMeshKey, pbs, size, lod,
+                            (w, iC, i, vC, v) => physicsScene.PE.CreateGImpactShape(w, iC, i, vC, v) );
+    }
+
+    public override BSShape GetReference(BSScene pPhysicsScene, BSPhysObject pPrim)
+    {
+        BSShape ret = null;
+        // If the underlying shape is native, the actual shape has not been build (waiting for asset)
+        //     and we must create a copy of the native shape since they are never shared.
+        if (physShapeInfo.HasPhysicalShape && physShapeInfo.isNativeShape)
+        {
+            // TODO: decide when the native shapes should be freed. Check in Dereference?
+            ret = BSShapeNative.GetReference(pPhysicsScene, pPrim, BSPhysicsShapeType.SHAPE_BOX, FixedShapeKey.KEY_BOX);
+        }
+        else
+        {
+            // Another reference to this shape is just counted.
+            IncrementReference();
+            ret = this;
+        }
+        return ret;
+    }
+    // Dereferencing a compound shape releases the hold on all the child shapes.
+    public override void Dereference(BSScene physicsScene)
+    {
+        lock (GImpacts)
+        {
+            this.DecrementReference();
+            physicsScene.DetailLog("{0},BSShapeGImpact.Dereference,shape={1}", BSScene.DetailLogZero, this);
+            // TODO: schedule aging and destruction of unused meshes.
+        }
+    }
+    // Loop through all the known hulls and return the description based on the physical address.
+    public static bool TryGetGImpactByPtr(BulletShape pShape, out BSShapeGImpact outHull)
+    {
+        bool ret = false;
+        BSShapeGImpact foundDesc = null;
+        lock (GImpacts)
+        {
+            foreach (BSShapeGImpact sh in GImpacts.Values)
+            {
+                if (sh.physShapeInfo.ReferenceSame(pShape))
+                {
+                    foundDesc = sh;
+                    ret = true;
+                    break;
+                }
+
+            }
+        }
+        outHull = foundDesc;
+        return ret;
+    }
+}
+
+// ============================================================================================================
 public class BSShapeAvatar : BSShape
 {
     private static string LogHeader = "[BULLETSIM SHAPE AVATAR]";
     public BSShapeAvatar() : base()
     {
     }
-    public static BSShape GetReference(BSPhysObject prim) 
-    { 
+    public static BSShape GetReference(BSPhysObject prim)
+    {
+        return new BSShapeNull();
+    }
+    public override BSShape GetReference(BSScene pPhysicsScene, BSPhysObject pPrim)
+    {
         return new BSShapeNull();
     }
     public override void Dereference(BSScene physicsScene) { }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs
index e4fecc3..c7deb4e 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainHeightmap.cs
@@ -68,7 +68,7 @@ public sealed class BSTerrainHeightmap : BSTerrainPhys
 
     // This minCoords and maxCoords passed in give the size of the terrain (min and max Z
     //         are the high and low points of the heightmap).
-    public BSTerrainHeightmap(BSScene physicsScene, Vector3 regionBase, uint id, float[] initialMap, 
+    public BSTerrainHeightmap(BSScene physicsScene, Vector3 regionBase, uint id, float[] initialMap,
                                                     Vector3 minCoords, Vector3 maxCoords)
         : base(physicsScene, regionBase, id)
     {
@@ -92,7 +92,7 @@ public sealed class BSTerrainHeightmap : BSTerrainPhys
     private void BuildHeightmapTerrain()
     {
         // Create the terrain shape from the mapInfo
-        m_mapInfo.terrainShape = PhysicsScene.PE.CreateTerrainShape( m_mapInfo.ID, 
+        m_mapInfo.terrainShape = m_physicsScene.PE.CreateTerrainShape( m_mapInfo.ID,
                                 new Vector3(m_mapInfo.sizeX, m_mapInfo.sizeY, 0), m_mapInfo.minZ, m_mapInfo.maxZ,
                                 m_mapInfo.heightMap, 1f, BSParam.TerrainCollisionMargin);
 
@@ -103,26 +103,26 @@ public sealed class BSTerrainHeightmap : BSTerrainPhys
         centerPos.Y = m_mapInfo.minCoords.Y + (m_mapInfo.sizeY / 2f);
         centerPos.Z = m_mapInfo.minZ + ((m_mapInfo.maxZ - m_mapInfo.minZ) / 2f);
 
-        m_mapInfo.terrainBody = PhysicsScene.PE.CreateBodyWithDefaultMotionState(m_mapInfo.terrainShape, 
+        m_mapInfo.terrainBody = m_physicsScene.PE.CreateBodyWithDefaultMotionState(m_mapInfo.terrainShape,
                                 m_mapInfo.ID, centerPos, Quaternion.Identity);
 
         // Set current terrain attributes
-        PhysicsScene.PE.SetFriction(m_mapInfo.terrainBody, BSParam.TerrainFriction);
-        PhysicsScene.PE.SetHitFraction(m_mapInfo.terrainBody, BSParam.TerrainHitFraction);
-        PhysicsScene.PE.SetRestitution(m_mapInfo.terrainBody, BSParam.TerrainRestitution);
-        PhysicsScene.PE.SetCollisionFlags(m_mapInfo.terrainBody, CollisionFlags.CF_STATIC_OBJECT);
+        m_physicsScene.PE.SetFriction(m_mapInfo.terrainBody, BSParam.TerrainFriction);
+        m_physicsScene.PE.SetHitFraction(m_mapInfo.terrainBody, BSParam.TerrainHitFraction);
+        m_physicsScene.PE.SetRestitution(m_mapInfo.terrainBody, BSParam.TerrainRestitution);
+        m_physicsScene.PE.SetCollisionFlags(m_mapInfo.terrainBody, CollisionFlags.CF_STATIC_OBJECT);
 
         // Return the new terrain to the world of physical objects
-        PhysicsScene.PE.AddObjectToWorld(PhysicsScene.World, m_mapInfo.terrainBody);
+        m_physicsScene.PE.AddObjectToWorld(m_physicsScene.World, m_mapInfo.terrainBody);
 
         // redo its bounding box now that it is in the world
-        PhysicsScene.PE.UpdateSingleAabb(PhysicsScene.World, m_mapInfo.terrainBody);
+        m_physicsScene.PE.UpdateSingleAabb(m_physicsScene.World, m_mapInfo.terrainBody);
 
         m_mapInfo.terrainBody.collisionType = CollisionType.Terrain;
-        m_mapInfo.terrainBody.ApplyCollisionMask(PhysicsScene);
+        m_mapInfo.terrainBody.ApplyCollisionMask(m_physicsScene);
 
         // Make it so the terrain will not move or be considered for movement.
-        PhysicsScene.PE.ForceActivationState(m_mapInfo.terrainBody, ActivationState.DISABLE_SIMULATION);
+        m_physicsScene.PE.ForceActivationState(m_mapInfo.terrainBody, ActivationState.DISABLE_SIMULATION);
 
         return;
     }
@@ -134,9 +134,9 @@ public sealed class BSTerrainHeightmap : BSTerrainPhys
         {
             if (m_mapInfo.terrainBody.HasPhysicalBody)
             {
-                PhysicsScene.PE.RemoveObjectFromWorld(PhysicsScene.World, m_mapInfo.terrainBody);
+                m_physicsScene.PE.RemoveObjectFromWorld(m_physicsScene.World, m_mapInfo.terrainBody);
                 // Frees both the body and the shape.
-                PhysicsScene.PE.DestroyObject(PhysicsScene.World, m_mapInfo.terrainBody);
+                m_physicsScene.PE.DestroyObject(m_physicsScene.World, m_mapInfo.terrainBody);
             }
         }
         m_mapInfo = null;
@@ -155,7 +155,7 @@ public sealed class BSTerrainHeightmap : BSTerrainPhys
         catch
         {
             // Sometimes they give us wonky values of X and Y. Give a warning and return something.
-            PhysicsScene.Logger.WarnFormat("{0} Bad request for terrain height. terrainBase={1}, pos={2}",
+            m_physicsScene.Logger.WarnFormat("{0} Bad request for terrain height. terrainBase={1}, pos={2}",
                                 LogHeader, m_mapInfo.terrainRegionBase, pos);
             ret = BSTerrainManager.HEIGHT_GETHEIGHT_RET;
         }
@@ -165,7 +165,7 @@ public sealed class BSTerrainHeightmap : BSTerrainPhys
     // The passed position is relative to the base of the region.
     public override float GetWaterLevelAtXYZ(Vector3 pos)
     {
-        return PhysicsScene.SimpleWaterLevel;
+        return m_physicsScene.SimpleWaterLevel;
     }
 }
 }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
index b2fb835..c4807c4 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
@@ -50,14 +50,14 @@ public abstract class BSTerrainPhys : IDisposable
         Mesh        = 1
     }
 
-    public BSScene PhysicsScene { get; private set; }
+    protected BSScene m_physicsScene { get; private set; }
     // Base of the region in world coordinates. Coordinates inside the region are relative to this.
     public Vector3 TerrainBase { get; private set; }
     public uint ID { get; private set; }
 
     public BSTerrainPhys(BSScene physicsScene, Vector3 regionBase, uint id)
     {
-        PhysicsScene = physicsScene;
+        m_physicsScene = physicsScene;
         TerrainBase = regionBase;
         ID = id;
     }
@@ -86,7 +86,7 @@ public sealed class BSTerrainManager : IDisposable
     public Vector3 DefaultRegionSize = new Vector3(Constants.RegionSize, Constants.RegionSize, Constants.RegionHeight);
 
     // The scene that I am part of
-    private BSScene PhysicsScene { get; set; }
+    private BSScene m_physicsScene { get; set; }
 
     // The ground plane created to keep thing from falling to infinity.
     private BulletBody m_groundPlane;
@@ -113,7 +113,7 @@ public sealed class BSTerrainManager : IDisposable
 
     public BSTerrainManager(BSScene physicsScene)
     {
-        PhysicsScene = physicsScene;
+        m_physicsScene = physicsScene;
         m_terrains = new Dictionary<Vector3,BSTerrainPhys>();
 
         // Assume one region of default size
@@ -132,21 +132,21 @@ public sealed class BSTerrainManager : IDisposable
     //    safe to call Bullet in real time. We hope no one is moving prims around yet.
     public void CreateInitialGroundPlaneAndTerrain()
     {
-        DetailLog("{0},BSTerrainManager.CreateInitialGroundPlaneAndTerrain,region={1}", BSScene.DetailLogZero, PhysicsScene.RegionName);
+        DetailLog("{0},BSTerrainManager.CreateInitialGroundPlaneAndTerrain,region={1}", BSScene.DetailLogZero, m_physicsScene.RegionName);
         // The ground plane is here to catch things that are trying to drop to negative infinity
-        BulletShape groundPlaneShape = PhysicsScene.PE.CreateGroundPlaneShape(BSScene.GROUNDPLANE_ID, 1f, BSParam.TerrainCollisionMargin);
-        m_groundPlane = PhysicsScene.PE.CreateBodyWithDefaultMotionState(groundPlaneShape, 
+        BulletShape groundPlaneShape = m_physicsScene.PE.CreateGroundPlaneShape(BSScene.GROUNDPLANE_ID, 1f, BSParam.TerrainCollisionMargin);
+        m_groundPlane = m_physicsScene.PE.CreateBodyWithDefaultMotionState(groundPlaneShape,
                                         BSScene.GROUNDPLANE_ID, Vector3.Zero, Quaternion.Identity);
 
-        PhysicsScene.PE.AddObjectToWorld(PhysicsScene.World, m_groundPlane);
-        PhysicsScene.PE.UpdateSingleAabb(PhysicsScene.World, m_groundPlane);
+        m_physicsScene.PE.AddObjectToWorld(m_physicsScene.World, m_groundPlane);
+        m_physicsScene.PE.UpdateSingleAabb(m_physicsScene.World, m_groundPlane);
         // Ground plane does not move
-        PhysicsScene.PE.ForceActivationState(m_groundPlane, ActivationState.DISABLE_SIMULATION);
+        m_physicsScene.PE.ForceActivationState(m_groundPlane, ActivationState.DISABLE_SIMULATION);
         // Everything collides with the ground plane.
         m_groundPlane.collisionType = CollisionType.Groundplane;
-        m_groundPlane.ApplyCollisionMask(PhysicsScene);
+        m_groundPlane.ApplyCollisionMask(m_physicsScene);
 
-        BSTerrainPhys initialTerrain = new BSTerrainHeightmap(PhysicsScene, Vector3.Zero, BSScene.TERRAIN_ID, DefaultRegionSize);
+        BSTerrainPhys initialTerrain = new BSTerrainHeightmap(m_physicsScene, Vector3.Zero, BSScene.TERRAIN_ID, DefaultRegionSize);
         lock (m_terrains)
         {
             // Build an initial terrain and put it in the world. This quickly gets replaced by the real region terrain.
@@ -157,12 +157,12 @@ public sealed class BSTerrainManager : IDisposable
     // Release all the terrain structures we might have allocated
     public void ReleaseGroundPlaneAndTerrain()
     {
-        DetailLog("{0},BSTerrainManager.ReleaseGroundPlaneAndTerrain,region={1}", BSScene.DetailLogZero, PhysicsScene.RegionName);
+        DetailLog("{0},BSTerrainManager.ReleaseGroundPlaneAndTerrain,region={1}", BSScene.DetailLogZero, m_physicsScene.RegionName);
         if (m_groundPlane.HasPhysicalBody)
         {
-            if (PhysicsScene.PE.RemoveObjectFromWorld(PhysicsScene.World, m_groundPlane))
+            if (m_physicsScene.PE.RemoveObjectFromWorld(m_physicsScene.World, m_groundPlane))
             {
-                PhysicsScene.PE.DestroyObject(PhysicsScene.World, m_groundPlane);
+                m_physicsScene.PE.DestroyObject(m_physicsScene.World, m_groundPlane);
             }
             m_groundPlane.Clear();
         }
@@ -188,7 +188,7 @@ public sealed class BSTerrainManager : IDisposable
         float[] localHeightMap = heightMap;
         // If there are multiple requests for changes to the same terrain between ticks,
         //      only do that last one.
-        PhysicsScene.PostTaintObject("TerrainManager.SetTerrain-"+ m_worldOffset.ToString(), 0, delegate()
+        m_physicsScene.PostTaintObject("TerrainManager.SetTerrain-"+ m_worldOffset.ToString(), 0, delegate()
         {
             if (m_worldOffset != Vector3.Zero && MegaRegionParentPhysicsScene != null)
             {
@@ -199,15 +199,8 @@ public sealed class BSTerrainManager : IDisposable
                 if (MegaRegionParentPhysicsScene is BSScene)
                 {
                     DetailLog("{0},SetTerrain.ToParent,offset={1},worldMax={2}", BSScene.DetailLogZero, m_worldOffset, m_worldMax);
-                    // This looks really odd but this region is passing its terrain to its mega-region root region
-                    //    and the creation of the terrain must happen on the root region's taint thread and not
-                    //    my taint thread.
-                    ((BSScene)MegaRegionParentPhysicsScene).PostTaintObject("TerrainManager.SetTerrain.Mega-" + m_worldOffset.ToString(), 0, delegate()
-                    {
-                        ((BSScene)MegaRegionParentPhysicsScene).TerrainManager.UpdateTerrain(
-                                        BSScene.CHILDTERRAIN_ID, localHeightMap,
-                                        m_worldOffset, m_worldOffset + DefaultRegionSize, true /* inTaintTime */);
-                    });
+                    ((BSScene)MegaRegionParentPhysicsScene).TerrainManager.AddMegaRegionChildTerrain(
+                                        BSScene.CHILDTERRAIN_ID, localHeightMap, m_worldOffset, m_worldOffset + DefaultRegionSize);
                 }
             }
             else
@@ -215,12 +208,23 @@ public sealed class BSTerrainManager : IDisposable
                 // If not doing the mega-prim thing, just change the terrain
                 DetailLog("{0},SetTerrain.Existing", BSScene.DetailLogZero);
 
-                UpdateTerrain(BSScene.TERRAIN_ID, localHeightMap,
-                                    m_worldOffset, m_worldOffset + DefaultRegionSize, true /* inTaintTime */);
+                UpdateTerrain(BSScene.TERRAIN_ID, localHeightMap, m_worldOffset, m_worldOffset + DefaultRegionSize);
             }
         });
     }
 
+    // Another region is calling this region and passing a terrain.
+    // A region that is not the mega-region root will pass its terrain to the root region so the root region
+    //      physics engine will have all the terrains.
+    private void AddMegaRegionChildTerrain(uint id, float[] heightMap, Vector3 minCoords, Vector3 maxCoords)
+    {
+        // Since we are called by another region's thread, the action must be rescheduled onto our processing thread.
+        m_physicsScene.PostTaintObject("TerrainManager.AddMegaRegionChild" + minCoords.ToString(), id, delegate()
+        {
+            UpdateTerrain(id, heightMap, minCoords, maxCoords);
+        });
+    }
+
     // If called for terrain has has not been previously allocated, a new terrain will be built
     //     based on the passed information. The 'id' should be either the terrain id or
     //     BSScene.CHILDTERRAIN_ID. If the latter, a new child terrain ID will be allocated and used.
@@ -230,11 +234,10 @@ public sealed class BSTerrainManager : IDisposable
     //     This call is most often used to update the heightMap and parameters of the terrain.
     // (The above does suggest that some simplification/refactoring is in order.)
     // Called during taint-time.
-    private void UpdateTerrain(uint id, float[] heightMap, 
-                            Vector3 minCoords, Vector3 maxCoords, bool inTaintTime)
+    private void UpdateTerrain(uint id, float[] heightMap, Vector3 minCoords, Vector3 maxCoords)
     {
-        DetailLog("{0},BSTerrainManager.UpdateTerrain,call,id={1},minC={2},maxC={3},inTaintTime={4}",
-                            BSScene.DetailLogZero, id, minCoords, maxCoords, inTaintTime);
+        DetailLog("{0},BSTerrainManager.UpdateTerrain,call,id={1},minC={2},maxC={3}",
+                            BSScene.DetailLogZero, id, minCoords, maxCoords);
 
         // Find high and low points of passed heightmap.
         // The min and max passed in is usually the area objects can be in (maximum
@@ -303,7 +306,7 @@ public sealed class BSTerrainManager : IDisposable
                     newTerrainID = ++m_terrainCount;
 
                 DetailLog("{0},BSTerrainManager.UpdateTerrain:NewTerrain,taint,newID={1},minCoord={2},maxCoord={3}",
-                                            BSScene.DetailLogZero, newTerrainID, minCoords, minCoords);
+                                            BSScene.DetailLogZero, newTerrainID, minCoords, maxCoords);
                 BSTerrainPhys newTerrainPhys = BuildPhysicalTerrain(terrainRegionBase, id, heightMap, minCoords, maxCoords);
                 m_terrains.Add(terrainRegionBase, newTerrainPhys);
 
@@ -315,26 +318,26 @@ public sealed class BSTerrainManager : IDisposable
     // TODO: redo terrain implementation selection to allow other base types than heightMap.
     private BSTerrainPhys BuildPhysicalTerrain(Vector3 terrainRegionBase, uint id, float[] heightMap, Vector3 minCoords, Vector3 maxCoords)
     {
-        PhysicsScene.Logger.DebugFormat("{0} Terrain for {1}/{2} created with {3}", 
-                                            LogHeader, PhysicsScene.RegionName, terrainRegionBase, 
+        m_physicsScene.Logger.DebugFormat("{0} Terrain for {1}/{2} created with {3}",
+                                            LogHeader, m_physicsScene.RegionName, terrainRegionBase,
                                             (BSTerrainPhys.TerrainImplementation)BSParam.TerrainImplementation);
         BSTerrainPhys newTerrainPhys = null;
         switch ((int)BSParam.TerrainImplementation)
         {
             case (int)BSTerrainPhys.TerrainImplementation.Heightmap:
-                newTerrainPhys = new BSTerrainHeightmap(PhysicsScene, terrainRegionBase, id,
+                newTerrainPhys = new BSTerrainHeightmap(m_physicsScene, terrainRegionBase, id,
                                             heightMap, minCoords, maxCoords);
                 break;
             case (int)BSTerrainPhys.TerrainImplementation.Mesh:
-                newTerrainPhys = new BSTerrainMesh(PhysicsScene, terrainRegionBase, id,
+                newTerrainPhys = new BSTerrainMesh(m_physicsScene, terrainRegionBase, id,
                                             heightMap, minCoords, maxCoords);
                 break;
             default:
-                PhysicsScene.Logger.ErrorFormat("{0} Bad terrain implementation specified. Type={1}/{2},Region={3}/{4}",
-                                            LogHeader, 
-                                            (int)BSParam.TerrainImplementation, 
+                m_physicsScene.Logger.ErrorFormat("{0} Bad terrain implementation specified. Type={1}/{2},Region={3}/{4}",
+                                            LogHeader,
+                                            (int)BSParam.TerrainImplementation,
                                             BSParam.TerrainImplementation,
-                                            PhysicsScene.RegionName, terrainRegionBase);
+                                            m_physicsScene.RegionName, terrainRegionBase);
                 break;
         }
         return newTerrainPhys;
@@ -426,8 +429,8 @@ public sealed class BSTerrainManager : IDisposable
         }
         else
         {
-            PhysicsScene.Logger.ErrorFormat("{0} GetTerrainHeightAtXY: terrain not found: region={1}, x={2}, y={3}",
-                    LogHeader, PhysicsScene.RegionName, tX, tY);
+            m_physicsScene.Logger.ErrorFormat("{0} GetTerrainHeightAtXY: terrain not found: region={1}, x={2}, y={3}",
+                    LogHeader, m_physicsScene.RegionName, tX, tY);
             DetailLog("{0},BSTerrainManager.GetTerrainHeightAtXYZ,terrainNotFound,pos={1},base={2}",
                                 BSScene.DetailLogZero, pos, terrainBaseXYZ);
         }
@@ -448,8 +451,8 @@ public sealed class BSTerrainManager : IDisposable
         }
         else
         {
-            PhysicsScene.Logger.ErrorFormat("{0} GetWaterHeightAtXY: terrain not found: pos={1}, terrainBase={2}, height={3}",
-                    LogHeader, PhysicsScene.RegionName, pos, terrainBaseXYZ, ret);
+            m_physicsScene.Logger.ErrorFormat("{0} GetWaterHeightAtXY: terrain not found: pos={1}, terrainBase={2}, height={3}",
+                    LogHeader, m_physicsScene.RegionName, pos, terrainBaseXYZ, ret);
         }
         return ret;
     }
@@ -561,7 +564,7 @@ public sealed class BSTerrainManager : IDisposable
 
     private void DetailLog(string msg, params Object[] args)
     {
-        PhysicsScene.PhysicsLogging.Write(msg, args);
+        m_physicsScene.PhysicsLogging.Write(msg, args);
     }
 }
 }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs
index 2ce1513..e4ca098 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainMesh.cs
@@ -51,7 +51,7 @@ public sealed class BSTerrainMesh : BSTerrainPhys
     BulletShape m_terrainShape;
     BulletBody m_terrainBody;
 
-    public BSTerrainMesh(BSScene physicsScene, Vector3 regionBase, uint id, Vector3 regionSize) 
+    public BSTerrainMesh(BSScene physicsScene, Vector3 regionBase, uint id, Vector3 regionSize)
         : base(physicsScene, regionBase, id)
     {
     }
@@ -62,7 +62,7 @@ public sealed class BSTerrainMesh : BSTerrainPhys
     }
 
     // Create terrain mesh from a heightmap.
-    public BSTerrainMesh(BSScene physicsScene, Vector3 regionBase, uint id, float[] initialMap, 
+    public BSTerrainMesh(BSScene physicsScene, Vector3 regionBase, uint id, float[] initialMap,
                                                     Vector3 minCoords, Vector3 maxCoords)
         : base(physicsScene, regionBase, id)
     {
@@ -80,7 +80,7 @@ public sealed class BSTerrainMesh : BSTerrainPhys
         if (BSParam.TerrainMeshMagnification == 1)
         {
             // If a magnification of one, use the old routine that is tried and true.
-            meshCreationSuccess = BSTerrainMesh.ConvertHeightmapToMesh(PhysicsScene,
+            meshCreationSuccess = BSTerrainMesh.ConvertHeightmapToMesh(m_physicsScene,
                                             initialMap, m_sizeX, m_sizeY,       // input size
                                             Vector3.Zero,                       // base for mesh
                                             out indicesCount, out indices, out verticesCount, out vertices);
@@ -88,7 +88,7 @@ public sealed class BSTerrainMesh : BSTerrainPhys
         else
         {
             // Other magnifications use the newer routine
-            meshCreationSuccess = BSTerrainMesh.ConvertHeightmapToMesh2(PhysicsScene,
+            meshCreationSuccess = BSTerrainMesh.ConvertHeightmapToMesh2(m_physicsScene,
                                             initialMap, m_sizeX, m_sizeY,       // input size
                                             BSParam.TerrainMeshMagnification,
                                             physicsScene.TerrainManager.DefaultRegionSize,
@@ -98,21 +98,21 @@ public sealed class BSTerrainMesh : BSTerrainPhys
         if (!meshCreationSuccess)
         {
             // DISASTER!!
-            PhysicsScene.DetailLog("{0},BSTerrainMesh.create,failedConversionOfHeightmap,id={1}", BSScene.DetailLogZero, ID);
-            PhysicsScene.Logger.ErrorFormat("{0} Failed conversion of heightmap to mesh! base={1}", LogHeader, TerrainBase);
+            m_physicsScene.DetailLog("{0},BSTerrainMesh.create,failedConversionOfHeightmap,id={1}", BSScene.DetailLogZero, ID);
+            m_physicsScene.Logger.ErrorFormat("{0} Failed conversion of heightmap to mesh! base={1}", LogHeader, TerrainBase);
             // Something is very messed up and a crash is in our future.
             return;
         }
 
-        PhysicsScene.DetailLog("{0},BSTerrainMesh.create,meshed,id={1},indices={2},indSz={3},vertices={4},vertSz={5}", 
+        m_physicsScene.DetailLog("{0},BSTerrainMesh.create,meshed,id={1},indices={2},indSz={3},vertices={4},vertSz={5}",
                                 BSScene.DetailLogZero, ID, indicesCount, indices.Length, verticesCount, vertices.Length);
 
-        m_terrainShape = PhysicsScene.PE.CreateMeshShape(PhysicsScene.World, indicesCount, indices, verticesCount, vertices);
+        m_terrainShape = m_physicsScene.PE.CreateMeshShape(m_physicsScene.World, indicesCount, indices, verticesCount, vertices);
         if (!m_terrainShape.HasPhysicalShape)
         {
             // DISASTER!!
-            PhysicsScene.DetailLog("{0},BSTerrainMesh.create,failedCreationOfShape,id={1}", BSScene.DetailLogZero, ID);
-            PhysicsScene.Logger.ErrorFormat("{0} Failed creation of terrain mesh! base={1}", LogHeader, TerrainBase);
+            m_physicsScene.DetailLog("{0},BSTerrainMesh.create,failedCreationOfShape,id={1}", BSScene.DetailLogZero, ID);
+            m_physicsScene.Logger.ErrorFormat("{0} Failed creation of terrain mesh! base={1}", LogHeader, TerrainBase);
             // Something is very messed up and a crash is in our future.
             return;
         }
@@ -120,52 +120,52 @@ public sealed class BSTerrainMesh : BSTerrainPhys
         Vector3 pos = regionBase;
         Quaternion rot = Quaternion.Identity;
 
-        m_terrainBody = PhysicsScene.PE.CreateBodyWithDefaultMotionState(m_terrainShape, ID, pos, rot);
+        m_terrainBody = m_physicsScene.PE.CreateBodyWithDefaultMotionState(m_terrainShape, ID, pos, rot);
         if (!m_terrainBody.HasPhysicalBody)
         {
             // DISASTER!!
-            PhysicsScene.Logger.ErrorFormat("{0} Failed creation of terrain body! base={1}", LogHeader, TerrainBase);
+            m_physicsScene.Logger.ErrorFormat("{0} Failed creation of terrain body! base={1}", LogHeader, TerrainBase);
             // Something is very messed up and a crash is in our future.
             return;
         }
         physicsScene.PE.SetShapeCollisionMargin(m_terrainShape, BSParam.TerrainCollisionMargin);
 
         // Set current terrain attributes
-        PhysicsScene.PE.SetFriction(m_terrainBody, BSParam.TerrainFriction);
-        PhysicsScene.PE.SetHitFraction(m_terrainBody, BSParam.TerrainHitFraction);
-        PhysicsScene.PE.SetRestitution(m_terrainBody, BSParam.TerrainRestitution);
-        PhysicsScene.PE.SetContactProcessingThreshold(m_terrainBody, BSParam.TerrainContactProcessingThreshold);
-        PhysicsScene.PE.SetCollisionFlags(m_terrainBody, CollisionFlags.CF_STATIC_OBJECT);
+        m_physicsScene.PE.SetFriction(m_terrainBody, BSParam.TerrainFriction);
+        m_physicsScene.PE.SetHitFraction(m_terrainBody, BSParam.TerrainHitFraction);
+        m_physicsScene.PE.SetRestitution(m_terrainBody, BSParam.TerrainRestitution);
+        m_physicsScene.PE.SetContactProcessingThreshold(m_terrainBody, BSParam.TerrainContactProcessingThreshold);
+        m_physicsScene.PE.SetCollisionFlags(m_terrainBody, CollisionFlags.CF_STATIC_OBJECT);
 
         // Static objects are not very massive.
-        PhysicsScene.PE.SetMassProps(m_terrainBody, 0f, Vector3.Zero);
+        m_physicsScene.PE.SetMassProps(m_terrainBody, 0f, Vector3.Zero);
 
         // Put the new terrain to the world of physical objects
-        PhysicsScene.PE.AddObjectToWorld(PhysicsScene.World, m_terrainBody);
+        m_physicsScene.PE.AddObjectToWorld(m_physicsScene.World, m_terrainBody);
 
         // Redo its bounding box now that it is in the world
-        PhysicsScene.PE.UpdateSingleAabb(PhysicsScene.World, m_terrainBody);
+        m_physicsScene.PE.UpdateSingleAabb(m_physicsScene.World, m_terrainBody);
 
         m_terrainBody.collisionType = CollisionType.Terrain;
-        m_terrainBody.ApplyCollisionMask(PhysicsScene);
+        m_terrainBody.ApplyCollisionMask(m_physicsScene);
 
         if (BSParam.UseSingleSidedMeshes)
         {
-            PhysicsScene.DetailLog("{0},BSTerrainMesh.settingCustomMaterial,id={1}", BSScene.DetailLogZero, id);
-            PhysicsScene.PE.AddToCollisionFlags(m_terrainBody, CollisionFlags.CF_CUSTOM_MATERIAL_CALLBACK);
+            m_physicsScene.DetailLog("{0},BSTerrainMesh.settingCustomMaterial,id={1}", BSScene.DetailLogZero, id);
+            m_physicsScene.PE.AddToCollisionFlags(m_terrainBody, CollisionFlags.CF_CUSTOM_MATERIAL_CALLBACK);
         }
 
         // Make it so the terrain will not move or be considered for movement.
-        PhysicsScene.PE.ForceActivationState(m_terrainBody, ActivationState.DISABLE_SIMULATION);
+        m_physicsScene.PE.ForceActivationState(m_terrainBody, ActivationState.DISABLE_SIMULATION);
     }
 
     public override void Dispose()
     {
         if (m_terrainBody.HasPhysicalBody)
         {
-            PhysicsScene.PE.RemoveObjectFromWorld(PhysicsScene.World, m_terrainBody);
+            m_physicsScene.PE.RemoveObjectFromWorld(m_physicsScene.World, m_terrainBody);
             // Frees both the body and the shape.
-            PhysicsScene.PE.DestroyObject(PhysicsScene.World, m_terrainBody);
+            m_physicsScene.PE.DestroyObject(m_physicsScene.World, m_terrainBody);
             m_terrainBody.Clear();
             m_terrainShape.Clear();
         }
@@ -185,7 +185,7 @@ public sealed class BSTerrainMesh : BSTerrainPhys
         catch
         {
             // Sometimes they give us wonky values of X and Y. Give a warning and return something.
-            PhysicsScene.Logger.WarnFormat("{0} Bad request for terrain height. terrainBase={1}, pos={2}",
+            m_physicsScene.Logger.WarnFormat("{0} Bad request for terrain height. terrainBase={1}, pos={2}",
                                                 LogHeader, TerrainBase, pos);
             ret = BSTerrainManager.HEIGHT_GETHEIGHT_RET;
         }
@@ -195,7 +195,7 @@ public sealed class BSTerrainMesh : BSTerrainPhys
     // The passed position is relative to the base of the region.
     public override float GetWaterLevelAtXYZ(Vector3 pos)
     {
-        return PhysicsScene.SimpleWaterLevel;
+        return m_physicsScene.SimpleWaterLevel;
     }
 
     // Convert the passed heightmap to mesh information suitable for CreateMeshShape2().
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
index 8012d91..d5060e3 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
@@ -104,11 +104,11 @@ public class BulletShape
 {
     public BulletShape()
     {
-        type = BSPhysicsShapeType.SHAPE_UNKNOWN;
+        shapeType = BSPhysicsShapeType.SHAPE_UNKNOWN;
         shapeKey = (System.UInt64)FixedShapeKey.KEY_NONE;
         isNativeShape = false;
     }
-    public BSPhysicsShapeType type;
+    public BSPhysicsShapeType shapeType;
     public System.UInt64 shapeKey;
     public bool isNativeShape;
 
@@ -133,7 +133,7 @@ public class BulletShape
         buff.Append("<p=");
         buff.Append(AddrString);
         buff.Append(",s=");
-        buff.Append(type.ToString());
+        buff.Append(shapeType.ToString());
         buff.Append(",k=");
         buff.Append(shapeKey.ToString("X"));
         buff.Append(",n=");
@@ -224,42 +224,42 @@ public static class BulletSimData
 // As mentioned above, don't use the CollisionFilterGroups definitions directly in the code
 //     but, instead, use references to this dictionary. Finding and debugging
 //     collision flag problems will be made easier.
-public static Dictionary<CollisionType, CollisionTypeFilterGroup> CollisionTypeMasks 
+public static Dictionary<CollisionType, CollisionTypeFilterGroup> CollisionTypeMasks
             = new Dictionary<CollisionType, CollisionTypeFilterGroup>()
 {
-    { CollisionType.Avatar, 
-                new CollisionTypeFilterGroup(CollisionType.Avatar, 
-                                (uint)CollisionFilterGroups.BCharacterGroup, 
+    { CollisionType.Avatar,
+                new CollisionTypeFilterGroup(CollisionType.Avatar,
+                                (uint)CollisionFilterGroups.BCharacterGroup,
                                 (uint)CollisionFilterGroups.BAllGroup)
     },
-    { CollisionType.Groundplane, 
-                new CollisionTypeFilterGroup(CollisionType.Groundplane, 
-                                (uint)CollisionFilterGroups.BGroundPlaneGroup, 
+    { CollisionType.Groundplane,
+                new CollisionTypeFilterGroup(CollisionType.Groundplane,
+                                (uint)CollisionFilterGroups.BGroundPlaneGroup,
                                 (uint)CollisionFilterGroups.BAllGroup)
     },
-    { CollisionType.Terrain, 
-                new CollisionTypeFilterGroup(CollisionType.Terrain, 
-                                (uint)CollisionFilterGroups.BTerrainGroup, 
+    { CollisionType.Terrain,
+                new CollisionTypeFilterGroup(CollisionType.Terrain,
+                                (uint)CollisionFilterGroups.BTerrainGroup,
                                 (uint)(CollisionFilterGroups.BAllGroup & ~CollisionFilterGroups.BStaticGroup))
     },
-    { CollisionType.Static, 
-                new CollisionTypeFilterGroup(CollisionType.Static, 
-                                (uint)CollisionFilterGroups.BStaticGroup, 
+    { CollisionType.Static,
+                new CollisionTypeFilterGroup(CollisionType.Static,
+                                (uint)CollisionFilterGroups.BStaticGroup,
                                 (uint)(CollisionFilterGroups.BCharacterGroup | CollisionFilterGroups.BSolidGroup))
     },
-    { CollisionType.Dynamic, 
-                new CollisionTypeFilterGroup(CollisionType.Dynamic, 
-                                (uint)CollisionFilterGroups.BSolidGroup, 
+    { CollisionType.Dynamic,
+                new CollisionTypeFilterGroup(CollisionType.Dynamic,
+                                (uint)CollisionFilterGroups.BSolidGroup,
                                 (uint)(CollisionFilterGroups.BAllGroup))
     },
-    { CollisionType.VolumeDetect, 
-                new CollisionTypeFilterGroup(CollisionType.VolumeDetect, 
-                                (uint)CollisionFilterGroups.BSensorTrigger, 
+    { CollisionType.VolumeDetect,
+                new CollisionTypeFilterGroup(CollisionType.VolumeDetect,
+                                (uint)CollisionFilterGroups.BSensorTrigger,
                                 (uint)(~CollisionFilterGroups.BSensorTrigger))
     },
     { CollisionType.LinksetChild,
-                new CollisionTypeFilterGroup(CollisionType.LinksetChild, 
-                                (uint)CollisionFilterGroups.BLinksetChildGroup, 
+                new CollisionTypeFilterGroup(CollisionType.LinksetChild,
+                                (uint)CollisionFilterGroups.BLinksetChildGroup,
                                 (uint)(CollisionFilterGroups.BNoneGroup))
                                 // (uint)(CollisionFilterGroups.BCharacterGroup | CollisionFilterGroups.BSolidGroup))
     },
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt b/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
index 8a15abe..0453376 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt
@@ -1,65 +1,61 @@
-CURRENT PRIORITIES
+CURRENT PROBLEMS TO FIX AND/OR LOOK AT
 =================================================
-Use the HACD convex hull routine in Bullet rather than the C# version.  
-        Speed up hullifying large meshes.
+Vehicle buoyancy. Computed correctly? Possibly creating very large effective mass.
+    Interaction of llSetBuoyancy and vehicle buoyancy. Should be additive?
+    Negative buoyancy computed correctly
+Center-of-gravity
+Computation of mesh mass. How done? How should it be done?
 Enable vehicle border crossings (at least as poorly as ODE)
         Terrain skirts
         Avatar created in previous region and not new region when crossing border
         Vehicle recreated in new sim at small Z value (offset from root value?) (DONE)
-Lock axis
+User settable terrain mesh
+        Allow specifying as convex or concave and use different getHeight functions depending
+Boats, when turning nose down into the water
+        Acts like rotation around Z is also effecting rotation around X and Y
 Deleting a linkset while standing on the root will leave the physical shape of the root behind.
         Not sure if it is because standing on it. Done with large prim linksets.
 Linkset child rotations.
         Nebadon spiral tube has middle sections which are rotated wrong.
         Select linked spiral tube. Delink and note where the middle section ends up.
-Vehicle angular vertical attraction
-vehicle angular banking
-Center-of-gravity
-Vehicle angular deflection
-        Preferred orientation angular correction fix
-when should angular and linear motor targets be zeroed? when selected?
-        Need a vehicle.clear()? Or an 'else' in prestep if not physical.
 Teravus llMoveToTarget script debug
         Mixing of hover, buoyancy/gravity, moveToTarget, into one force
         Setting hover height to zero disables hover even if hover flags are on (from SL wiki)
 limitMotorUp calibration (more down?)
 llRotLookAt
 llLookAt
-Avatars walking up stairs (HALF DONE)
-Avatar movement
-        flying into a wall doesn't stop avatar who keeps appearing to move through the obstacle (DONE)
-        walking up stairs is not calibrated correctly (stairs out of Kepler cabin)
-        avatar capsule rotation completed (NOT DONE - Bullet's capsule shape is not the solution)
+Convert to avatar mesh capsule. Include rotation of capsule.
 Vehicle script tuning/debugging
         Avanti speed script
         Weapon shooter script
 Move material definitions (friction, ...) into simulator.
-Add material densities to the material types.
-Terrain detail: double terrain mesh detail
+osGetPhysicsEngineVerion() and create a version code for the C++ DLL
 One sided meshes? Should terrain be built into a closed shape?
         When meshes get partially wedged into the terrain, they cannot push themselves out.
         It is possible that Bullet processes collisions whether entering or leaving a mesh.
         Ref: http://bulletphysics.org/Bullet/phpBB3/viewtopic.php?t=4869
+Small physical objects do not interact correctly
+    Create chain of .5x.5x.1 torui and make all but top physical so to hang.
+        The chain will fall apart and pairs will dance around on ground
+    Chains of 1x1x.2 will stay connected but will dance.
+    Chains above 2x2x.4 are more stable and get stablier as torui get larger.
 
 VEHICLES TODO LIST:
 =================================================
-Border crossing with linked vehicle causes crash
-        20121129.1411: editting/moving phys object across region boundries causes crash
-            getPos-> btRigidBody::upcast -> getBodyType -> BOOM
-Vehicles (Move smoothly)
+LINEAR_MOTOR_DIRECTION values should be clamped to reasonable numbers.
+        What are the limits in SL?
+        Same for other velocity settings.
+UBit improvements to remove rubber-banding of avatars sitting on vehicle child prims:
+        https://github.com/UbitUmarov/Ubit-opensim
 Some vehicles should not be able to turn if no speed or off ground.
-What to do if vehicle and prim buoyancy differ?
 Cannot edit/move a vehicle being ridden: it jumps back to the origional position.
 Neb car jiggling left and right
         Happens on terrain and any other mesh object. Flat cubes are much smoother.
         This has been reduced but not eliminated.
 Implement referenceFrame for all the motion routines.
-For limitMotorUp, use raycast down to find if vehicle is in the air.
 Verify llGetVel() is returning a smooth and good value for vehicle movement.
 llGetVel() should return the root's velocity if requested in a child prim.
 Implement function efficiency for lineaar and angular motion.
-After getting off a vehicle, the root prim is phantom (can be walked through)
-    Need to force a position update for the root prim after compound shape destruction
 Linkset explosion after three "rides" on Nebadon lite vehicle (LinksetConstraint)
 Remove vehicle angular velocity zeroing in BSPrim.UpdateProperties().
         A kludge that isn't fixing the real problem of Bullet adding extra motion.
@@ -68,11 +64,10 @@ Incorporate inter-relationship of angular corrections. For instance, angularDefl
         creates over-correction and over-shoot and wabbling.
 Vehicle attributes are not restored when a vehicle is rezzed on region creation
         Create vehicle, setup vehicle properties, restart region, vehicle is not reinitialized.
+What to do if vehicle and prim buoyancy differ?
 
 GENERAL TODO LIST:
 =================================================
-Explore btGImpactMeshShape as alternative to convex hulls for simplified physical objects.
-        Regular triangle meshes don't do physical collisions.
 Resitution of a prim works on another prim but not on terrain.
         The dropped prim doesn't bounce properly on the terrain.
 Add a sanity check for PIDTarget location.
@@ -98,29 +93,15 @@ Revisit CollisionMargin. Builders notice the 0.04 spacing between prims.
 Duplicating a physical prim causes old prim to jump away
         Dup a phys prim and the original become unselected and thus interacts w/ selected prim.
 Scenes with hundred of thousands of static objects take a lot of physics CPU time.
-BSPrim.Force should set a continious force on the prim. The force should be
-        applied each tick.  Some limits?
 Gun sending shooter flying.
 Collision margin (gap between physical objects lying on each other)
 Boundry checking (crashes related to crossing boundry)
     Add check for border edge position for avatars and objects.
     Verify the events are created for border crossings.
-Avatar rotation (check out changes to ScenePresence for physical rotation)
-Avatar running (what does phys engine need to do?)
-Small physical objects do not interact correctly
-    Create chain of .5x.5x.1 torui and make all but top physical so to hang.
-        The chain will fall apart and pairs will dance around on ground
-    Chains of 1x1x.2 will stay connected but will dance.
-    Chains above 2x2x.4 are more stable and get stablier as torui get larger.
-Add PID motor for avatar movement (slow to stop, ...)
-setForce should set a constant force. Different than AddImpulse.
-Implement raycast.
 Implement ShapeCollection.Dispose()
-Implement water as a plain so raycasting and collisions can happen with same.
+Implement water as a plain or mesh so raycasting and collisions can happen with same.
 Add collision penetration return
         Add field passed back by BulletSim.dll and fill with info in ManifoldConstact.GetDistance()
-Add osGetPhysicsEngineName() so scripters can tell whether BulletSim or ODE
-        Also osGetPhysicsEngineVerion() maybe.
 Linkset.Position and Linkset.Orientation requre rewrite to properly return
         child position. LinksetConstraint acts like it's at taint time!!
 Implement LockAngularMotion -- implements llSetStatus(ROTATE_AXIS_*, T/F)
@@ -132,9 +113,6 @@ Selecting and deselecting physical objects causes CPU processing time to jump
 Re-implement buoyancy as a separate force on the object rather than diddling gravity.
         Register a pre-step event to add the force.
 More efficient memory usage when passing hull information from BSPrim to BulletSim
-Avatar movement motor check for zero or small movement. Somehow suppress small movements
-        when avatar has stopped and is just standing. Simple test for near zero has
-        the problem of preventing starting up (increase from zero) especially when falling.
 Physical and phantom will drop through the terrain
 
 
@@ -168,6 +146,7 @@ Eliminate collisions between objects in a linkset. (LinksetConstraint)
 
 MORE
 ======================================================
+Compute avatar size and scale correctly. Now it is a bit off from the capsule size.
 Create tests for different interface components
         Have test objects/scripts measure themselves and turn color if correct/bad
         Test functions in SL and calibrate correctness there
@@ -176,7 +155,6 @@ Do we need to do convex hulls all the time? Can complex meshes be left meshes?
         There is some problem with meshes and collisions
         Hulls are not as detailed as meshes. Hulled vehicles insides are different shape.
 Debounce avatar contact so legs don't keep folding up when standing.
-Implement LSL physics controls. Like STATUS_ROTATE_X.
 Add border extensions to terrain to help region crossings and objects leaving region.
 Use a different capsule shape for avatar when sitting
         LL uses a pyrimidal shape scaled by the avatar's bounding box
@@ -209,8 +187,6 @@ Keep avatar scaling correct. http://pennycow.blogspot.fr/2011/07/matter-of-scale
 
 INTERNAL IMPROVEMENT/CLEANUP
 =================================================
-Can the 'inTaintTime' flag be cleaned up and used? For instance, a call to
-        BSScene.TaintedObject() could immediately execute the callback if already in taint time.
 Create the physical wrapper classes (BulletBody, BulletShape) by methods on
         BSAPITemplate and make their actual implementation Bullet engine specific.
         For the short term, just call the existing functions in ShapeCollection.
@@ -344,3 +320,60 @@ Angular motion around Z moves the vehicle in world Z and not vehicle Z in ODE.
         Verify that angular motion specified around Z moves in the vehicle coordinates.
         DONE 20130120: BulletSim properly applies force in vehicle relative coordinates.
 Nebadon vehicles turning funny in arena (DONE)
+Lock axis (DONE 20130401)
+Terrain detail: double terrain mesh detail (DONE)
+Use the HACD convex hull routine in Bullet rather than the C# version.  
+        Speed up hullifying large meshes. (DONE)
+Vehicle ride, get up, ride again. Second time vehicle does not act correctly.
+        Have to rez new vehicle and delete the old to fix situation.
+        (DONE 20130520: normalize rotations)
+Hitting RESET on Nebadon's vehicle while riding causes vehicle to get into odd
+        position state where it will not settle onto ground properly, etc
+        (DONE 20130520: normalize rotations)
+Two of Nebadon vehicles in a sim max the CPU. This is new.
+        (DONE 20130520: two problems: if asset failed to mesh, constantly refetched
+        asset; vehicle was sending too many messages to all linkset members)
+Add material densities to the material types. (WILL NOT BE DONE: not how it is done)
+Avatars walking up stairs (DONE)
+Avatar movement
+        flying into a wall doesn't stop avatar who keeps appearing to move through the obstacle (DONE)
+        walking up stairs is not calibrated correctly (stairs out of Kepler cabin) (DONE)
+        avatar capsule rotation completed (NOT DONE - Bullet's capsule shape is not the solution)
+After getting off a vehicle, the root prim is phantom (can be walked through)
+    Need to force a position update for the root prim after compound shape destruction
+        (DONE)
+Explore btGImpactMeshShape as alternative to convex hulls for simplified physical objects.
+        Regular triangle meshes don't do physical collisions.
+        (DONE: discovered GImpact is VERY CPU intensive)
+Script changing rotation of child prim while vehicle moving (eg turning wheel) causes
+        the wheel to appear to jump back. Looks like sending position from previous update.
+        (DONE: redo of compound linksets fixed problem)
+Refarb compound linkset creation to create a pseudo-root for center-of-mass
+        Let children change their shape to physical indendently and just add shapes to compound
+        (DONE: redo of compound linkset fixed problem)
+Vehicle angular vertical attraction     (DONE: vegaslon code)
+vehicle angular banking (DONE: vegaslon code)
+Vehicle angular deflection      (DONE: vegaslon code)
+        Preferred orientation angular correction fix
+Vehicles (Move smoothly)
+For limitMotorUp, use raycast down to find if vehicle is in the air.
+        (WILL NOT BE DONE: gravity does the job well enough)
+BSPrim.Force should set a continious force on the prim. The force should be
+        applied each tick.  Some limits?
+        (DONE: added physical actors. Implemented SetForce, SetTorque, ...)
+Implement LSL physics controls. Like STATUS_ROTATE_X. (DONE)
+Add osGetPhysicsEngineName() so scripters can tell whether BulletSim or ODE
+Avatar rotation (check out changes to ScenePresence for physical rotation) (DONE)
+Avatar running (what does phys engine need to do?) (DONE: multiplies run factor by walking force)
+setForce should set a constant force. Different than AddImpulse. (DONE)
+Add PID motor for avatar movement (slow to stop, ...) (WNBD: current works ok)
+Avatar movement motor check for zero or small movement. Somehow suppress small movements
+        when avatar has stopped and is just standing. Simple test for near zero has
+        the problem of preventing starting up (increase from zero) especially when falling.
+        (DONE: avatar movement actor knows if standing on stationary object and zeros motion)
+Can the 'inTaintTime' flag be cleaned up and used? For instance, a call to
+        BSScene.TaintedObject() could immediately execute the callback if already in taint time.
+        (DONE)
+
+
+
diff --git a/OpenSim/Region/Physics/BulletSPlugin/Tests/BasicVehicles.cs b/OpenSim/Region/Physics/BulletSPlugin/Tests/BasicVehicles.cs
index 33232bd..48e74eb 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/Tests/BasicVehicles.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/Tests/BasicVehicles.cs
@@ -57,6 +57,8 @@ public class BasicVehicles : OpenSimTestCase
     public void Init()
     {
         Dictionary<string, string> engineParams = new Dictionary<string, string>();
+        engineParams.Add("VehicleEnableAngularVerticalAttraction", "true");
+        engineParams.Add("VehicleAngularVerticalAttractionAlgorithm", "1");
         PhysicsScene = BulletSimTestsUtil.CreateBasicPhysicsEngine(engineParams);
 
         PrimitiveBaseShape pbs = PrimitiveBaseShape.CreateSphere();
@@ -114,21 +116,25 @@ public class BasicVehicles : OpenSimTestCase
         //    Instead the appropriate values are set and calls are made just the parts of the
         //    controller we want to exercise. Stepping the physics engine then applies
         //    the actions of that one feature.
-        TestVehicle.VehicleController.ProcessFloatVehicleParam(Vehicle.VERTICAL_ATTRACTION_EFFICIENCY, efficiency);
-        TestVehicle.VehicleController.ProcessFloatVehicleParam(Vehicle.VERTICAL_ATTRACTION_TIMESCALE, timeScale);
-        TestVehicle.VehicleController.enableAngularVerticalAttraction = true;
-
-        TestVehicle.IsPhysical = true;
-        PhysicsScene.ProcessTaints();
-
-        // Step the simulator a bunch of times and vertical attraction should orient the vehicle up
-        for (int ii = 0; ii < simSteps; ii++)
+        BSDynamics vehicleActor = TestVehicle.GetVehicleActor(true /* createIfNone */);
+        if (vehicleActor != null)
         {
-            TestVehicle.VehicleController.ForgetKnownVehicleProperties();
-            TestVehicle.VehicleController.ComputeAngularVerticalAttraction();
-            TestVehicle.VehicleController.PushKnownChanged();
-
-            PhysicsScene.Simulate(simulationTimeStep);
+            vehicleActor.ProcessFloatVehicleParam(Vehicle.VERTICAL_ATTRACTION_EFFICIENCY, efficiency);
+            vehicleActor.ProcessFloatVehicleParam(Vehicle.VERTICAL_ATTRACTION_TIMESCALE, timeScale);
+            // vehicleActor.enableAngularVerticalAttraction = true;
+
+            TestVehicle.IsPhysical = true;
+            PhysicsScene.ProcessTaints();
+
+            // Step the simulator a bunch of times and vertical attraction should orient the vehicle up
+            for (int ii = 0; ii < simSteps; ii++)
+            {
+                vehicleActor.ForgetKnownVehicleProperties();
+                vehicleActor.ComputeAngularVerticalAttraction();
+                vehicleActor.PushKnownChanged();
+
+                PhysicsScene.Simulate(simulationTimeStep);
+            }
         }
 
         TestVehicle.IsPhysical = false;
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index 7cd364b..44bfd42 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -415,6 +415,12 @@ namespace OpenSim.Region.Physics.Manager
         public virtual PhysicsActor ParentActor { get { return this; } }
         
 
+        // Extendable interface for new, physics engine specific operations
+        public virtual object Extension(string pFunct, params object[] pParams)
+        {
+            // A NOP of the physics engine does not implement this feature
+            return null;
+        }
     }
 
     public class NullPhysicsActor : PhysicsActor
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 20a70b4..dd9bbc1 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -25,10 +25,13 @@
  * 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 OpenSim.Framework;
 using OpenMetaverse;
 
@@ -386,5 +389,12 @@ namespace OpenSim.Region.Physics.Manager
         {
             return 0;
         }
+
+        // Extendable interface for new, physics engine specific operations
+        public virtual object Extension(string pFunct, params object[] pParams)
+        {
+            // A NOP if the extension thing is not implemented by the physics engine
+            return null;
+        }
     }
 }
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index d181b78..16d65eb 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -64,6 +64,7 @@ namespace OpenSim.Region.Physics.Meshing
     public class Meshmerizer : IMesher
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static string LogHeader = "[MESH]";
 
         // 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
@@ -72,6 +73,8 @@ namespace OpenSim.Region.Physics.Meshing
 #else
         private const string baseDir = null; //"rawFiles";
 #endif
+        // If 'true', lots of DEBUG logging of asset parsing details
+        private bool debugDetail = false;
 
         private bool cacheSculptMaps = true;
         private string decodedSculptMapPath = null;
@@ -79,6 +82,9 @@ namespace OpenSim.Region.Physics.Meshing
 
         private float minSizeForComplexMesh = 0.2f; // prims with all dimensions smaller than this will have a bounding box mesh
 
+        private List<List<Vector3>> mConvexHulls = null;
+        private List<Vector3> mBoundingHull = null;
+
         private Dictionary<ulong, Mesh> m_uniqueMeshes = new Dictionary<ulong, Mesh>();
 
         public Meshmerizer(IConfigSource config)
@@ -88,8 +94,11 @@ namespace OpenSim.Region.Physics.Meshing
 
             decodedSculptMapPath = start_config.GetString("DecodedSculptMapPath","j2kDecodeCache");
             cacheSculptMaps = start_config.GetBoolean("CacheSculptMaps", cacheSculptMaps);
-            if(mesh_config != null)
+            if (mesh_config != null)
+            {
                 useMeshiesPhysicsMesh = mesh_config.GetBoolean("UseMeshiesPhysicsMesh", useMeshiesPhysicsMesh);
+                debugDetail = mesh_config.GetBoolean("LogMeshDetails", debugDetail);
+            }
 
             try
             {
@@ -319,6 +328,9 @@ namespace OpenSim.Region.Physics.Meshing
             faces = new List<Face>();
             OSD meshOsd = null;
 
+            mConvexHulls = null;
+            mBoundingHull = null;
+
             if (primShape.SculptData.Length <= 0)
             {
                 // XXX: At the moment we can not log here since ODEPrim, for instance, ends up triggering this
@@ -355,9 +367,139 @@ namespace OpenSim.Region.Physics.Meshing
                 OSDMap physicsParms = null;
                 OSDMap map = (OSDMap)meshOsd;
                 if (map.ContainsKey("physics_shape"))
+                {
                     physicsParms = (OSDMap)map["physics_shape"]; // old asset format
+                    if (debugDetail) m_log.DebugFormat("{0} prim='{1}': using 'physics_shape' mesh data", LogHeader, primName);
+                }
                 else if (map.ContainsKey("physics_mesh"))
+                {
                     physicsParms = (OSDMap)map["physics_mesh"]; // new asset format
+                    if (debugDetail) m_log.DebugFormat("{0} prim='{1}':using 'physics_mesh' mesh data", LogHeader, primName);
+                }
+                else if (map.ContainsKey("medium_lod"))
+                {
+                    physicsParms = (OSDMap)map["medium_lod"]; // if no physics mesh, try to fall back to medium LOD display mesh
+                    if (debugDetail) m_log.DebugFormat("{0} prim='{1}':using 'medium_lod' mesh data", LogHeader, primName);
+                }
+                else if (map.ContainsKey("high_lod"))
+                {
+                    physicsParms = (OSDMap)map["high_lod"]; // if all else fails, use highest LOD display mesh and hope it works :)
+                    if (debugDetail) m_log.DebugFormat("{0} prim='{1}':using 'high_lod' mesh data", LogHeader, primName);
+                }
+
+                if (map.ContainsKey("physics_convex"))
+                { // pull this out also in case physics engine can use it
+                    OSD convexBlockOsd = null;
+                    try
+                    {
+                        OSDMap convexBlock = (OSDMap)map["physics_convex"];
+                        {
+                            int convexOffset = convexBlock["offset"].AsInteger() + (int)start;
+                            int convexSize = convexBlock["size"].AsInteger();
+
+                            byte[] convexBytes = new byte[convexSize];
+                            
+                            System.Buffer.BlockCopy(primShape.SculptData, convexOffset, convexBytes, 0, convexSize);
+                            
+                            try
+                            {
+                                convexBlockOsd = DecompressOsd(convexBytes);
+                            }
+                            catch (Exception e)
+                            {
+                                m_log.ErrorFormat("{0} prim='{1}': exception decoding convex block: {2}", LogHeader, primName, e);
+                                //return false;
+                            }
+                        }
+                        
+                        if (convexBlockOsd != null && convexBlockOsd is OSDMap)
+                        {
+                            convexBlock = convexBlockOsd as OSDMap;
+
+                            if (debugDetail)
+                            {
+                                string keys = LogHeader + " keys found in convexBlock: ";
+                                foreach (KeyValuePair<string, OSD> kvp in convexBlock)
+                                    keys += "'" + kvp.Key + "' ";
+                                m_log.Debug(keys);
+                            }
+
+                            Vector3 min = new Vector3(-0.5f, -0.5f, -0.5f);
+                            if (convexBlock.ContainsKey("Min")) min = convexBlock["Min"].AsVector3();
+                            Vector3 max = new Vector3(0.5f, 0.5f, 0.5f);
+                            if (convexBlock.ContainsKey("Max")) max = convexBlock["Max"].AsVector3();
+
+                            List<Vector3> boundingHull = null;
+
+                            if (convexBlock.ContainsKey("BoundingVerts"))
+                            {
+                                byte[] boundingVertsBytes = convexBlock["BoundingVerts"].AsBinary();
+                                boundingHull = new List<Vector3>();
+                                for (int i = 0; i < boundingVertsBytes.Length; )
+                                {
+                                    ushort uX = Utils.BytesToUInt16(boundingVertsBytes, i); i += 2;
+                                    ushort uY = Utils.BytesToUInt16(boundingVertsBytes, i); i += 2;
+                                    ushort uZ = Utils.BytesToUInt16(boundingVertsBytes, i); i += 2;
+
+                                    Vector3 pos = new Vector3(
+                                        Utils.UInt16ToFloat(uX, min.X, max.X),
+                                        Utils.UInt16ToFloat(uY, min.Y, max.Y),
+                                        Utils.UInt16ToFloat(uZ, min.Z, max.Z)
+                                    );
+
+                                    boundingHull.Add(pos);
+                                }
+
+                                mBoundingHull = boundingHull;
+                                if (debugDetail) m_log.DebugFormat("{0} prim='{1}': parsed bounding hull. nVerts={2}", LogHeader, primName, mBoundingHull.Count);
+                            }
+
+                            if (convexBlock.ContainsKey("HullList"))
+                            {
+                                byte[] hullList = convexBlock["HullList"].AsBinary();
+
+                                byte[] posBytes = convexBlock["Positions"].AsBinary();
+
+                                List<List<Vector3>> hulls = new List<List<Vector3>>();
+                                int posNdx = 0;
+
+                                foreach (byte cnt in hullList)
+                                {
+                                    int count = cnt == 0 ? 256 : cnt;
+                                    List<Vector3> hull = new List<Vector3>();
+
+                                    for (int i = 0; i < count; i++)
+                                    {
+                                        ushort uX = Utils.BytesToUInt16(posBytes, posNdx); posNdx += 2;
+                                        ushort uY = Utils.BytesToUInt16(posBytes, posNdx); posNdx += 2;
+                                        ushort uZ = Utils.BytesToUInt16(posBytes, posNdx); posNdx += 2;
+
+                                        Vector3 pos = new Vector3(
+                                            Utils.UInt16ToFloat(uX, min.X, max.X),
+                                            Utils.UInt16ToFloat(uY, min.Y, max.Y),
+                                            Utils.UInt16ToFloat(uZ, min.Z, max.Z)
+                                        );
+
+                                        hull.Add(pos);
+                                    }
+
+                                    hulls.Add(hull);
+                                }
+
+                                mConvexHulls = hulls;
+                                if (debugDetail) m_log.DebugFormat("{0} prim='{1}': parsed hulls. nHulls={2}", LogHeader, primName, mConvexHulls.Count);
+                            }
+                            else
+                            {
+                                if (debugDetail) m_log.DebugFormat("{0} prim='{1}' has physics_convex but no HullList", LogHeader, primName);
+                            }
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.WarnFormat("{0} exception decoding convex block: {1}", LogHeader, e);
+                    }
+                }
 
                 if (physicsParms == null)
                 {
@@ -374,34 +516,14 @@ namespace OpenSim.Region.Physics.Meshing
                 OSD decodedMeshOsd = new OSD();
                 byte[] meshBytes = new byte[physSize];
                 System.Buffer.BlockCopy(primShape.SculptData, physOffset, meshBytes, 0, physSize);
-//                        byte[] decompressed = new byte[physSize * 5];
+                //                        byte[] decompressed = new byte[physSize * 5];
                 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);
-                            }
-                        }
-                    }
+                    decodedMeshOsd = DecompressOsd(meshBytes);
                 }
                 catch (Exception e)
                 {
-                    m_log.Error("[MESH]: exception decoding physical mesh: " + e.ToString());
+                    m_log.ErrorFormat("{0} prim='{1}': exception decoding physical mesh: {2}", LogHeader, primName, e);
                     return false;
                 }
 
@@ -410,7 +532,7 @@ namespace OpenSim.Region.Physics.Meshing
                 // 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));
+                    //                            Console.WriteLine("decodedMeshOsd for {0} - {1}", primName, Util.GetFormattedXml(decodedMeshOsd));
 
                     decodedMeshOsdArray = (OSDArray)decodedMeshOsd;
                     foreach (OSD subMeshOsd in decodedMeshOsdArray)
@@ -418,12 +540,50 @@ namespace OpenSim.Region.Physics.Meshing
                         if (subMeshOsd is OSDMap)
                             AddSubMesh(subMeshOsd as OSDMap, size, coords, faces);
                     }
+                    if (debugDetail)
+                        m_log.DebugFormat("{0} {1}: mesh decoded. offset={2}, size={3}, nCoords={4}, nFaces={5}",
+                                            LogHeader, primName, physOffset, physSize, coords.Count, faces.Count);
                 }
             }
 
             return true;
         }
 
+
+        /// <summary>
+        /// decompresses a gzipped OSD object
+        /// </summary>
+        /// <param name="decodedOsd"></param> the OSD object
+        /// <param name="meshBytes"></param>
+        /// <returns></returns>
+        private static OSD DecompressOsd(byte[] meshBytes)
+        {
+            OSD decodedOsd = null;
+
+            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();
+
+                        decodedOsd = OSDParser.DeserializeLLSDBinary(decompressedBuf);
+                    }
+                }
+            }
+            return decodedOsd;
+        }
+
         /// <summary>
         /// Generate the co-ords and faces necessary to construct a mesh from the sculpt data the accompanies a prim.
         /// </summary>
@@ -700,6 +860,45 @@ namespace OpenSim.Region.Physics.Meshing
             return true;
         }
 
+        /// <summary>
+        /// temporary prototype code - please do not use until the interface has been finalized!
+        /// </summary>
+        /// <param name="size">value to scale the hull points by</param>
+        /// <returns>a list of vertices in the bounding hull if it exists and has been successfully decoded, otherwise null</returns>
+        public List<Vector3> GetBoundingHull(Vector3 size)
+        {
+            if (mBoundingHull == null)
+                return null;
+
+            List<Vector3> verts = new List<Vector3>();
+            foreach (var vert in mBoundingHull)
+                verts.Add(vert * size);
+
+            return verts;
+        }
+
+        /// <summary>
+        /// temporary prototype code - please do not use until the interface has been finalized!
+        /// </summary>
+        /// <param name="size">value to scale the hull points by</param>
+        /// <returns>a list of hulls if they exist and have been successfully decoded, otherwise null</returns>
+        public List<List<Vector3>> GetConvexHulls(Vector3 size)
+        {
+            if (mConvexHulls == null)
+                return null;
+
+            List<List<Vector3>> hulls = new List<List<Vector3>>();
+            foreach (var hull in mConvexHulls)
+            {
+                List<Vector3> verts = new List<Vector3>();
+                foreach (var vert in hull)
+                    verts.Add(vert * size);
+                hulls.Add(verts);
+            }
+
+            return hulls;
+        }
+
         public IMesh CreateMesh(String primName, PrimitiveBaseShape primShape, Vector3 size, float lod)
         {
             return CreateMesh(primName, primShape, size, lod, false, true);
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index d09aa62..b4b7e7f 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -108,7 +108,6 @@ namespace OpenSim.Region.Physics.OdePlugin
         private Vector3 m_taintAngularLock = Vector3.One;
         private IntPtr Amotor = IntPtr.Zero;
 
-        private object m_assetsLock = new object();
         private bool m_assetFailed = false;
 
         private Vector3 m_PIDTarget;
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 07663b3..7e652fc 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Region.Physics.OdePlugin
     /// </summary>
     public class OdePlugin : IPhysicsPlugin
     {
-        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 
         private OdeScene m_scene;
 
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs
index f424e7f..83732e2 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerIndividualEventForwarder.cs
@@ -51,7 +51,8 @@ namespace OpenSim.Region.RegionCombinerModule
             m_virtScene.UnSubscribeToClientPrimEvents(client);
             m_virtScene.UnSubscribeToClientPrimRezEvents(client);
             m_virtScene.UnSubscribeToClientInventoryEvents(client);
-            ((AttachmentsModule)m_virtScene.AttachmentsModule).UnsubscribeFromClientEvents(client);
+            if(m_virtScene.AttachmentsModule != null)
+                ((AttachmentsModule)m_virtScene.AttachmentsModule).UnsubscribeFromClientEvents(client);
             //m_virtScene.UnSubscribeToClientTeleportEvents(client);
             m_virtScene.UnSubscribeToClientScriptEvents(client);
             
@@ -66,7 +67,8 @@ namespace OpenSim.Region.RegionCombinerModule
             client.OnRezObject += LocalRezObject;
             
             m_rootScene.SubscribeToClientInventoryEvents(client);
-            ((AttachmentsModule)m_rootScene.AttachmentsModule).SubscribeToClientEvents(client);
+            if (m_rootScene.AttachmentsModule != null)
+                ((AttachmentsModule)m_rootScene.AttachmentsModule).SubscribeToClientEvents(client);
             //m_rootScene.SubscribeToClientTeleportEvents(client);
             m_rootScene.SubscribeToClientScriptEvents(client);
             
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
index b4abc1d..4bf2a82 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerLargeLandChannel.cs
@@ -27,6 +27,8 @@
 
 using System;
 using System.Collections.Generic;
+using System.Reflection;
+using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
@@ -34,10 +36,10 @@ using OpenSim.Region.CoreModules.World.Land;
 
 namespace OpenSim.Region.RegionCombinerModule
 {
-public class RegionCombinerLargeLandChannel : ILandChannel
+    public class RegionCombinerLargeLandChannel : ILandChannel
     {
-        // private static readonly ILog m_log =
-        //     LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         private RegionData RegData;
         private ILandChannel RootRegionLandChannel;
         private readonly List<RegionData> RegionConnections;
@@ -75,40 +77,51 @@ public class RegionCombinerLargeLandChannel : ILandChannel
 
         public ILandObject GetLandObject(int x, int y)
         {
-            //m_log.DebugFormat("[BIGLANDTESTINT]: <{0},{1}>", x, y);
-
-            if (x > 0 && x <= (int)Constants.RegionSize && y > 0 && y <= (int)Constants.RegionSize)
-            {
-                return RootRegionLandChannel.GetLandObject(x, y);
-            }
-            else
-            {
-                int offsetX = (x / (int)Constants.RegionSize);
-                int offsetY = (y / (int)Constants.RegionSize);
-                offsetX *= (int)Constants.RegionSize;
-                offsetY *= (int)Constants.RegionSize;
-
-                foreach (RegionData regionData in RegionConnections)
-                {
-                    if (regionData.Offset.X == offsetX && regionData.Offset.Y == offsetY)
-                    {
-                        return regionData.RegionScene.LandChannel.GetLandObject(x - offsetX, y - offsetY);
-                    }
-                }
-                ILandObject obj = new LandObject(UUID.Zero, false, RegData.RegionScene);
-                obj.LandData.Name = "NO LAND";
-                return obj;
-            }
+            return GetLandObject((float)x, (float)y);
+
+//            m_log.DebugFormat("[BIGLANDTESTINT]: <{0},{1}>", x, y);
+//
+//            if (x > 0 && x <= (int)Constants.RegionSize && y > 0 && y <= (int)Constants.RegionSize)
+//            {
+//                return RootRegionLandChannel.GetLandObject(x, y);
+//            }
+//            else
+//            {
+//                int offsetX = (x / (int)Constants.RegionSize);
+//                int offsetY = (y / (int)Constants.RegionSize);
+//                offsetX *= (int)Constants.RegionSize;
+//                offsetY *= (int)Constants.RegionSize;
+//
+//                foreach (RegionData regionData in RegionConnections)
+//                {
+//                    if (regionData.Offset.X == offsetX && regionData.Offset.Y == offsetY)
+//                    {
+//                        m_log.DebugFormat(
+//                            "[REGION COMBINER LARGE LAND CHANNEL]: Found region {0} at offset {1},{2}", 
+//                            regionData.RegionScene.Name, offsetX, offsetY);
+//
+//                        return regionData.RegionScene.LandChannel.GetLandObject(x - offsetX, y - offsetY);
+//                    }
+//                }
+//                //ILandObject obj = new LandObject(UUID.Zero, false, RegData.RegionScene);
+//                //obj.LandData.Name = "NO LAND";
+//                //return obj;
+//            }
+//
+//            m_log.DebugFormat("[REGION COMBINER LARGE LAND CHANNEL]: No region found at {0},{1}, returning null", x, y);
+//
+//            return null;
         }
 
         public ILandObject GetLandObject(int localID)
         {
+            // XXX: Possibly should be looking in every land channel, not just the root.
             return RootRegionLandChannel.GetLandObject(localID);
         }
 
         public ILandObject GetLandObject(float x, float y)
         {
-            //m_log.DebugFormat("[BIGLANDTESTFLOAT]: <{0},{1}>", x, y);
+//            m_log.DebugFormat("[BIGLANDTESTFLOAT]: <{0},{1}>", x, y);
             
             if (x > 0 && x <= (int)Constants.RegionSize && y > 0 && y <= (int)Constants.RegionSize)
             {
@@ -125,14 +138,22 @@ public class RegionCombinerLargeLandChannel : ILandChannel
                 {
                     if (regionData.Offset.X == offsetX && regionData.Offset.Y == offsetY)
                     {
+//                        m_log.DebugFormat(
+//                            "[REGION COMBINER LARGE LAND CHANNEL]: Found region {0} at offset {1},{2}", 
+//                            regionData.RegionScene.Name, offsetX, offsetY);
+
                         return regionData.RegionScene.LandChannel.GetLandObject(x - offsetX, y - offsetY);
                     }
                 }
 
-                ILandObject obj = new LandObject(UUID.Zero, false, RegData.RegionScene);
-                obj.LandData.Name = "NO LAND";
-                return obj;
+//                ILandObject obj = new LandObject(UUID.Zero, false, RegData.RegionScene);
+//                obj.LandData.Name = "NO LAND";
+//                return obj;
             }
+
+//            m_log.DebugFormat("[REGION COMBINER LARGE LAND CHANNEL]: No region found at {0},{1}, returning null", x, y);
+
+            return null;
         }
 
         public bool IsForcefulBansAllowed()
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
index 35ae44c..b9a217b 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
     public interface IScriptWorkItem
     {
         bool Cancel();
-        void Abort();
+        bool Abort();
 
         /// <summary>
         /// Wait for the work item to complete.
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
index 6879ebb..1e19032 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
@@ -37,6 +37,8 @@ using OpenSim.Region.ScriptEngine.Interfaces;
 using OpenSim.Region.ScriptEngine.Shared;
 using OpenSim.Region.ScriptEngine.Shared.Api.Plugins;
 using Timer=OpenSim.Region.ScriptEngine.Shared.Api.Plugins.Timer;
+using System.Reflection;
+using log4net;
 
 namespace OpenSim.Region.ScriptEngine.Shared.Api
 {
@@ -45,15 +47,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
     /// </summary>
     public class AsyncCommandManager
     {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         private static Thread cmdHandlerThread;
         private static int cmdHandlerThreadCycleSleepms;
 
-        private static List<IScene> m_Scenes = new List<IScene>();
+        /// <summary>
+        /// Lock for reading/writing static components of AsyncCommandManager.
+        /// </summary>
+        /// <remarks>
+        /// This lock exists so that multiple threads from different engines and/or different copies of the same engine
+        /// are prevented from running non-thread safe code (e.g. read/write of lists) concurrently.
+        /// </remarks>
+        private static object staticLock = new object();
+
         private static List<IScriptEngine> m_ScriptEngines =
                 new List<IScriptEngine>();
 
         public IScriptEngine m_ScriptEngine;
-        private IScene m_Scene;
 
         private static Dictionary<IScriptEngine, Dataserver> m_Dataserver =
                 new Dictionary<IScriptEngine, Dataserver>();
@@ -70,67 +81,99 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public Dataserver DataserverPlugin
         {
-            get { return m_Dataserver[m_ScriptEngine]; }
+            get 
+            { 
+                lock (staticLock)
+                    return m_Dataserver[m_ScriptEngine]; 
+            }
         }
 
         public Timer TimerPlugin
         {
-            get { return m_Timer[m_ScriptEngine]; }
+            get 
+            { 
+                lock (staticLock)
+                    return m_Timer[m_ScriptEngine]; 
+            }
         }
 
         public HttpRequest HttpRequestPlugin
         {
-            get { return m_HttpRequest[m_ScriptEngine]; }
+            get 
+            { 
+                lock (staticLock)
+                    return m_HttpRequest[m_ScriptEngine]; 
+            }
         }
 
         public Listener ListenerPlugin
         {
-            get { return m_Listener[m_ScriptEngine]; }
+            get 
+            { 
+                lock (staticLock)
+                    return m_Listener[m_ScriptEngine]; 
+            }
         }
 
         public SensorRepeat SensorRepeatPlugin
         {
-            get { return m_SensorRepeat[m_ScriptEngine]; }
+            get 
+            { 
+                lock (staticLock)
+                    return m_SensorRepeat[m_ScriptEngine]; 
+            }
         }
 
         public XmlRequest XmlRequestPlugin
         {
-            get { return m_XmlRequest[m_ScriptEngine]; }
+            get 
+            { 
+                lock (staticLock)
+                    return m_XmlRequest[m_ScriptEngine]; 
+            }
         }
 
         public IScriptEngine[] ScriptEngines
         {
-            get { return m_ScriptEngines.ToArray(); }
+            get 
+            { 
+                lock (staticLock)
+                    return m_ScriptEngines.ToArray(); 
+            }
         }
 
         public AsyncCommandManager(IScriptEngine _ScriptEngine)
         {
             m_ScriptEngine = _ScriptEngine;
-            m_Scene = m_ScriptEngine.World;
-
-            if (m_Scenes.Count == 0)
-                ReadConfig();
-
-            if (!m_Scenes.Contains(m_Scene))
-                m_Scenes.Add(m_Scene);
-            if (!m_ScriptEngines.Contains(m_ScriptEngine))
-                m_ScriptEngines.Add(m_ScriptEngine);
-
-            // Create instances of all plugins
-            if (!m_Dataserver.ContainsKey(m_ScriptEngine))
-                m_Dataserver[m_ScriptEngine] = new Dataserver(this);
-            if (!m_Timer.ContainsKey(m_ScriptEngine))
-                m_Timer[m_ScriptEngine] = new Timer(this);
-            if (!m_HttpRequest.ContainsKey(m_ScriptEngine))
-                m_HttpRequest[m_ScriptEngine] = new HttpRequest(this);
-            if (!m_Listener.ContainsKey(m_ScriptEngine))
-                m_Listener[m_ScriptEngine] = new Listener(this);
-            if (!m_SensorRepeat.ContainsKey(m_ScriptEngine))
-                m_SensorRepeat[m_ScriptEngine] = new SensorRepeat(this);
-            if (!m_XmlRequest.ContainsKey(m_ScriptEngine))
-                m_XmlRequest[m_ScriptEngine] = new XmlRequest(this);
-
-            StartThread();
+
+            // If there is more than one scene in the simulator or multiple script engines are used on the same region
+            // then more than one thread could arrive at this block of code simultaneously.  However, it cannot be
+            // executed concurrently both because concurrent list operations are not thread-safe and because of other
+            // race conditions such as the later check of cmdHandlerThread == null.
+            lock (staticLock)
+            {
+                if (m_ScriptEngines.Count == 0)
+                    ReadConfig();
+
+                if (!m_ScriptEngines.Contains(m_ScriptEngine))
+                    m_ScriptEngines.Add(m_ScriptEngine);
+
+                // Create instances of all plugins
+                if (!m_Dataserver.ContainsKey(m_ScriptEngine))
+                    m_Dataserver[m_ScriptEngine] = new Dataserver(this);
+                if (!m_Timer.ContainsKey(m_ScriptEngine))
+                    m_Timer[m_ScriptEngine] = new Timer(this);
+                if (!m_HttpRequest.ContainsKey(m_ScriptEngine))
+                    m_HttpRequest[m_ScriptEngine] = new HttpRequest(this);
+                if (!m_Listener.ContainsKey(m_ScriptEngine))
+                    m_Listener[m_ScriptEngine] = new Listener(this);
+                if (!m_SensorRepeat.ContainsKey(m_ScriptEngine))
+                    m_SensorRepeat[m_ScriptEngine] = new SensorRepeat(this);
+                if (!m_XmlRequest.ContainsKey(m_ScriptEngine))
+                    m_XmlRequest[m_ScriptEngine] = new XmlRequest(this);
+
+                StartThread();
+            }
         }
 
         private static void StartThread()
@@ -179,42 +222,43 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 try
                 {
-                    while (true)
-                    {
-                        Thread.Sleep(cmdHandlerThreadCycleSleepms);
+                    Thread.Sleep(cmdHandlerThreadCycleSleepms);
 
-                        DoOneCmdHandlerPass();
+                    DoOneCmdHandlerPass();
 
-                        Watchdog.UpdateThread();
-                    }
+                    Watchdog.UpdateThread();
                 }
-                catch
+                catch (Exception e)
                 {
+                    m_log.Error("[ASYNC COMMAND MANAGER]: Exception in command handler pass: ", e);
                 }
             }
         }
 
         private static void DoOneCmdHandlerPass()
         {
-            // Check HttpRequests
-            m_HttpRequest[m_ScriptEngines[0]].CheckHttpRequests();
+            lock (staticLock)
+            {
+                // Check HttpRequests
+                m_HttpRequest[m_ScriptEngines[0]].CheckHttpRequests();
 
-            // Check XMLRPCRequests
-            m_XmlRequest[m_ScriptEngines[0]].CheckXMLRPCRequests();
+                // Check XMLRPCRequests
+                m_XmlRequest[m_ScriptEngines[0]].CheckXMLRPCRequests();
 
-            foreach (IScriptEngine s in m_ScriptEngines)
-            {
-                // Check Listeners
-                m_Listener[s].CheckListeners();
+                foreach (IScriptEngine s in m_ScriptEngines)
+                {
+                    // Check Listeners
+                    m_Listener[s].CheckListeners();
 
-                // Check timers
-                m_Timer[s].CheckTimerEvents();
+                    // Check timers
+                    m_Timer[s].CheckTimerEvents();
 
-                // Check Sensors
-                m_SensorRepeat[s].CheckSenseRepeaterEvents();
+                    // Check Sensors
+                    m_SensorRepeat[s].CheckSenseRepeaterEvents();
 
-                // Check dataserver
-                m_Dataserver[s].ExpireRequests();
+                    // Check dataserver
+                    m_Dataserver[s].ExpireRequests();
+                }
             }
         }
 
@@ -226,31 +270,35 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public static void RemoveScript(IScriptEngine engine, uint localID, UUID itemID)
         {
             // Remove a specific script
+//            m_log.DebugFormat("[ASYNC COMMAND MANAGER]: Removing facilities for script {0}", itemID);
 
-            // Remove dataserver events
-            m_Dataserver[engine].RemoveEvents(localID, itemID);
+            lock (staticLock)
+            {
+                // Remove dataserver events
+                m_Dataserver[engine].RemoveEvents(localID, itemID);
 
-            // Remove from: Timers
-            m_Timer[engine].UnSetTimerEvents(localID, itemID);
+                // Remove from: Timers
+                m_Timer[engine].UnSetTimerEvents(localID, itemID);
 
-            // Remove from: HttpRequest
-            IHttpRequestModule iHttpReq = engine.World.RequestModuleInterface<IHttpRequestModule>();
-            if (iHttpReq != null)
-                iHttpReq.StopHttpRequest(localID, itemID);
+                // Remove from: HttpRequest
+                IHttpRequestModule iHttpReq = engine.World.RequestModuleInterface<IHttpRequestModule>();
+                if (iHttpReq != null)
+                    iHttpReq.StopHttpRequest(localID, itemID);
 
-            IWorldComm comms = engine.World.RequestModuleInterface<IWorldComm>();
-            if (comms != null)
-                comms.DeleteListener(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);
-            }
+                IXMLRPC xmlrpc = engine.World.RequestModuleInterface<IXMLRPC>();
+                if (xmlrpc != null)
+                {
+                    xmlrpc.DeleteChannels(itemID);
+                    xmlrpc.CancelSRDRequests(itemID);
+                }
 
-            // Remove Sensors
-            m_SensorRepeat[engine].UnSetSenseRepeaterEvents(localID, itemID);
+                // Remove Sensors
+                m_SensorRepeat[engine].UnSetSenseRepeaterEvents(localID, itemID);
+            }
         }
 
         /// <summary>
@@ -260,10 +308,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// <returns></returns>
         public static SensorRepeat GetSensorRepeatPlugin(IScriptEngine engine)
         {
-            if (m_SensorRepeat.ContainsKey(engine))
-                return m_SensorRepeat[engine];
-            else
-                return null;
+            lock (staticLock)
+            {
+                if (m_SensorRepeat.ContainsKey(engine))
+                    return m_SensorRepeat[engine];
+                else
+                    return null;
+            }
         }
 
         /// <summary>
@@ -273,10 +324,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// <returns></returns>
         public static Dataserver GetDataserverPlugin(IScriptEngine engine)
         {
-            if (m_Dataserver.ContainsKey(engine))
-                return m_Dataserver[engine];
-            else
-                return null;
+            lock (staticLock)
+            {
+                if (m_Dataserver.ContainsKey(engine))
+                    return m_Dataserver[engine];
+                else
+                    return null;
+            }
         }
 
         /// <summary>
@@ -286,10 +340,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// <returns></returns>
         public static Timer GetTimerPlugin(IScriptEngine engine)
         {
-            if (m_Timer.ContainsKey(engine))
-                return m_Timer[engine];
-            else
-                return null;
+            lock (staticLock)
+            {
+                if (m_Timer.ContainsKey(engine))
+                    return m_Timer[engine];
+                else
+                    return null;
+            }
         }
 
         /// <summary>
@@ -299,10 +356,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         /// <returns></returns>
         public static Listener GetListenerPlugin(IScriptEngine engine)
         {
-            if (m_Listener.ContainsKey(engine))
-                return m_Listener[engine];
-            else
-                return null;
+            lock (staticLock)
+            {
+                if (m_Listener.ContainsKey(engine))
+                    return m_Listener[engine];
+                else
+                    return null;
+            }
         }
 
         public static void StateChange(IScriptEngine engine, uint localID, UUID itemID)
@@ -332,28 +392,31 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             List<Object> data = new List<Object>();
 
-            Object[] listeners = m_Listener[engine].GetSerializationData(itemID);
-            if (listeners.Length > 0)
+            lock (staticLock)
             {
-                data.Add("listener");
-                data.Add(listeners.Length);
-                data.AddRange(listeners);
-            }
+                Object[] listeners = m_Listener[engine].GetSerializationData(itemID);
+                if (listeners.Length > 0)
+                {
+                    data.Add("listener");
+                    data.Add(listeners.Length);
+                    data.AddRange(listeners);
+                }
 
-            Object[] timers=m_Timer[engine].GetSerializationData(itemID);
-            if (timers.Length > 0)
-            {
-                data.Add("timer");
-                data.Add(timers.Length);
-                data.AddRange(timers);
-            }
+                Object[] timers=m_Timer[engine].GetSerializationData(itemID);
+                if (timers.Length > 0)
+                {
+                    data.Add("timer");
+                    data.Add(timers.Length);
+                    data.AddRange(timers);
+                }
 
-            Object[] sensors = m_SensorRepeat[engine].GetSerializationData(itemID);
-            if (sensors.Length > 0)
-            {
-                data.Add("sensor");
-                data.Add(sensors.Length);
-                data.AddRange(sensors);
+                Object[] sensors = m_SensorRepeat[engine].GetSerializationData(itemID);
+                if (sensors.Length > 0)
+                {
+                    data.Add("sensor");
+                    data.Add(sensors.Length);
+                    data.AddRange(sensors);
+                }
             }
 
             return data.ToArray();
@@ -378,41 +441,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
                     idx+=len;
 
+                    lock (staticLock)
+                    {
                     switch (type)
                     {
-                    case "listener":
-                        m_Listener[engine].CreateFromData(localID, itemID,
-                                                    hostID, item);
-                        break;
-                    case "timer":
-                        m_Timer[engine].CreateFromData(localID, itemID,
-                                                    hostID, item);
-                        break;
-                    case "sensor":
-                        m_SensorRepeat[engine].CreateFromData(localID,
-                                                    itemID, hostID, item);
-                        break;
+                        case "listener":
+                            m_Listener[engine].CreateFromData(localID, itemID,
+                                                        hostID, item);
+                            break;
+                        case "timer":
+                            m_Timer[engine].CreateFromData(localID, itemID,
+                                                        hostID, item);
+                            break;
+                        case "sensor":
+                            m_SensorRepeat[engine].CreateFromData(localID,
+                                                        itemID, hostID, item);
+                            break;
+                        }
                     }
                 }
             }
         }
-
-        #region Check llRemoteData channels
-
-        #endregion
-
-        #region Check llListeners
-
-        #endregion
-
-        /// <summary>
-        /// If set to true then threads and stuff should try to make a graceful exit
-        /// </summary>
-        public bool PleaseShutdown
-        {
-            get { return _PleaseShutdown; }
-            set { _PleaseShutdown = value; }
-        }
-        private bool _PleaseShutdown = false;
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index e8502ac..f05aaa9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1664,6 +1664,75 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             m_host.SetFaceColorAlpha(face, color, null);
         }
 
+        /*
+        public void llSetContentType(LSL_Key id, LSL_Integer type)
+        {
+            m_host.AddScriptLPS(1);
+
+            if (m_UrlModule == null)
+                return;
+
+            // Make sure the content type is text/plain to start with
+            m_UrlModule.HttpContentType(new UUID(id), "text/plain");
+
+            // Is the object owner online and in the region
+            ScenePresence agent = World.GetScenePresence(m_host.ParentGroup.OwnerID);
+            if (agent == null || agent.IsChildAgent)
+                return;  // Fail if the owner is not in the same region
+
+            // Is it the embeded browser?
+            string userAgent = m_UrlModule.GetHttpHeader(new UUID(id), "user-agent");
+            if (userAgent.IndexOf("SecondLife") < 0)
+                return; // Not the embedded browser. Is this check good enough?
+
+            // Use the IP address of the client and check against the request
+            // seperate logins from the same IP will allow all of them to get non-text/plain as long
+            // as the owner is in the region. Same as SL!
+            string logonFromIPAddress = agent.ControllingClient.RemoteEndPoint.Address.ToString();
+            string requestFromIPAddress = m_UrlModule.GetHttpHeader(new UUID(id), "remote_addr");
+            //m_log.Debug("IP from header='" + requestFromIPAddress + "' IP from endpoint='" + logonFromIPAddress + "'");
+            if (requestFromIPAddress == null || requestFromIPAddress.Trim() == "")
+                return;
+            if (logonFromIPAddress == null || logonFromIPAddress.Trim() == "")
+                return;
+
+            // If the request isnt from the same IP address then the request cannot be from the owner
+            if (!requestFromIPAddress.Trim().Equals(logonFromIPAddress.Trim()))
+                return;
+
+            switch (type)
+            {
+                case ScriptBaseClass.CONTENT_TYPE_HTML:
+                    m_UrlModule.HttpContentType(new UUID(id), "text/html");
+                    break;
+                case ScriptBaseClass.CONTENT_TYPE_XML:
+                    m_UrlModule.HttpContentType(new UUID(id), "application/xml");
+                    break;
+                case ScriptBaseClass.CONTENT_TYPE_XHTML:
+                    m_UrlModule.HttpContentType(new UUID(id), "application/xhtml+xml");
+                    break;
+                case ScriptBaseClass.CONTENT_TYPE_ATOM:
+                    m_UrlModule.HttpContentType(new UUID(id), "application/atom+xml");
+                    break;
+                case ScriptBaseClass.CONTENT_TYPE_JSON:
+                    m_UrlModule.HttpContentType(new UUID(id), "application/json");
+                    break;
+                case ScriptBaseClass.CONTENT_TYPE_LLSD:
+                    m_UrlModule.HttpContentType(new UUID(id), "application/llsd+xml");
+                    break;
+                case ScriptBaseClass.CONTENT_TYPE_FORM:
+                    m_UrlModule.HttpContentType(new UUID(id), "application/x-www-form-urlencoded");
+                    break;
+                case ScriptBaseClass.CONTENT_TYPE_RSS:
+                    m_UrlModule.HttpContentType(new UUID(id), "application/rss+xml");
+                    break;
+                default:
+                    m_UrlModule.HttpContentType(new UUID(id), "text/plain");
+                    break;
+            }
+        }
+        */
+
         public void SetTexGen(SceneObjectPart part, int face,int style)
         {
             if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
@@ -2772,9 +2841,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             // send the sound, once, to all clients in range
             if (m_SoundModule != null)
             {
-                m_SoundModule.SendSound(m_host.UUID,
-                        ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, sound, AssetType.Sound), volume, false, 0,
-                        0, false, false);
+                m_SoundModule.SendSound(
+                    m_host.UUID,
+                    ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, sound, AssetType.Sound), 
+                    volume, false, m_host.SoundQueueing ? (byte)SoundFlags.Queue : (byte)SoundFlags.None,
+                    0, false, false);
             }
         }
 
@@ -5108,6 +5179,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             s = Math.Cos(angle * 0.5);
             t = Math.Sin(angle * 0.5); // temp value to avoid 2 more sin() calcs
+            axis =  LSL_Vector.Norm(axis);
             x = axis.x * t;
             y = axis.y * t;
             z = axis.z * t;
@@ -5115,41 +5187,29 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return new LSL_Rotation(x,y,z,s);
         }
 
-
-        // Xantor 29/apr/2008
-        // converts a Quaternion to X,Y,Z axis rotations
+        /// <summary>
+        /// Returns the axis of rotation for a quaternion
+        /// </summary>
+        /// <returns></returns>
+        /// <param name='rot'></param>
         public LSL_Vector llRot2Axis(LSL_Rotation rot)
         {
             m_host.AddScriptLPS(1);
-            double x,y,z;
 
-            if (rot.s > 1) // normalization needed
-            {
-                double length = Math.Sqrt(rot.x * rot.x + rot.y * rot.y +
-                        rot.z * rot.z + rot.s * rot.s);
-
-                rot.x /= length;
-                rot.y /= length;
-                rot.z /= length;
-                rot.s /= length;
+            if (Math.Abs(rot.s) > 1) // normalization needed
+                rot.Normalize();
 
-            }
-
-            // double angle = 2 * Math.Acos(rot.s);
             double s = Math.Sqrt(1 - rot.s * rot.s);
             if (s < 0.001)
             {
-                x = 1;
-                y = z = 0;
+                return new LSL_Vector(1, 0, 0);
             }
             else
             {
-                x = rot.x / s; // normalise axis
-                y = rot.y / s;
-                z = rot.z / s;
+                double invS = 1.0 / s;
+                if (rot.s < 0) invS = -invS;
+                return new LSL_Vector(rot.x * invS, rot.y * invS, rot.z * invS);
             }
-
-            return new LSL_Vector(x,y,z);
         }
 
 
@@ -5158,18 +5218,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         {
             m_host.AddScriptLPS(1);
 
-            if (rot.s > 1) // normalization needed
-            {
-                double length = Math.Sqrt(rot.x * rot.x + rot.y * rot.y +
-                        rot.z * rot.z + rot.s * rot.s);
-
-                rot.x /= length;
-                rot.y /= length;
-                rot.z /= length;
-                rot.s /= length;
-            }
+            if (Math.Abs(rot.s) > 1) // normalization needed
+                rot.Normalize();
 
             double angle = 2 * Math.Acos(rot.s);
+            if (angle > Math.PI) 
+                angle = 2 * Math.PI - angle;
 
             return angle;
         }
@@ -8255,7 +8309,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                  return null;
 
                              string ph = rules.Data[idx++].ToString();
-                             parentgrp.ScriptSetPhantomStatus(ph.Equals("1"));
+                             part.ParentGroup.ScriptSetPhantomStatus(ph.Equals("1"));
 
                              break;
 
@@ -8308,7 +8362,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                                 return null;
                             string temp = rules.Data[idx++].ToString();
 
-                            parentgrp.ScriptSetTemporaryStatus(temp.Equals("1"));
+                            part.ParentGroup.ScriptSetTemporaryStatus(temp.Equals("1"));
 
                             break;
 
@@ -12673,6 +12727,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llSetSoundQueueing(int queue)
         {
             m_host.AddScriptLPS(1);
+
+            if (m_SoundModule != null)
+                m_SoundModule.SetSoundQueueing(m_host.UUID, queue == ScriptBaseClass.TRUE.value);
         }
 
         public void llCollisionSprite(string impact_sprite)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
index bd776b6..edcdfbc 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/MOD_Api.cs
@@ -319,7 +319,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             
             object[] convertedParms = new object[parms.Length];
             for (int i = 0; i < parms.Length; i++)
-                convertedParms[i] = ConvertFromLSL(parms[i],signature[i], fname);
+                convertedParms[i] = ConvertFromLSL(parms[i], signature[i], fname);
 
             // now call the function, the contract with the function is that it will always return
             // non-null but don't trust it completely
@@ -448,7 +448,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 }
             }
             
-            MODError(String.Format("{1}: parameter type mismatch; expecting {0}",type.Name, fname));
+            MODError(String.Format("{0}: parameter type mismatch; expecting {1}, type(parm)={2}", fname, type.Name, lslparm.GetType()));
             return null;
         }
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index a47e452..44a7c14 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -353,6 +353,11 @@ 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);
+
+                // Don't proceed if the avatar for this attachment has since been removed from the scene.
+                if (avatar == null)
+                    return sensedEntities;
+
                 fromRegionPos = avatar.AbsolutePosition;
                 q = avatar.Rotation;
             }
@@ -483,6 +488,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);
+
+                // Don't proceed if the avatar for this attachment has since been removed from the scene.
                 if (avatar == null)
                     return sensedEntities;
                 fromRegionPos = avatar.AbsolutePosition;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index daf89e5..d211a2b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -332,7 +332,6 @@ 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);
@@ -340,9 +339,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
               void llSetCameraParams(LSL_List rules);
               void llSetClickAction(int action);
               void llSetColor(LSL_Vector color, int face);
+              void llSetContentType(LSL_Key id, LSL_Integer type);
               void llSetDamage(double damage);
               void llSetForce(LSL_Vector force, int local);
               void llSetForceAndTorque(LSL_Vector force, LSL_Vector torque, int local);
+              void llSetAngularVelocity(LSL_Vector angularVelocity, int local);
               void llSetHoverHeight(double height, int water, double tau);
               void llSetInventoryPermMask(string item, int mask, int value);
               void llSetLinkAlpha(int linknumber, double alpha, int face);
@@ -383,7 +384,6 @@ 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);
@@ -434,6 +434,5 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
               void llSetKeyframedMotion(LSL_List frames, LSL_List options);
           LSL_List GetPrimitiveParamsEx(LSL_Key prim, LSL_List rules);
           LSL_List llGetPhysicsMaterial();
-              void llSetContentType(LSL_Key id, LSL_Integer content_type);
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 6efa73f..15b21ac 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -361,6 +361,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         public const int HTTP_CUSTOM_HEADER = 5;
         public const int HTTP_PRAGMA_NO_CACHE = 6;
 
+        // llSetContentType
+        public const int CONTENT_TYPE_TEXT = 0; //text/plain
+        public const int CONTENT_TYPE_HTML = 1; //text/html
+        public const int CONTENT_TYPE_XML = 2; //application/xml
+        public const int CONTENT_TYPE_XHTML = 3; //application/xhtml+xml
+        public const int CONTENT_TYPE_ATOM = 4; //application/atom+xml
+        public const int CONTENT_TYPE_JSON = 5; //application/json
+        public const int CONTENT_TYPE_LLSD = 6; //application/llsd+xml
+        public const int CONTENT_TYPE_FORM = 7; //application/x-www-form-urlencoded
+        public const int CONTENT_TYPE_RSS = 8; //application/rss+xml
+
         public const int PRIM_MATERIAL = 2;
         public const int PRIM_PHYSICS = 3;
         public const int PRIM_TEMP_ON_REZ = 4;
@@ -772,8 +783,5 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         /// process message parameter as regex
         /// </summary>
         public const int OS_LISTEN_REGEX_MESSAGE = 0x2;
-
-        public const int CONTENT_TYPE_TEXT = 0;
-        public const int CONTENT_TYPE_HTML = 1;
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index 6f3677c..4fc8d65 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -1495,11 +1495,6 @@ 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);
@@ -1535,6 +1530,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_LSL_Functions.llSetColor(color, face);
         }
 
+        public void llSetContentType(LSL_Key id, LSL_Integer type)
+        {
+            m_LSL_Functions.llSetContentType(id, type);
+        }
+
         public void llSetDamage(double damage)
         {
             m_LSL_Functions.llSetDamage(damage);
@@ -1550,6 +1550,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_LSL_Functions.llSetForceAndTorque(force, torque, local);
         }
 
+        public void llSetAngularVelocity(LSL_Vector force, int local)
+        {
+            m_LSL_Functions.llSetAngularVelocity(force, local);
+        }
+
         public void llSetHoverHeight(double height, int water, double tau)
         {
             m_LSL_Functions.llSetHoverHeight(height, water, tau);
@@ -1740,11 +1745,6 @@ 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);
@@ -2014,10 +2014,5 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         {
             return m_LSL_Functions.llGetPhysicsMaterial();
         }
-
-        public void llSetContentType(LSL_Key id, LSL_Integer content_type)
-        {
-            m_LSL_Functions.llSetContentType(id, content_type);
-        }
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
index 9e32f40..6aa717d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
@@ -937,7 +937,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                 {
                     string retval = null;
                     if (value is int)
-                        retval = ((int)value).ToString();
+                        retval = String.Format("new LSL_Types.LSLInteger({0})",((int)value).ToString());
                     else if (value is float)
                         retval = String.Format("new LSL_Types.LSLFloat({0})",((float)value).ToString());
                     else if (value is string)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index a2ac9c5..2427cbe 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -243,7 +243,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             if (Engine.Config.GetString("ScriptStopStrategy", "abort") == "co-op")
             {
                 m_coopTermination = true;
-                m_coopSleepHandle = new AutoResetEvent(false);
+                m_coopSleepHandle = new XEngineEventWaitHandle(false, EventResetMode.AutoReset);
             }
         }
 
@@ -529,8 +529,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             {
                 File.Delete(savedState);
             }
-            catch(Exception)
+            catch (Exception e)
             {
+                m_log.Warn(
+                    string.Format(
+                        "[SCRIPT INSTANCE]: Could not delete script state {0} for script {1} (id {2}) in part {3} (id {4}) in object {5} in {6}.  Exception  ", 
+                        savedState, ScriptTask.Name, ScriptTask.ItemID, Part.Name, Part.UUID, Part.ParentGroup.Name, Engine.World.Name), 
+                    e);
             }
         }
 
@@ -568,9 +573,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
         public bool Stop(int timeout)
         {
-//            m_log.DebugFormat(
-//                "[SCRIPT INSTANCE]: Stopping script {0} {1} in {2} {3} with timeout {4} {5} {6}",
-//                ScriptName, ItemID, PrimName, ObjectID, timeout, m_InSelfDelete, DateTime.Now.Ticks);
+            if (DebugLevel >= 1)
+                m_log.DebugFormat(
+                    "[SCRIPT INSTANCE]: Stopping script {0} {1} in {2} {3} with timeout {4} {5} {6}",
+                    ScriptName, ItemID, PrimName, ObjectID, timeout, m_InSelfDelete, DateTime.Now.Ticks);
 
             IScriptWorkItem workItem;
 
@@ -1216,4 +1222,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             Suspended = false;
         }
     }
-}
+
+    /// <summary>
+    /// Xengine event wait handle.
+    /// </summary>
+    /// <remarks>
+    /// This class exists becase XEngineScriptBase gets a reference to this wait handle.  We need to make sure that
+    /// when scripts are running in different AppDomains the lease does not expire.
+    /// FIXME: Like LSL_Api, etc., this effectively leaks memory since the GC will never collect it.  To avoid this,
+    /// proper remoting sponsorship needs to be implemented across the board.
+    /// </remarks>
+    public class XEngineEventWaitHandle : EventWaitHandle
+    {
+        public XEngineEventWaitHandle(bool initialState, EventResetMode mode) : base(initialState, mode) {}
+
+        public override Object InitializeLifetimeService()
+        {
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index b524a18..4ba0e64 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -371,6 +371,31 @@ namespace OpenSim.Region.ScriptEngine.Shared
 
             #endregion
 
+            #region Methods
+            public Quaternion Normalize()
+            {
+                double length = Math.Sqrt(x * x + y * y + z * z + s * s);
+                if (length < float.Epsilon)
+                {
+                    x = 0;
+                    y = 0;
+                    z = 0;
+                    s = 1;
+                }
+                else
+                {
+
+                    double invLength = 1.0 / length;
+                    x *= invLength;
+                    y *= invLength;
+                    z *= invLength;
+                    s *= invLength;
+                }
+
+                return this;
+            }
+            #endregion
+
             #region Overriders
 
             public override int GetHashCode()
@@ -546,21 +571,33 @@ namespace OpenSim.Region.ScriptEngine.Shared
 
                 set {m_data = value; }
             }
-        // Function to obtain LSL type from an index. This is needed
-        // because LSL lists allow for multiple types, and safely
-        // iterating in them requires a type check.
+
+            /// <summary>
+            /// Obtain LSL type from an index.
+            /// </summary>
+            /// <remarks>
+            /// This is needed because LSL lists allow for multiple types, and safely
+            /// iterating in them requires a type check.
+            /// </remarks>
+            /// <returns></returns>
+            /// <param name='itemIndex'></param>
             public Type GetLSLListItemType(int itemIndex)
             {
                 return m_data[itemIndex].GetType();
             }
 
-        // Member functions to obtain item as specific types.
-        // For cases where implicit conversions would apply if items
-        // were not in a list (e.g. integer to float, but not float
-        // to integer) functions check for alternate types so as to
-        // down-cast from Object to the correct type.
-        // Note: no checks for item index being valid are performed
-
+            /// <summary>
+            /// Obtain float from an index.
+            /// </summary>
+            /// <remarks>
+            /// For cases where implicit conversions would apply if items
+            /// were not in a list (e.g. integer to float, but not float
+            /// to integer) functions check for alternate types so as to
+            /// down-cast from Object to the correct type.
+            /// Note: no checks for item index being valid are performed
+            /// </remarks>
+            /// <returns></returns>
+            /// <param name='itemIndex'></param>
             public LSL_Types.LSLFloat GetLSLFloatItem(int itemIndex)
             {
                 if (m_data[itemIndex] is LSL_Types.LSLInteger)
@@ -591,26 +628,14 @@ namespace OpenSim.Region.ScriptEngine.Shared
 
             public LSL_Types.LSLString GetLSLStringItem(int itemIndex)
             {
-              if (m_data[itemIndex] is LSL_Types.key)
-              {
-                return (LSL_Types.key)m_data[itemIndex];
-              }
-              else if (m_data[itemIndex] is String)
-              {
-                return new LSL_Types.LSLString((string)m_data[itemIndex]);
-              }
-              else if (m_data[itemIndex] is LSL_Types.LSLFloat)
-              {
-                  return new LSL_Types.LSLString((LSLFloat)m_data[itemIndex]);
-              }
-              else if (m_data[itemIndex] is LSL_Types.LSLInteger)
-              {
-                  return new LSL_Types.LSLString((LSLInteger)m_data[itemIndex]);
-              }
-              else
-              {
-                  return (LSL_Types.LSLString)m_data[itemIndex];
-              }
+                if (m_data[itemIndex] is LSL_Types.key)
+                {
+                    return (LSL_Types.key)m_data[itemIndex];
+                }
+                else
+                {
+                    return new LSL_Types.LSLString(m_data[itemIndex].ToString());
+                }
             }
 
             public LSL_Types.LSLInteger GetLSLIntegerItem(int itemIndex)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
index 74f010e..495e684 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
@@ -180,6 +180,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         public void TestOsNpcLoadAppearance()
         {
             TestHelpers.InMethod();
+            //TestHelpers.EnableLogging();
 
             // Store an avatar with a different height from default in a notecard.
             UUID userId = TestHelpers.ParseTail(0x1);
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 04a4e53..27d7674 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -551,7 +551,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         /// <param name="instance"></param>
         /// <param name="keySelector">Basis on which to sort output.  Can be null if no sort needs to take place</param>
         private void HandleScriptsAction<TKey>(
-            string[] cmdparams, Action<IScriptInstance> action, Func<IScriptInstance, TKey> keySelector)
+            string[] cmdparams, Action<IScriptInstance> action, System.Func<IScriptInstance, TKey> keySelector)
         {
             if (!(MainConsole.Instance.ConsoleScene == null || MainConsole.Instance.ConsoleScene == m_Scene))
                 return;
@@ -609,7 +609,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             if (!(MainConsole.Instance.ConsoleScene == null || MainConsole.Instance.ConsoleScene == m_Scene))
                 return;
 
-            MainConsole.Instance.OutputFormat(GetStatusReport());
+            MainConsole.Instance.Output(GetStatusReport());
         }
 
         public string GetStatusReport()
@@ -708,7 +708,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             sb.AppendFormat("Containing part UUID: {0}\n", instance.ObjectID);
             sb.AppendFormat("Position            : {0}\n", sop.AbsolutePosition);
 
-            MainConsole.Instance.OutputFormat(sb.ToString());
+            MainConsole.Instance.Output(sb.ToString());
         }
 
         private void HandleSuspendScript(IScriptInstance instance)
@@ -1633,7 +1633,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             startInfo.MaxWorkerThreads = maxThreads;
             startInfo.MinWorkerThreads = minThreads;
             startInfo.ThreadPriority = threadPriority;;
-            startInfo.StackSize = stackSize;
+            startInfo.MaxStackSize = stackSize;
             startInfo.StartSuspended = true;
 
             m_ThreadPool = new SmartThreadPool(startInfo);
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XWorkItem.cs b/OpenSim/Region/ScriptEngine/XEngine/XWorkItem.cs
index 8dd7677..9d9dee1 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XWorkItem.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XWorkItem.cs
@@ -52,16 +52,16 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             return wr.Cancel();
         }
 
-        public void Abort()
+        public bool Abort()
         {
-            wr.Abort();
+            return wr.Cancel(true);
         }
 
         public bool Wait(int t)
         {
             // We use the integer version of WaitAll because the current version of SmartThreadPool has a bug with the
             // TimeSpan version.  The number of milliseconds in TimeSpan is an int64 so when STP casts it down to an 
-            // int (32-bit) we can end up with bad values.  This occurs on Windows though curious not on Mono 2.10.8
+            // int (32-bit) we can end up with bad values.  This occurs on Windows though curiously not on Mono 2.10.8
             // (or very likely other versions of Mono at least up until 3.0.3).
             return SmartThreadPool.WaitAll(new IWorkItemResult[] {wr}, t, false);
         }
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index 210a314..08ba50d 100644
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -286,6 +286,7 @@ namespace OpenSim.Server.Base
                                         e.InnerException == null ? e.Message : e.InnerException.Message, 
                                         e.StackTrace);
                                 }
+                                m_log.ErrorFormat("[SERVER UTILS]: Error loading plugin {0}: {1} args.Length {2}", dllName, e.Message, args.Length);
                                 return null;
                             }
 
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 7c8e6b7..667cef8 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -34,6 +34,7 @@ using System.Text;
 using System.Xml;
 using OpenSim.Framework;
 using OpenSim.Framework.Console;
+using OpenSim.Framework.Monitoring;
 using OpenSim.Framework.Servers;
 using log4net;
 using log4net.Config;
@@ -171,11 +172,6 @@ namespace OpenSim.Server.Base
 
             m_console = MainConsole.Instance;
 
-            // Configure the appenders for log4net
-            //
-            OpenSimAppender consoleAppender = null;
-            FileAppender fileAppender = null;
-
             if (logConfig != null)
             {
                 FileInfo cfg = new FileInfo(logConfig);
@@ -195,16 +191,7 @@ namespace OpenSim.Server.Base
             }
 
             RegisterCommonCommands();
-
-            // Register the quit command
-            //
-            MainConsole.Instance.Commands.AddCommand("General", false, "quit",
-                    "quit",
-                    "Quit the application", HandleQuit);
-
-            MainConsole.Instance.Commands.AddCommand("General", false, "shutdown",
-                    "shutdown",
-                    "Quit the application", HandleQuit);
+            RegisterCommonComponents(Config);
 
             // Allow derived classes to perform initialization that
             // needs to be done after the console has opened
@@ -219,6 +206,9 @@ namespace OpenSim.Server.Base
 
         public virtual int Run()
         {
+            Watchdog.Enabled = true;
+            MemoryWatchdog.Enabled = true;
+
             while (m_Running)
             {
                 try
@@ -236,11 +226,12 @@ namespace OpenSim.Server.Base
             return 0;
         }
 
-        protected virtual void HandleQuit(string module, string[] args)
+        protected override void ShutdownSpecific()
         {
             m_Running = false;
             m_log.Info("[CONSOLE] Quitting");
 
+            base.ShutdownSpecific();
         }
 
         protected virtual void ReadConfig()
@@ -251,4 +242,4 @@ namespace OpenSim.Server.Base
         {
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
index ff45d94..cc4325a 100644
--- a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
@@ -119,16 +119,14 @@ namespace OpenSim.Server.Handlers.Asset
 
             if (asset == null || asset.Data.Length == 0)
             {
-                MainConsole.Instance.Output("Asset not found");
+                MainConsole.Instance.OutputFormat("Could not find asset with ID {0}", args[2]);
                 return;
             }
 
-            m_AssetService.Delete(args[2]);
-
-            //MainConsole.Instance.Output("Asset deleted");
-            // TODO: Implement this
-
-            MainConsole.Instance.Output("Asset deletion not supported by database");
+            if (!m_AssetService.Delete(asset.ID))
+                MainConsole.Instance.OutputFormat("ERROR: Could not delete asset {0} {1}", asset.ID, asset.Name);
+            else
+                MainConsole.Instance.OutputFormat("Deleted asset {0} {1}", asset.ID, asset.Name);
         }
 
         void HandleDumpAsset(string module, string[] args)
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs
index 986394b..941b97d 100644
--- a/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Server.Handlers.Asset
             m_allowedTypes = allowedTypes;
         }
 
-        public override byte[] Handle(string path, Stream request,
+        protected override byte[] ProcessRequest(string path, Stream request,
                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             bool result = false;
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs
index 8f7412b..8b23a83 100644
--- a/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Server.Handlers.Asset
             m_AssetService = service;
         }
 
-        public override byte[] Handle(string path, Stream request,
+        protected override byte[] ProcessRequest(string path, Stream request,
                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             byte[] result = new byte[0];
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs
index a006fa8..8eebc61 100644
--- a/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Server.Handlers.Asset
             m_AssetService = service;
         }
 
-        public override byte[] Handle(string path, Stream request,
+        protected override byte[] ProcessRequest(string path, Stream request,
                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             AssetBase asset;
diff --git a/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs b/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs
index 6b93cd9..16e011a 100644
--- a/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Server.Handlers.Authentication
             }
         }
 
-        public override byte[] Handle(string path, Stream request,
+        protected override byte[] ProcessRequest(string path, Stream request,
                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             string[] p = SplitParams(path);
diff --git a/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs b/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs
index 18cef15..66a26fc 100644
--- a/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs
+++ b/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs
@@ -147,7 +147,7 @@ namespace OpenSim.Server.Handlers.Authentication
         #endregion
     }
 
-    public class OpenIdStreamHandler : IStreamHandler
+    public class OpenIdStreamHandler : BaseOutputStreamHandler
     {
         #region HTML
 
@@ -191,42 +191,34 @@ For more information, see <a href='http://openid.net/'>http://openid.net/</a>.
 
         #endregion HTML
 
-        public string Name { get { return "OpenId"; } }
-        public string Description { get { return null; } }
-        public string ContentType { get { return m_contentType; } }
-        public string HttpMethod { get { return m_httpMethod; } }
-        public string Path { get { return m_path; } }
-
-        string m_contentType;
-        string m_httpMethod;
-        string m_path;
         IAuthenticationService m_authenticationService;
         IUserAccountService m_userAccountService;
         ProviderMemoryStore m_openidStore = new ProviderMemoryStore();
 
+        public override string ContentType { get { return "text/html"; } }
+
         /// <summary>
         /// Constructor
         /// </summary>
-        public OpenIdStreamHandler(string httpMethod, string path, IUserAccountService userService, IAuthenticationService authService)
+        public OpenIdStreamHandler(
+            string httpMethod, string path, IUserAccountService userService, IAuthenticationService authService)
+            : base(httpMethod, path, "OpenId", "OpenID stream handler")
         {
             m_authenticationService = authService;
             m_userAccountService = userService;
-            m_httpMethod = httpMethod;
-            m_path = path;
-
-            m_contentType = "text/html";
         }
 
         /// <summary>
         /// Handles all GET and POST requests for OpenID identifier pages and endpoint
         /// server communication
         /// </summary>
-        public void Handle(string path, Stream request, Stream response, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        protected override void ProcessRequest(
+            string path, Stream request, Stream response, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             Uri providerEndpoint = new Uri(String.Format("{0}://{1}{2}", httpRequest.Url.Scheme, httpRequest.Url.Authority, httpRequest.Url.AbsolutePath));
 
             // Defult to returning HTML content
-            m_contentType = "text/html";
+            httpResponse.ContentType = ContentType;
 
             try
             {
@@ -276,7 +268,7 @@ For more information, see <a href='http://openid.net/'>http://openid.net/</a>.
 
                     string[] contentTypeValues = provider.Request.Response.Headers.GetValues("Content-Type");
                     if (contentTypeValues != null && contentTypeValues.Length == 1)
-                        m_contentType = contentTypeValues[0];
+                        httpResponse.ContentType = contentTypeValues[0];
 
                     // Set the response code and document body based on the OpenID result
                     httpResponse.StatusCode = (int)provider.Request.Response.Code;
@@ -344,4 +336,4 @@ For more information, see <a href='http://openid.net/'>http://openid.net/</a>.
             return false;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Server/Handlers/Authorization/AuthorizationServerPostHandler.cs b/OpenSim/Server/Handlers/Authorization/AuthorizationServerPostHandler.cs
index bcf9d47..c9b4e9b 100644
--- a/OpenSim/Server/Handlers/Authorization/AuthorizationServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Authorization/AuthorizationServerPostHandler.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Server.Handlers.Authorization
             m_AuthorizationService = service;
         }
 
-        public override byte[] Handle(string path, Stream request,
+        protected override byte[] ProcessRequest(string path, Stream request,
                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             XmlSerializer xs = new XmlSerializer(typeof (AuthorizationRequest));
diff --git a/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs b/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs
index 8cd747e..d6bbb8f 100644
--- a/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Server.Handlers.Avatar
             m_AvatarService = service;
         }
 
-        public override byte[] Handle(string path, Stream requestData,
+        protected override byte[] ProcessRequest(string path, Stream requestData,
                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             StreamReader sr = new StreamReader(requestData);
diff --git a/OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs b/OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs
index 47a8558..ca0a24c 100644
--- a/OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Server.Handlers.Friends
             m_FriendsService = service;
         }
 
-        public override byte[] Handle(string path, Stream requestData,
+        protected override byte[] ProcessRequest(string path, Stream requestData,
                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             StreamReader sr = new StreamReader(requestData);
diff --git a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
index ef5f33e..c63b409 100644
--- a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Server.Handlers.Grid
             m_GridService = service;
         }
 
-        public override byte[] Handle(string path, Stream requestData,
+        protected override byte[] ProcessRequest(string path, Stream requestData,
                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             StreamReader sr = new StreamReader(requestData);
@@ -106,6 +106,9 @@ namespace OpenSim.Server.Handlers.Grid
                     case "get_default_regions":
                         return GetDefaultRegions(request);
 
+                    case "get_default_hypergrid_regions":
+                        return GetDefaultHypergridRegions(request);
+
                     case "get_fallback_regions":
                         return GetFallbackRegions(request);
 
@@ -444,6 +447,36 @@ namespace OpenSim.Server.Handlers.Grid
             return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
 
+        byte[] GetDefaultHypergridRegions(Dictionary<string, object> request)
+        {
+            //m_log.DebugFormat("[GRID HANDLER]: GetDefaultRegions");
+            UUID scopeID = UUID.Zero;
+            if (request.ContainsKey("SCOPEID"))
+                UUID.TryParse(request["SCOPEID"].ToString(), out scopeID);
+            else
+                m_log.WarnFormat("[GRID HANDLER]: no scopeID in request to get region range");
+
+            List<GridRegion> rinfos = m_GridService.GetDefaultHypergridRegions(scopeID);
+
+            Dictionary<string, object> result = new Dictionary<string, object>();
+            if ((rinfos == null) || ((rinfos != null) && (rinfos.Count == 0)))
+                result["result"] = "null";
+            else
+            {
+                int i = 0;
+                foreach (GridRegion rinfo in rinfos)
+                {
+                    Dictionary<string, object> rinfoDict = rinfo.ToKeyValuePairs();
+                    result["region" + i] = rinfoDict;
+                    i++;
+                }
+            }
+            string xmlString = ServerUtils.BuildXmlResponse(result);
+
+            //m_log.DebugFormat("[GRID HANDLER]: resp string: {0}", xmlString);
+            return Util.UTF8NoBomEncoding.GetBytes(xmlString);
+        }
+
         byte[] GetFallbackRegions(Dictionary<string, object> request)
         {
             //m_log.DebugFormat("[GRID HANDLER]: GetRegionRange");
diff --git a/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs b/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs
index 687cf8d..0b98e9a 100644
--- a/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Server.Handlers.GridUser
             m_GridUserService = service;
         }
 
-        public override byte[] Handle(string path, Stream requestData,
+        protected override byte[] ProcessRequest(string path, Stream requestData,
                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             StreamReader sr = new StreamReader(requestData);
@@ -185,10 +185,12 @@ namespace OpenSim.Server.Handlers.GridUser
             GridUserInfo guinfo = m_GridUserService.GetGridUserInfo(user);
 
             Dictionary<string, object> result = new Dictionary<string, object>();
-            result["result"] = guinfo.ToKeyValuePairs();
+            if (guinfo != null)
+                result["result"] = guinfo.ToKeyValuePairs();
+            else
+                result["result"] = "null";
 
             string xmlString = ServerUtils.BuildXmlResponse(result);
-
             //m_log.DebugFormat("[GRID USER HANDLER]: resp string: {0}", xmlString);
             return Util.UTF8NoBomEncoding.GetBytes(xmlString);
         }
diff --git a/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs
index cf1af15..adc2fbc 100644
--- a/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/AgentHandlers.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Server.Handlers.Hypergrid
             m_Proxy = proxy;
         }
 
-        protected override bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint teleportFlags, out string reason)
+        protected override bool CreateAgent(GridRegion gatekeeper, GridRegion destination, AgentCircuitData aCircuit, uint teleportFlags, bool fromLogin, out string reason)
         {
             return m_GatekeeperService.LoginAgent(aCircuit, destination, out reason);
         }
diff --git a/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
index 0d4990a..ffe2f36 100644
--- a/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/GatekeeperServerConnector.cs
@@ -76,10 +76,14 @@ namespace OpenSim.Server.Handlers.Hypergrid
             server.AddStreamHandler(new GatekeeperAgentHandler(m_GatekeeperService, m_Proxy));
         }
 
-        public GatekeeperServiceInConnector(IConfigSource config, IHttpServer server)
-            : this(config, server, null)
+        public GatekeeperServiceInConnector(IConfigSource config, IHttpServer server, string configName)
+            : this(config, server, (ISimulationService)null)
         {
         }
 
+        public GatekeeperServiceInConnector(IConfigSource config, IHttpServer server)
+            : this(config, server, String.Empty)
+        {
+        }
     }
 }
diff --git a/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs b/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs
index 0aa2729..a2bdadb 100644
--- a/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Server.Handlers.Hypergrid
                 m_log.ErrorFormat("[HGFRIENDS HANDLER]: TheService is null!");
         }
 
-        public override byte[] Handle(string path, Stream requestData,
+        protected override byte[] ProcessRequest(string path, Stream requestData,
                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             StreamReader sr = new StreamReader(requestData);
diff --git a/OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs
index f306b1c..06eaf2e 100644
--- a/OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs
@@ -91,7 +91,7 @@ namespace OpenSim.Server.Handlers.Hypergrid
             m_HandlersType = handlersType;
         }
 
-        public override byte[] Handle(string path, Stream requestData,
+        protected override byte[] ProcessRequest(string path, Stream requestData,
                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             return OKResponse(httpResponse);
diff --git a/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs
index 968c1e6..04bb9e8 100644
--- a/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs
@@ -49,191 +49,88 @@ using log4net;
 
 namespace OpenSim.Server.Handlers.Hypergrid
 {
-    public class HomeAgentHandler 
+    public class HomeAgentHandler : AgentPostHandler
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private IUserAgentService m_UserAgentService;
 
         private string m_LoginServerIP;
-        private bool m_Proxy = false;
 
-        public HomeAgentHandler(IUserAgentService userAgentService, string loginServerIP, bool proxy)
+        public HomeAgentHandler(IUserAgentService userAgentService, string loginServerIP, bool proxy) :
+            base("/homeagent")
         {
             m_UserAgentService = userAgentService;
             m_LoginServerIP = loginServerIP;
             m_Proxy = proxy;
         }
 
-        public Hashtable Handler(Hashtable request)
+        protected override AgentDestinationData CreateAgentDestinationData()
         {
-//            m_log.Debug("[CONNECTION DEBUGGING]: HomeAgentHandler Called");
-//
-//            m_log.Debug("---------------------------");
-//            m_log.Debug(" >> uri=" + request["uri"]);
-//            m_log.Debug(" >> content-type=" + request["content-type"]);
-//            m_log.Debug(" >> http-method=" + request["http-method"]);
-//            m_log.Debug("---------------------------\n");
-
-            Hashtable responsedata = new Hashtable();
-            responsedata["content_type"] = "text/html";
-            responsedata["keepalive"] = false;
-
-
-            UUID agentID;
-            UUID regionID;
-            string action;
-            if (!Utils.GetParams((string)request["uri"], out agentID, out regionID, out action))
+            return new ExtendedAgentDestinationData();
+        }
+
+        protected override void UnpackData(OSDMap args, AgentDestinationData d, Hashtable request)
+        {
+            base.UnpackData(args, d, request);
+            ExtendedAgentDestinationData data = (ExtendedAgentDestinationData)d;
+            try
             {
-                m_log.InfoFormat("[HOME AGENT HANDLER]: Invalid parameters for agent message {0}", request["uri"]);
-                responsedata["int_response_code"] = 404;
-                responsedata["str_response_string"] = "false";
+                if (args.ContainsKey("gatekeeper_host") && args["gatekeeper_host"] != null)
+                    data.host = args["gatekeeper_host"].AsString();
+                if (args.ContainsKey("gatekeeper_port") && args["gatekeeper_port"] != null)
+                    Int32.TryParse(args["gatekeeper_port"].AsString(), out data.port);
+                if (args.ContainsKey("gatekeeper_serveruri") && args["gatekeeper_serveruri"] != null)
+                    data.gatekeeperServerURI = args["gatekeeper_serveruri"];
+                if (args.ContainsKey("destination_serveruri") && args["destination_serveruri"] != null)
+                    data.destinationServerURI = args["destination_serveruri"];
 
-                return responsedata;
             }
-
-            // Next, let's parse the verb
-            string method = (string)request["http-method"];
-            if (method.Equals("POST"))
+            catch (InvalidCastException)
             {
-                DoAgentPost(request, responsedata, agentID);
-                return responsedata;
+                m_log.ErrorFormat("[HOME AGENT HANDLER]: Bad cast in UnpackData");
             }
-            else
-            {
-                m_log.InfoFormat("[HOME AGENT HANDLER]: method {0} not supported in agent message", method);
-                responsedata["int_response_code"] = HttpStatusCode.MethodNotAllowed;
-                responsedata["str_response_string"] = "Method not allowed";
 
-                return responsedata;
-            }
+            string callerIP = GetCallerIP(request);
+            // Verify if this call came from the login server
+            if (callerIP == m_LoginServerIP)
+                data.fromLogin = true;
 
         }
 
-        protected void DoAgentPost(Hashtable request, Hashtable responsedata, UUID id)
+        protected override GridRegion ExtractGatekeeper(AgentDestinationData d)
         {
-            OSDMap args = Utils.GetOSDMap((string)request["body"]);
-            if (args == null)
+            if (d is ExtendedAgentDestinationData)
             {
-                responsedata["int_response_code"] = HttpStatusCode.BadRequest;
-                responsedata["str_response_string"] = "Bad request";
-                return;
+                ExtendedAgentDestinationData data = (ExtendedAgentDestinationData)d;
+                GridRegion gatekeeper = new GridRegion();
+                gatekeeper.ServerURI = data.gatekeeperServerURI;
+                gatekeeper.ExternalHostName = data.host;
+                gatekeeper.HttpPort = (uint)data.port;
+                gatekeeper.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);
+
+                return gatekeeper;
             }
-
-            // retrieve the input arguments
-            int x = 0, y = 0;
-            UUID uuid = UUID.Zero;
-            string regionname = string.Empty;
-            string gatekeeper_host = string.Empty;
-            string gatekeeper_serveruri = string.Empty;
-            string destination_serveruri = string.Empty;
-            int gatekeeper_port = 0;
-            IPEndPoint client_ipaddress = null;
-
-            if (args.ContainsKey("gatekeeper_host") && args["gatekeeper_host"] != null)
-                gatekeeper_host = args["gatekeeper_host"].AsString();
-            if (args.ContainsKey("gatekeeper_port") && args["gatekeeper_port"] != null)
-                Int32.TryParse(args["gatekeeper_port"].AsString(), out gatekeeper_port);
-            if (args.ContainsKey("gatekeeper_serveruri") && args["gatekeeper_serveruri"] !=null)
-                gatekeeper_serveruri = args["gatekeeper_serveruri"];
-            if (args.ContainsKey("destination_serveruri") && args["destination_serveruri"] !=null)
-                destination_serveruri = args["destination_serveruri"];
-
-            GridRegion gatekeeper = new GridRegion();
-            gatekeeper.ServerURI = gatekeeper_serveruri;
-            gatekeeper.ExternalHostName = gatekeeper_host;
-            gatekeeper.HttpPort = (uint)gatekeeper_port;
-            gatekeeper.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);
-
-            if (args.ContainsKey("destination_x") && args["destination_x"] != null)
-                Int32.TryParse(args["destination_x"].AsString(), out x);
-            else
-                m_log.WarnFormat("  -- request didn't have destination_x");
-            if (args.ContainsKey("destination_y") && args["destination_y"] != null)
-                Int32.TryParse(args["destination_y"].AsString(), out y);
             else
-                m_log.WarnFormat("  -- request didn't have destination_y");
-            if (args.ContainsKey("destination_uuid") && args["destination_uuid"] != null)
-                UUID.TryParse(args["destination_uuid"].AsString(), out uuid);
-            if (args.ContainsKey("destination_name") && args["destination_name"] != null)
-                regionname = args["destination_name"].ToString();
-
-            if (args.ContainsKey("client_ip") && args["client_ip"] != null)
-            {
-                string ip_str = args["client_ip"].ToString();
-                try
-                {
-                    string callerIP = GetCallerIP(request);
-                    // Verify if this caller has authority to send the client IP
-                    if (callerIP == m_LoginServerIP)
-                        client_ipaddress = new IPEndPoint(IPAddress.Parse(ip_str), 0);
-                    else // leaving this for now, but this warning should be removed
-                        m_log.WarnFormat("[HOME AGENT HANDLER]: Unauthorized machine {0} tried to set client ip to {1}", callerIP, ip_str);
-                }
-                catch
-                {
-                    m_log.DebugFormat("[HOME AGENT HANDLER]: Exception parsing client ip address from {0}", ip_str);
-                }
-            }
+                m_log.WarnFormat("[HOME AGENT HANDLER]: Wrong data type");
 
-            GridRegion destination = new GridRegion();
-            destination.RegionID = uuid;
-            destination.RegionLocX = x;
-            destination.RegionLocY = y;
-            destination.RegionName = regionname;
-            destination.ServerURI = destination_serveruri;
-            
-            AgentCircuitData aCircuit = new AgentCircuitData();
-            try
-            {
-                aCircuit.UnpackAgentCircuitData(args);
-            }
-            catch (Exception ex)
-            {
-                m_log.InfoFormat("[HOME AGENT HANDLER]: exception on unpacking ChildCreate message {0}", ex.Message);
-                responsedata["int_response_code"] = HttpStatusCode.BadRequest;
-                responsedata["str_response_string"] = "Bad request";
-                return;
-            }
-
-            OSDMap resp = new OSDMap(2);
-            string reason = String.Empty;
-
-            bool result = m_UserAgentService.LoginAgentToGrid(aCircuit, gatekeeper, destination, client_ipaddress, out reason);
-
-            resp["reason"] = OSD.FromString(reason);
-            resp["success"] = OSD.FromBoolean(result);
-
-            // TODO: add reason if not String.Empty?
-            responsedata["int_response_code"] = HttpStatusCode.OK;
-            responsedata["str_response_string"] = OSDParser.SerializeJsonString(resp);
+            return null;
         }
 
-        private string GetCallerIP(Hashtable request)
-        {
-            if (!m_Proxy)
-                return Util.GetCallerIP(request);
-
-            // We're behind a proxy
-            Hashtable headers = (Hashtable)request["headers"];
-            string xff = "X-Forwarded-For";
-            if (headers.ContainsKey(xff.ToLower()))
-                xff = xff.ToLower();
 
-            if (!headers.ContainsKey(xff) || headers[xff] == null)
-            {
-                m_log.WarnFormat("[AGENT HANDLER]: No XFF header");
-                return Util.GetCallerIP(request);
-            }
+        protected override bool CreateAgent(GridRegion gatekeeper, GridRegion destination, AgentCircuitData aCircuit, uint teleportFlags, bool fromLogin, out string reason)
+        {
+            return m_UserAgentService.LoginAgentToGrid(aCircuit, gatekeeper, destination, fromLogin, out reason);
+        }
 
-            m_log.DebugFormat("[AGENT HANDLER]: XFF is {0}", headers[xff]);
+    }
 
-            IPEndPoint ep = Util.GetClientIPFromXFF((string)headers[xff]);
-            if (ep != null)
-                return ep.Address.ToString();
+    public class ExtendedAgentDestinationData : AgentDestinationData
+    {
+        public string host;
+        public int port;
+        public string gatekeeperServerURI;
+        public string destinationServerURI;
 
-            // Oops
-            return Util.GetCallerIP(request);
-        }
     }
 
 }
diff --git a/OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs
index 80eb5d2..8145a21 100644
--- a/OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/InstantMessageServerConnector.cs
@@ -54,10 +54,15 @@ namespace OpenSim.Server.Handlers.Hypergrid
         private IInstantMessage m_IMService;
 
         public InstantMessageServerConnector(IConfigSource config, IHttpServer server) :
-                this(config, server, null)
+            this(config, server, (IInstantMessageSimConnector)null)
         {            
         }
 
+        public InstantMessageServerConnector(IConfigSource config, IHttpServer server, string configName) :
+            this(config, server)
+        {
+        }
+
         public InstantMessageServerConnector(IConfigSource config, IHttpServer server, IInstantMessageSimConnector simConnector) :
                 base(config, server, String.Empty)
         {
diff --git a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
index db62aaa..7137836 100644
--- a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
@@ -62,10 +62,15 @@ namespace OpenSim.Server.Handlers.Hypergrid
         private bool m_VerifyCallers = false;
 
         public UserAgentServerConnector(IConfigSource config, IHttpServer server) :
-                this(config, server, null)
+            this(config, server, (IFriendsSimConnector)null)
         {            
         }
 
+        public UserAgentServerConnector(IConfigSource config, IHttpServer server, string configName) :
+            this(config, server)
+        {
+        }
+        
         public UserAgentServerConnector(IConfigSource config, IHttpServer server, IFriendsSimConnector friendsConnector) :
                 base(config, server, String.Empty)
         {
@@ -103,7 +108,7 @@ namespace OpenSim.Server.Handlers.Hypergrid
             server.AddXmlRPCHandler("get_uui", GetUUI, false);
             server.AddXmlRPCHandler("get_uuid", GetUUID, false);
 
-            server.AddHTTPHandler("/homeagent/", new HomeAgentHandler(m_HomeUsersService, loginServerIP, proxy).Handler);
+            server.AddStreamHandler(new HomeAgentHandler(m_HomeUsersService, loginServerIP, proxy));
         }
 
         public XmlRpcResponse GetHomeRegion(XmlRpcRequest request, IPEndPoint remoteClient)
@@ -448,7 +453,6 @@ namespace OpenSim.Server.Handlers.Hypergrid
             XmlRpcResponse response = new XmlRpcResponse();
             response.Value = hash;
             return response;
-
         }
 
         /// <summary>
@@ -466,9 +470,7 @@ namespace OpenSim.Server.Handlers.Hypergrid
             //string portstr = (string)requestData["port"];
             if (requestData.ContainsKey("first") && requestData.ContainsKey("last"))
             {
-                UUID userID = UUID.Zero;
                 string first = (string)requestData["first"];
-
                 string last = (string)requestData["last"];
                 UUID uuid = m_HomeUsersService.GetUUID(first, last);
                 hash["UUID"] = uuid.ToString();
@@ -477,7 +479,6 @@ namespace OpenSim.Server.Handlers.Hypergrid
             XmlRpcResponse response = new XmlRpcResponse();
             response.Value = hash;
             return response;
-
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Server/Handlers/Inventory/InventoryServerMoveItemsHandler.cs b/OpenSim/Server/Handlers/Inventory/InventoryServerMoveItemsHandler.cs
index 231e32f..e2c50fe 100644
--- a/OpenSim/Server/Handlers/Inventory/InventoryServerMoveItemsHandler.cs
+++ b/OpenSim/Server/Handlers/Inventory/InventoryServerMoveItemsHandler.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Server.Handlers.Inventory
             m_InventoryService = service;
         }
 
-        public override byte[] Handle(string path, Stream request,
+        protected override byte[] ProcessRequest(string path, Stream request,
                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             XmlSerializer xs = new XmlSerializer(typeof (List<InventoryItemBase>));
diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
index 64127c2..0d7c136 100644
--- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
@@ -87,7 +87,7 @@ namespace OpenSim.Server.Handlers.Asset
             m_InventoryService = service;
         }
 
-        public override byte[] Handle(string path, Stream requestData,
+        protected override byte[] ProcessRequest(string path, Stream requestData,
                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             StreamReader sr = new StreamReader(requestData);
@@ -155,7 +155,7 @@ namespace OpenSim.Server.Handlers.Asset
             }
             catch (Exception e)
             {
-                m_log.DebugFormat("[XINVENTORY HANDLER]: Exception {0}", e.StackTrace);
+                m_log.ErrorFormat("[XINVENTORY HANDLER]: Exception {0}", e.StackTrace);
             }
 
             return FailureResult();
diff --git a/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs b/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs
index 9a7ad34..1fb0dbc 100644
--- a/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs
+++ b/OpenSim/Server/Handlers/Login/LLLoginServiceInConnector.cs
@@ -60,8 +60,8 @@ namespace OpenSim.Server.Handlers.Login
             InitializeHandlers(server);
         }
 
-        public LLLoginServiceInConnector(IConfigSource config, IHttpServer server) :
-            base(config, server, String.Empty)
+        public LLLoginServiceInConnector(IConfigSource config, IHttpServer server, string configName) :
+            base(config, server, configName)
         {
             string loginService = ReadLocalServiceFromConfig(config);
 
@@ -72,6 +72,11 @@ namespace OpenSim.Server.Handlers.Login
             InitializeHandlers(server);
         }
 
+        public LLLoginServiceInConnector(IConfigSource config, IHttpServer server) :
+            this(config, server, String.Empty)
+        {
+        }
+
         private string ReadLocalServiceFromConfig(IConfigSource config)
         {
             IConfig serverConfig = config.Configs["LoginService"];
diff --git a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
index 4a61969..d438fc7 100644
--- a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
+++ b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs
@@ -99,7 +99,7 @@ namespace OpenSim.Server.Handlers.MapImage
             m_Proxy = proxy;
         }
 
-        public override byte[] Handle(string path, Stream requestData, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        protected override byte[] ProcessRequest(string path, Stream requestData, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
 //            m_log.DebugFormat("[MAP SERVICE IMAGE HANDLER]: Received {0}", path);
             StreamReader sr = new StreamReader(requestData);
diff --git a/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs b/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs
index 4502b7d..bd1ddbd 100644
--- a/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs
+++ b/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Server.Handlers.MapImage
             m_MapService = service;
         }
 
-        public override byte[] Handle(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+        protected override byte[] ProcessRequest(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             ev.WaitOne();
             lock (ev)
diff --git a/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs b/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs
index 8a1f824..3525a01 100644
--- a/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs
+++ b/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Server.Handlers.Neighbour
             // TODO: unused: m_AuthenticationService = authentication;
         }
 
-        public override byte[] Handle(string path, Stream request,
+        protected override byte[] ProcessRequest(string path, Stream request,
                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             // Not implemented yet
@@ -83,7 +83,7 @@ namespace OpenSim.Server.Handlers.Neighbour
             // TODO: unused: m_AllowForeignGuests = foreignGuests;
         }
 
-        public override byte[] Handle(string path, Stream request,
+        protected override byte[] ProcessRequest(string path, Stream request,
                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             byte[] result = new byte[0];
@@ -176,7 +176,7 @@ namespace OpenSim.Server.Handlers.Neighbour
             // TODO: unused: m_AuthenticationService = authentication;
         }
 
-        public override byte[] Handle(string path, Stream request,
+        protected override byte[] ProcessRequest(string path, Stream request,
                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             // Not implemented yet
@@ -197,7 +197,7 @@ namespace OpenSim.Server.Handlers.Neighbour
             // TODO: unused: m_AuthenticationService = authentication;
         }
 
-        public override byte[] Handle(string path, Stream request,
+        protected override byte[] ProcessRequest(string path, Stream request,
                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             // Not implemented yet
diff --git a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
index 2d67c6d..abb4b19 100644
--- a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Server.Handlers.Presence
             m_PresenceService = service;
         }
 
-        public override byte[] Handle(string path, Stream requestData,
+        protected override byte[] ProcessRequest(string path, Stream requestData,
                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             StreamReader sr = new StreamReader(requestData);
diff --git a/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
new file mode 100644
index 0000000..28dbbc2
--- /dev/null
+++ b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs
@@ -0,0 +1,112 @@
+/*
+ * 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 Nini.Config;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Framework;
+using OpenSim.Server.Handlers.Base;
+using log4net;
+
+namespace OpenSim.Server.Handlers.Profiles
+{
+    public class UserProfilesConnector: ServiceConnector
+    {
+//        static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);        
+        
+        // Our Local Module
+        public IUserProfilesService ServiceModule
+        {
+            get; private set;
+        }
+
+        // The HTTP server.
+        public IHttpServer Server
+        {
+            get; private set;
+        }
+
+        public string ConfigName
+        {
+            get; private set;
+        }
+
+        public bool Enabled
+        {
+            get; private set;
+        }
+
+        public UserProfilesConnector(IConfigSource config, IHttpServer server, string configName) :
+            base(config, server, configName)
+        {
+            ConfigName = "UserProfilesService";
+            if(!string.IsNullOrEmpty(configName))
+                ConfigName = configName;
+
+            IConfig serverConfig = config.Configs[ConfigName];
+            if (serverConfig == null)
+                throw new Exception(String.Format("No section {0} in config file", ConfigName));
+
+            if(!serverConfig.GetBoolean("Enabled",false))
+            {
+                Enabled = false;
+                return;
+            }
+
+            Enabled = true;
+
+            Server = server;
+
+            string service = serverConfig.GetString("LocalServiceModule", String.Empty);
+
+            Object[] args = new Object[] { config, ConfigName };
+            ServiceModule = ServerUtils.LoadPlugin<IUserProfilesService>(service, args);
+            
+            JsonRpcProfileHandlers handler = new JsonRpcProfileHandlers(ServiceModule);
+
+            Server.AddJsonRPCHandler("avatarclassifiedsrequest", handler.AvatarClassifiedsRequest);
+            Server.AddJsonRPCHandler("classified_update", handler.ClassifiedUpdate);
+            Server.AddJsonRPCHandler("classifieds_info_query", handler.ClassifiedInfoRequest);
+            Server.AddJsonRPCHandler("classified_delete", handler.ClassifiedDelete);
+            Server.AddJsonRPCHandler("avatarpicksrequest", handler.AvatarPicksRequest);
+            Server.AddJsonRPCHandler("pickinforequest", handler.PickInfoRequest);
+            Server.AddJsonRPCHandler("picks_update", handler.PicksUpdate);
+            Server.AddJsonRPCHandler("picks_delete", handler.PicksDelete);
+            Server.AddJsonRPCHandler("avatarnotesrequest", handler.AvatarNotesRequest);
+            Server.AddJsonRPCHandler("avatar_notes_update", handler.NotesUpdate);
+            Server.AddJsonRPCHandler("avatar_properties_request", handler.AvatarPropertiesRequest);
+            Server.AddJsonRPCHandler("avatar_properties_update", handler.AvatarPropertiesUpdate);
+            Server.AddJsonRPCHandler("avatar_interests_update", handler.AvatarInterestsUpdate);
+            Server.AddJsonRPCHandler("image_assets_request", handler.AvatarImageAssetsRequest);
+            Server.AddJsonRPCHandler("user_data_request", handler.RequestUserAppData);
+            Server.AddJsonRPCHandler("user_data_update", handler.UpdateUserAppData);
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs b/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
new file mode 100644
index 0000000..f5f0794
--- /dev/null
+++ b/OpenSim/Server/Handlers/Profiles/UserProfilesHandlers.cs
@@ -0,0 +1,461 @@
+/*
+ * 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 OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using log4net;
+using OpenSim.Services.Interfaces;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Framework;
+
+namespace OpenSim.Server.Handlers
+{
+    public class UserProfilesHandlers
+    {
+        public UserProfilesHandlers ()
+        {
+        }
+    }
+
+    public class JsonRpcProfileHandlers
+    {
+        static readonly ILog m_log =
+            LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+        
+        public IUserProfilesService Service
+        {
+            get; private set;
+        }
+        
+        public JsonRpcProfileHandlers(IUserProfilesService service)
+        {
+            Service = service;
+        }
+        
+        #region Classifieds
+        /// <summary>
+        /// Request avatar's classified ads.
+        /// </summary>
+        /// <returns>
+        /// An array containing all the calassified uuid and it's name created by the creator id
+        /// </returns>
+        /// <param name='json'>
+        /// Our parameters are in the OSDMap json["params"]
+        /// </param>
+        /// <param name='response'>
+        /// If set to <c>true</c> response.
+        /// </param>
+        public bool AvatarClassifiedsRequest(OSDMap json, ref JsonRpcResponse response)
+        {
+            if(!json.ContainsKey("params"))
+            {
+                response.Error.Code = ErrorCode.ParseError;
+                m_log.DebugFormat ("Classified Request");
+                return false;
+            }
+            
+            OSDMap request = (OSDMap)json["params"];
+            UUID creatorId = new UUID(request["creatorId"].AsString());
+            
+            
+            OSDArray data = (OSDArray) Service.AvatarClassifiedsRequest(creatorId);
+            response.Result = data;
+            
+            return true;
+        }
+        
+        public bool ClassifiedUpdate(OSDMap json, ref JsonRpcResponse response)
+        {
+            if(!json.ContainsKey("params"))
+            {
+                response.Error.Code = ErrorCode.ParseError;
+                response.Error.Message = "Error parsing classified update request";
+                m_log.DebugFormat ("Classified Update Request");
+                return false;
+            }
+            
+            string result = string.Empty;
+            UserClassifiedAdd ad = new UserClassifiedAdd();
+            object Ad = (object)ad;
+            OSD.DeserializeMembers(ref Ad, (OSDMap)json["params"]);
+            if(Service.ClassifiedUpdate(ad, ref result))
+            {
+                response.Result = OSD.SerializeMembers(ad);
+                return true;
+            }
+            
+            response.Error.Code = ErrorCode.InternalError;
+            response.Error.Message = string.Format("{0}", result);
+            return false;
+        }
+        
+        public bool ClassifiedDelete(OSDMap json, ref JsonRpcResponse response)
+        {
+            if(!json.ContainsKey("params"))
+            {
+                response.Error.Code = ErrorCode.ParseError;
+                m_log.DebugFormat ("Classified Delete Request");
+                return false;
+            }
+            
+            OSDMap request = (OSDMap)json["params"];
+            UUID classifiedId = new UUID(request["classifiedID"].AsString());
+            
+            OSDMap res = new OSDMap();
+            res["result"] = OSD.FromString("success");
+            response.Result = res;
+            
+            return true;
+            
+        }
+        
+        public bool ClassifiedInfoRequest(OSDMap json, ref JsonRpcResponse response)
+        {
+            if(!json.ContainsKey("params"))
+            {
+                response.Error.Code = ErrorCode.ParseError;
+                response.Error.Message = "no parameters supplied";
+                m_log.DebugFormat ("Classified Info Request");
+                return false;
+            }
+            
+            string result = string.Empty;
+            UserClassifiedAdd ad = new UserClassifiedAdd();
+            object Ad = (object)ad;
+            OSD.DeserializeMembers(ref Ad, (OSDMap)json["params"]);
+            if(Service.ClassifiedInfoRequest(ref ad, ref result))
+            {
+                response.Result = OSD.SerializeMembers(ad);
+                return true;
+            }
+            
+            response.Error.Code = ErrorCode.InternalError;
+            response.Error.Message = string.Format("{0}", result);
+            return false;
+        }
+        #endregion Classifieds
+        
+        #region Picks
+        public bool AvatarPicksRequest(OSDMap json, ref JsonRpcResponse response)
+        {
+            if(!json.ContainsKey("params"))
+            {
+                response.Error.Code = ErrorCode.ParseError;
+                m_log.DebugFormat ("Avatar Picks Request");
+                return false;
+            }
+            
+            OSDMap request = (OSDMap)json["params"];
+            UUID creatorId = new UUID(request["creatorId"].AsString());
+            
+            
+            OSDArray data = (OSDArray) Service.AvatarPicksRequest(creatorId);
+            response.Result = data;
+            
+            return true;
+        }
+        
+        public bool PickInfoRequest(OSDMap json, ref JsonRpcResponse response)
+        {
+            if(!json.ContainsKey("params"))
+            {
+                response.Error.Code = ErrorCode.ParseError;
+                response.Error.Message = "no parameters supplied";
+                m_log.DebugFormat ("Avatar Picks Info Request");
+                return false;
+            }
+            
+            string result = string.Empty;
+            UserProfilePick pick = new UserProfilePick();
+            object Pick = (object)pick;
+            OSD.DeserializeMembers(ref Pick, (OSDMap)json["params"]);
+            if(Service.PickInfoRequest(ref pick, ref result))
+            {
+                response.Result = OSD.SerializeMembers(pick);
+                return true;
+            }
+            
+            response.Error.Code = ErrorCode.InternalError;
+            response.Error.Message = string.Format("{0}", result);
+            return false;
+        }
+        
+        public bool PicksUpdate(OSDMap json, ref JsonRpcResponse response)
+        {
+            if(!json.ContainsKey("params"))
+            {
+                response.Error.Code = ErrorCode.ParseError;
+                response.Error.Message = "no parameters supplied";
+                m_log.DebugFormat ("Avatar Picks Update Request");
+                return false;
+            }
+            
+            string result = string.Empty;
+            UserProfilePick pick = new UserProfilePick();
+            object Pick = (object)pick;
+            OSD.DeserializeMembers(ref Pick, (OSDMap)json["params"]);
+            if(Service.PicksUpdate(ref pick, ref result))
+            {
+                response.Result = OSD.SerializeMembers(pick);
+                return true;
+            }
+            
+            response.Error.Code = ErrorCode.InternalError;
+            response.Error.Message = "unable to update pick";
+            
+            return false;
+        }
+        
+        public bool PicksDelete(OSDMap json, ref JsonRpcResponse response)
+        {
+            if(!json.ContainsKey("params"))
+            {
+                response.Error.Code = ErrorCode.ParseError;
+                m_log.DebugFormat ("Avatar Picks Delete Request");
+                return false;
+            }
+            
+            OSDMap request = (OSDMap)json["params"];
+            UUID pickId = new UUID(request["pickId"].AsString());
+            if(Service.PicksDelete(pickId))
+                return true;
+            
+            response.Error.Code = ErrorCode.InternalError;
+            response.Error.Message = "data error removing record";
+            return false;
+        }
+        #endregion Picks
+        
+        #region Notes
+        public bool AvatarNotesRequest(OSDMap json, ref JsonRpcResponse response)
+        {
+            if(!json.ContainsKey("params"))
+            {
+                response.Error.Code = ErrorCode.ParseError;
+                response.Error.Message = "Params missing";
+                m_log.DebugFormat ("Avatar Notes Request");
+                return false;
+            }
+            
+            string result = string.Empty;
+            UserProfileNotes note = new UserProfileNotes();
+            object Note = (object)note;
+            OSD.DeserializeMembers(ref Note, (OSDMap)json["params"]);
+            if(Service.AvatarNotesRequest(ref note))
+            {
+                response.Result = OSD.SerializeMembers(note);
+                return true;
+            }
+            
+            object Notes = (object) note;
+            OSD.DeserializeMembers(ref Notes, (OSDMap)json["params"]);
+            return true;
+        }
+        
+        public bool NotesUpdate(OSDMap json, ref JsonRpcResponse response)
+        {
+            if(!json.ContainsKey("params"))
+            {
+                response.Error.Code = ErrorCode.ParseError;
+                response.Error.Message = "No parameters";
+                m_log.DebugFormat ("Avatar Notes Update Request");
+                return false;
+            }
+            
+            string result = string.Empty;
+            UserProfileNotes note = new UserProfileNotes();
+            object Notes = (object) note;
+            OSD.DeserializeMembers(ref Notes, (OSDMap)json["params"]);
+            if(Service.NotesUpdate(ref note, ref result))
+            {
+                response.Result = OSD.SerializeMembers(note);
+                return true;
+            }
+            return true;
+        }
+        #endregion Notes
+        
+        #region Profile Properties
+        public bool AvatarPropertiesRequest(OSDMap json, ref JsonRpcResponse response)
+        {
+            if(!json.ContainsKey("params"))
+            {
+                response.Error.Code = ErrorCode.ParseError;
+                response.Error.Message = "no parameters supplied";
+                m_log.DebugFormat ("Avatar Properties Request");
+                return false;
+            }
+            
+            string result = string.Empty;
+            UserProfileProperties props = new UserProfileProperties();
+            object Props = (object)props;
+            OSD.DeserializeMembers(ref Props, (OSDMap)json["params"]);
+            if(Service.AvatarPropertiesRequest(ref props, ref result))
+            {
+                response.Result = OSD.SerializeMembers(props);
+                return true;
+            }
+            
+            response.Error.Code = ErrorCode.InternalError;
+            response.Error.Message = string.Format("{0}", result);
+            return false;
+        }
+        
+        public bool AvatarPropertiesUpdate(OSDMap json, ref JsonRpcResponse response)
+        {
+            if(!json.ContainsKey("params"))
+            {
+                response.Error.Code = ErrorCode.ParseError;
+                response.Error.Message = "no parameters supplied";
+                m_log.DebugFormat ("Avatar Properties Update Request");
+                return false;
+            }
+            
+            string result = string.Empty;
+            UserProfileProperties props = new UserProfileProperties();
+            object Props = (object)props;
+            OSD.DeserializeMembers(ref Props, (OSDMap)json["params"]);
+            if(Service.AvatarPropertiesUpdate(ref props, ref result))
+            {
+                response.Result = OSD.SerializeMembers(props);
+                return true;
+            }
+            
+            response.Error.Code = ErrorCode.InternalError;
+            response.Error.Message = string.Format("{0}", result);
+            return false;
+        }
+        #endregion Profile Properties
+        
+        #region Interests
+        public bool AvatarInterestsUpdate(OSDMap json, ref JsonRpcResponse response)
+        {
+            if(!json.ContainsKey("params"))
+            {
+                response.Error.Code = ErrorCode.ParseError;
+                response.Error.Message = "no parameters supplied";
+                m_log.DebugFormat ("Avatar Interests Update Request");
+                return false;
+            }
+            
+            string result = string.Empty;
+            UserProfileProperties props = new UserProfileProperties();
+            object Props = (object)props;
+            OSD.DeserializeMembers(ref Props, (OSDMap)json["params"]);
+            if(Service.AvatarInterestsUpdate(props, ref result))
+            {
+                response.Result = OSD.SerializeMembers(props);
+                return true;
+            }
+            
+            response.Error.Code = ErrorCode.InternalError;
+            response.Error.Message = string.Format("{0}", result);
+            return false;
+        }
+        #endregion Interests
+
+        #region Utility
+        public bool AvatarImageAssetsRequest(OSDMap json, ref JsonRpcResponse response)
+        {
+            if(!json.ContainsKey("params"))
+            {
+                response.Error.Code = ErrorCode.ParseError;
+                m_log.DebugFormat ("Avatar Image Assets Request");
+                return false;
+            }
+            
+            OSDMap request = (OSDMap)json["params"];
+            UUID avatarId = new UUID(request["avatarId"].AsString());
+
+            OSDArray data = (OSDArray) Service.AvatarImageAssetsRequest(avatarId);
+            response.Result = data;
+            
+            return true;
+        }
+        #endregion Utiltiy
+
+        #region UserData
+        public bool RequestUserAppData(OSDMap json, ref JsonRpcResponse response)
+        {
+            if(!json.ContainsKey("params"))
+            {
+                response.Error.Code = ErrorCode.ParseError;
+                response.Error.Message = "no parameters supplied";
+                m_log.DebugFormat ("User Application Service URL Request: No Parameters!");
+                return false;
+            }
+            
+            string result = string.Empty;
+            UserAppData props = new UserAppData();
+            object Props = (object)props;
+            OSD.DeserializeMembers(ref Props, (OSDMap)json["params"]);
+            if(Service.RequestUserAppData(ref props, ref result))
+            {
+                OSDMap res = new OSDMap();
+                res["result"] = OSD.FromString("success");
+                res["token"] = OSD.FromString (result);
+                response.Result = res;
+                
+                return true;
+            }
+            
+            response.Error.Code = ErrorCode.InternalError;
+            response.Error.Message = string.Format("{0}", result);
+            return false;
+        }
+        
+        public bool UpdateUserAppData(OSDMap json, ref JsonRpcResponse response)
+        {
+            if(!json.ContainsKey("params"))
+            {
+                response.Error.Code = ErrorCode.ParseError;
+                response.Error.Message = "no parameters supplied";
+                m_log.DebugFormat ("User App Data Update Request");
+                return false;
+            }
+            
+            string result = string.Empty;
+            UserAppData props = new UserAppData();
+            object Props = (object)props;
+            OSD.DeserializeMembers(ref Props, (OSDMap)json["params"]);
+            if(Service.SetUserAppData(props, ref result))
+            {
+                response.Result = OSD.SerializeMembers(props);
+                return true;
+            }
+            
+            response.Error.Code = ErrorCode.InternalError;
+            response.Error.Message = string.Format("{0}", result);
+            return false;
+        }
+        #endregion UserData
+    }
+}
+
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
index 0bd8269..964ccf8 100644
--- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
@@ -27,11 +27,13 @@
 
 using System;
 using System.Collections;
+using System.Collections.Specialized;
 using System.IO;
 using System.IO.Compression;
 using System.Reflection;
 using System.Net;
 using System.Text;
+using System.Web;
 
 using OpenSim.Server.Base;
 using OpenSim.Server.Handlers.Base;
@@ -90,19 +92,13 @@ namespace OpenSim.Server.Handlers.Simulation
 
             // Next, let's parse the verb
             string method = (string)request["http-method"];
-            if (method.Equals("GET"))
+            if (method.Equals("DELETE"))
             {
-                DoAgentGet(request, responsedata, agentID, regionID);
-                return responsedata;
-            }
-            else if (method.Equals("DELETE"))
-            {
-                DoAgentDelete(request, responsedata, agentID, action, regionID);
-                return responsedata;
-            }
-            else if (method.Equals("DELETECHILD"))
-            {
-                DoChildAgentDelete(request, responsedata, agentID, action, regionID);
+                string auth_token = string.Empty;
+                if (request.ContainsKey("auth"))
+                    auth_token = request["auth"].ToString();
+
+                DoAgentDelete(request, responsedata, agentID, action, regionID, auth_token);
                 return responsedata;
             }
             else if (method.Equals("QUERYACCESS"))
@@ -112,7 +108,7 @@ namespace OpenSim.Server.Handlers.Simulation
             }
             else
             {
-                m_log.InfoFormat("[AGENT HANDLER]: method {0} not supported in agent message", method);
+                m_log.ErrorFormat("[AGENT HANDLER]: method {0} not supported in agent message {1} (caller is {2})", method, (string)request["uri"], Util.GetCallerIP(request));
                 responsedata["int_response_code"] = HttpStatusCode.MethodNotAllowed;
                 responsedata["str_response_string"] = "Method not allowed";
 
@@ -161,79 +157,12 @@ namespace OpenSim.Server.Handlers.Simulation
 //            Console.WriteLine("str_response_string [{0}]", responsedata["str_response_string"]);
         }
 
-        protected virtual void DoAgentGet(Hashtable request, Hashtable responsedata, UUID id, UUID regionID)
+        protected void DoAgentDelete(Hashtable request, Hashtable responsedata, UUID id, string action, UUID regionID, string auth_token)
         {
-            if (m_SimulationService == null)
-            {
-                m_log.Debug("[AGENT HANDLER]: Agent GET called. Harmless but useless.");
-                responsedata["content_type"] = "application/json";
-                responsedata["int_response_code"] = HttpStatusCode.NotImplemented;
-                responsedata["str_response_string"] = string.Empty;
-
-                return;
-            }
-
-            GridRegion destination = new GridRegion();
-            destination.RegionID = regionID;
-
-            IAgentData agent = null;
-            bool result = m_SimulationService.RetrieveAgent(destination, id, out agent);
-            OSDMap map = null;
-            if (result)
-            {
-                if (agent != null) // just to make sure
-                {
-                    map = agent.Pack();
-                    string strBuffer = "";
-                    try
-                    {
-                        strBuffer = OSDParser.SerializeJsonString(map);
-                    }
-                    catch (Exception e)
-                    {
-                        m_log.WarnFormat("[AGENT HANDLER]: Exception thrown on serialization of DoAgentGet: {0}", e.Message);
-                        responsedata["int_response_code"] = HttpStatusCode.InternalServerError;
-                        // ignore. buffer will be empty, caller should check.
-                    }
-
-                    responsedata["content_type"] = "application/json";
-                    responsedata["int_response_code"] = HttpStatusCode.OK;
-                    responsedata["str_response_string"] = strBuffer;
-                }
-                else
-                {
-                    responsedata["int_response_code"] = HttpStatusCode.InternalServerError;
-                    responsedata["str_response_string"] = "Internal error";
-                }
-            }
-            else
-            {
-                responsedata["int_response_code"] = HttpStatusCode.NotFound;
-                responsedata["str_response_string"] = "Not Found";
-            }
-        }
-
-        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);
+            if (string.IsNullOrEmpty(action))
+                m_log.DebugFormat("[AGENT HANDLER]: >>> DELETE <<< RegionID: {0}; from: {1}; auth_code: {2}", regionID, Util.GetCallerIP(request), auth_token);
             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);
+                m_log.DebugFormat("[AGENT HANDLER]: Release {0} to RegionID: {1}", id, regionID);
 
             GridRegion destination = new GridRegion();
             destination.RegionID = regionID;
@@ -241,12 +170,12 @@ namespace OpenSim.Server.Handlers.Simulation
             if (action.Equals("release"))
                 ReleaseAgent(regionID, id);
             else
-                m_SimulationService.CloseAgent(destination, id);
+                Util.FireAndForget(delegate { m_SimulationService.CloseAgent(destination, id, auth_token); });
 
             responsedata["int_response_code"] = HttpStatusCode.OK;
             responsedata["str_response_string"] = "OpenSim agent " + id.ToString();
 
-            m_log.DebugFormat("[AGENT HANDLER]: Agent {0} Released/Deleted from region {1}", id, regionID);
+            //m_log.DebugFormat("[AGENT HANDLER]: Agent {0} Released/Deleted from region {1}", id, regionID);
         }
 
         protected virtual void ReleaseAgent(UUID regionID, UUID id)
@@ -274,7 +203,7 @@ namespace OpenSim.Server.Handlers.Simulation
             m_SimulationService = null;
         }
 
-        public override byte[] Handle(string path, Stream request,
+        protected override byte[] ProcessRequest(string path, Stream request,
                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
 //            m_log.DebugFormat("[SIMULATION]: Stream handler called");
@@ -351,31 +280,16 @@ namespace OpenSim.Server.Handlers.Simulation
                 return;
             }
 
-            // retrieve the input arguments
-            int x = 0, y = 0;
-            UUID uuid = UUID.Zero;
-            string regionname = string.Empty;
-            uint teleportFlags = 0;
-            if (args.ContainsKey("destination_x") && args["destination_x"] != null)
-                Int32.TryParse(args["destination_x"].AsString(), out x);
-            else
-                m_log.WarnFormat("  -- request didn't have destination_x");
-            if (args.ContainsKey("destination_y") && args["destination_y"] != null)
-                Int32.TryParse(args["destination_y"].AsString(), out y);
-            else
-                m_log.WarnFormat("  -- request didn't have destination_y");
-            if (args.ContainsKey("destination_uuid") && args["destination_uuid"] != null)
-                UUID.TryParse(args["destination_uuid"].AsString(), out uuid);
-            if (args.ContainsKey("destination_name") && args["destination_name"] != null)
-                regionname = args["destination_name"].ToString();
-            if (args.ContainsKey("teleport_flags") && args["teleport_flags"] != null)
-                teleportFlags = args["teleport_flags"].AsUInteger();
+            AgentDestinationData data = CreateAgentDestinationData();
+            UnpackData(args, data, request);
 
             GridRegion destination = new GridRegion();
-            destination.RegionID = uuid;
-            destination.RegionLocX = x;
-            destination.RegionLocY = y;
-            destination.RegionName = regionname;
+            destination.RegionID = data.uuid;
+            destination.RegionLocX = data.x;
+            destination.RegionLocY = data.y;
+            destination.RegionName = data.name;
+
+            GridRegion gatekeeper = ExtractGatekeeper(data);
 
             AgentCircuitData aCircuit = new AgentCircuitData();
             try
@@ -396,7 +310,7 @@ namespace OpenSim.Server.Handlers.Simulation
             // This is the meaning of POST agent
             //m_regionClient.AdjustUserInformation(aCircuit);
             //bool result = m_SimulationService.CreateAgent(destination, aCircuit, teleportFlags, out reason);
-            bool result = CreateAgent(destination, aCircuit, teleportFlags, out reason);
+            bool result = CreateAgent(gatekeeper, destination, aCircuit, data.flags, data.fromLogin, out reason);
 
             resp["reason"] = OSD.FromString(reason);
             resp["success"] = OSD.FromBoolean(result);
@@ -408,7 +322,36 @@ namespace OpenSim.Server.Handlers.Simulation
             responsedata["str_response_string"] = OSDParser.SerializeJsonString(resp);
         }
 
-        private string GetCallerIP(Hashtable request)
+        protected virtual AgentDestinationData CreateAgentDestinationData()
+        {
+            return new AgentDestinationData();
+        }
+
+        protected virtual void UnpackData(OSDMap args, AgentDestinationData data, Hashtable request)
+        {
+            // retrieve the input arguments
+            if (args.ContainsKey("destination_x") && args["destination_x"] != null)
+                Int32.TryParse(args["destination_x"].AsString(), out data.x);
+            else
+                m_log.WarnFormat("  -- request didn't have destination_x");
+            if (args.ContainsKey("destination_y") && args["destination_y"] != null)
+                Int32.TryParse(args["destination_y"].AsString(), out data.y);
+            else
+                m_log.WarnFormat("  -- request didn't have destination_y");
+            if (args.ContainsKey("destination_uuid") && args["destination_uuid"] != null)
+                UUID.TryParse(args["destination_uuid"].AsString(), out data.uuid);
+            if (args.ContainsKey("destination_name") && args["destination_name"] != null)
+                data.name = args["destination_name"].ToString();
+            if (args.ContainsKey("teleport_flags") && args["teleport_flags"] != null)
+                data.flags = args["teleport_flags"].AsUInteger();
+        }
+
+        protected virtual GridRegion ExtractGatekeeper(AgentDestinationData data)
+        {
+            return null;
+        }
+
+        protected string GetCallerIP(Hashtable request)
         {
             if (!m_Proxy)
                 return Util.GetCallerIP(request);
@@ -441,7 +384,7 @@ namespace OpenSim.Server.Handlers.Simulation
         }
 
         // subclasses can override this
-        protected virtual bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint teleportFlags, out string reason)
+        protected virtual bool CreateAgent(GridRegion gatekeeper, GridRegion destination, AgentCircuitData aCircuit, uint teleportFlags, bool fromLogin, out string reason)
         {
             reason = String.Empty;
             
@@ -474,7 +417,7 @@ namespace OpenSim.Server.Handlers.Simulation
             m_SimulationService = null;
         }
 
-        public override byte[] Handle(string path, Stream request,
+        protected override byte[] ProcessRequest(string path, Stream request,
                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
 //            m_log.DebugFormat("[SIMULATION]: Stream handler called");
@@ -593,7 +536,6 @@ namespace OpenSim.Server.Handlers.Simulation
                 //agent.Dump();
                 // This is one of the meanings of PUT agent
                 result = UpdateAgent(destination, agent);
-
             }
             else if ("AgentPosition".Equals(messageType))
             {
@@ -624,4 +566,14 @@ namespace OpenSim.Server.Handlers.Simulation
             return m_SimulationService.UpdateAgent(destination, agent);
         }
     }
+
+    public class AgentDestinationData
+    {
+        public int x;
+        public int y;
+        public string name;
+        public UUID uuid;
+        public uint flags;
+        public bool fromLogin;
+    }
 }
diff --git a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
index 72551ef..24c9de6 100644
--- a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Server.Handlers.UserAccounts
             }
         }
 
-        public override byte[] Handle(string path, Stream requestData,
+        protected override byte[] ProcessRequest(string path, Stream requestData,
                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
             StreamReader sr = new StreamReader(requestData);
diff --git a/OpenSim/Services/AssetService/XAssetService.cs b/OpenSim/Services/AssetService/XAssetService.cs
index 8a2ca7c..6047616 100644
--- a/OpenSim/Services/AssetService/XAssetService.cs
+++ b/OpenSim/Services/AssetService/XAssetService.cs
@@ -205,15 +205,16 @@ namespace OpenSim.Services.AssetService
             if (!UUID.TryParse(id, out assetID))
                 return false;
 
-            // Don't bother deleting from a chained asset service.  This isn't a big deal since deleting happens
-            // very rarely.
+            if (HasChainedAssetService)
+                m_ChainedAssetService.Delete(id);
 
             return m_Database.Delete(id);
         }
 
         private void MigrateFromChainedService(AssetBase asset)
         {
-            Util.FireAndForget(o => { Store(asset); m_ChainedAssetService.Delete(asset.ID); });
+            Store(asset); 
+            m_ChainedAssetService.Delete(asset.ID);
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index 8b702e0..bf0cc35 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -66,6 +66,12 @@ namespace OpenSim.Services.Connectors
 
         private Thread[] m_fetchThreads;
 
+        public int MaxAssetRequestConcurrency
+        {
+            get { return m_maxAssetRequestConcurrency; }
+            set { m_maxAssetRequestConcurrency = value; }
+        }
+
         public AssetServicesConnector()
         {
         }
diff --git a/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
index f982cc1..af91cdb 100644
--- a/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
@@ -525,6 +525,57 @@ namespace OpenSim.Services.Connectors
             return rinfos;
         }
 
+        public List<GridRegion> GetDefaultHypergridRegions(UUID scopeID)
+        {
+            Dictionary<string, object> sendData = new Dictionary<string, object>();
+
+            sendData["SCOPEID"] = scopeID.ToString();
+
+            sendData["METHOD"] = "get_default_hypergrid_regions";
+
+            List<GridRegion> rinfos = new List<GridRegion>();
+            string reply = string.Empty;
+            string uri = m_ServerURI + "/grid";
+            try
+            {
+                reply = SynchronousRestFormsRequester.MakeRequest("POST",
+                        uri,
+                        ServerUtils.BuildQueryString(sendData));
+
+                //m_log.DebugFormat("[GRID CONNECTOR]: reply was {0}", reply);
+            }
+            catch (Exception e)
+            {
+                m_log.DebugFormat("[GRID CONNECTOR]: Exception when contacting grid server at {0}: {1}", uri, e.Message);
+                return rinfos;
+            }
+
+            if (reply != string.Empty)
+            {
+                Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
+
+                if (replyData != null)
+                {
+                    Dictionary<string, object>.ValueCollection rinfosList = replyData.Values;
+                    foreach (object r in rinfosList)
+                    {
+                        if (r is Dictionary<string, object>)
+                        {
+                            GridRegion rinfo = new GridRegion((Dictionary<string, object>)r);
+                            rinfos.Add(rinfo);
+                        }
+                    }
+                }
+                else
+                    m_log.DebugFormat("[GRID CONNECTOR]: GetDefaultHypergridRegions {0} received null response",
+                        scopeID);
+            }
+            else
+                m_log.DebugFormat("[GRID CONNECTOR]: GetDefaultHypergridRegions received null reply");
+
+            return rinfos;
+        }
+
         public List<GridRegion> GetFallbackRegions(UUID scopeID, int x, int y)
         {
             Dictionary<string, object> sendData = new Dictionary<string, object>();
diff --git a/OpenSim/Services/Connectors/GridUser/GridUserServicesConnector.cs b/OpenSim/Services/Connectors/GridUser/GridUserServicesConnector.cs
index 94bda82..1a62d2f 100644
--- a/OpenSim/Services/Connectors/GridUser/GridUserServicesConnector.cs
+++ b/OpenSim/Services/Connectors/GridUser/GridUserServicesConnector.cs
@@ -214,7 +214,7 @@ namespace OpenSim.Services.Connectors
 
                 }
                 else
-                    m_log.DebugFormat("[GRID USER CONNECTOR]: Loggedin received empty reply");
+                    m_log.DebugFormat("[GRID USER CONNECTOR]: Get received empty reply");
             }
             catch (Exception e)
             {
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
index d840527..803cd1b 100644
--- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
@@ -53,7 +53,8 @@ namespace OpenSim.Services.Connectors.Hypergrid
 
         private IAssetService m_AssetService;
 
-        public GatekeeperServiceConnector() : base()
+        public GatekeeperServiceConnector()
+            : base()
         {
         }
 
@@ -123,11 +124,13 @@ namespace OpenSim.Services.Connectors.Hypergrid
                         realHandle = Convert.ToUInt64((string)hash["handle"]);
                         //m_log.Debug(">> HERE, realHandle: " + realHandle);
                     }
-                    if (hash["region_image"] != null) {
+                    if (hash["region_image"] != null)
+                    {
                         imageURL = (string)hash["region_image"];
                         //m_log.Debug(">> HERE, imageURL: " + imageURL);
                     }
-                    if (hash["external_name"] != null) {
+                    if (hash["external_name"] != null)
+                    {
                         externalName = (string)hash["external_name"];
                         //m_log.Debug(">> HERE, externalName: " + externalName);
                     }
@@ -179,7 +182,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
                     //m_log.Debug("Size: " + m.PhysicalDimension.Height + "-" + m.PhysicalDimension.Width);
                     imageData = OpenJPEG.EncodeFromImage(bitmap, true);
                 }
-                
+
                 AssetBase ass = new AssetBase(UUID.Random(), "region " + name, (sbyte)AssetType.Texture, regionID.ToString());
 
                 // !!! for now
@@ -257,7 +260,8 @@ namespace OpenSim.Services.Connectors.Hypergrid
                         region.RegionName = (string)hash["region_name"];
                         //m_log.Debug(">> HERE, region_name: " + region.RegionName);
                     }
-                    if (hash["hostname"] != null) {
+                    if (hash["hostname"] != null)
+                    {
                         region.ExternalHostName = (string)hash["hostname"];
                         //m_log.Debug(">> HERE, hostname: " + region.ExternalHostName);
                     }
@@ -275,10 +279,10 @@ namespace OpenSim.Services.Connectors.Hypergrid
                         region.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), p);
                         //m_log.Debug(">> HERE, internal_port: " + region.InternalEndPoint);
                     }
-                    
+
                     if (hash["server_uri"] != null)
                     {
-                        region.ServerURI = (string) hash["server_uri"];
+                        region.ServerURI = (string)hash["server_uri"];
                         //m_log.Debug(">> HERE, server_uri: " + region.ServerURI);
                     }
 
@@ -295,55 +299,5 @@ namespace OpenSim.Services.Connectors.Hypergrid
 
             return null;
         }
-
-        public bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint flags, out string myipaddress, out string reason)
-        {
-            // m_log.DebugFormat("[GATEKEEPER SERVICE CONNECTOR]: CreateAgent start");
-
-            myipaddress = String.Empty;
-            reason = String.Empty;
-
-            if (destination == null)
-            {
-                m_log.Debug("[GATEKEEPER SERVICE CONNECTOR]: Given destination is null");
-                return false;
-            }
-
-            string uri = destination.ServerURI + AgentPath() + aCircuit.AgentID + "/";
-
-            try
-            {
-                OSDMap args = aCircuit.PackAgentCircuitData();
-
-                args["destination_x"] = OSD.FromString(destination.RegionLocX.ToString());
-                args["destination_y"] = OSD.FromString(destination.RegionLocY.ToString());
-                args["destination_name"] = OSD.FromString(destination.RegionName);
-                args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
-                args["teleport_flags"] = OSD.FromString(flags.ToString());
-
-                OSDMap result = WebUtil.PostToService(uri, args, 80000);
-                if (result["Success"].AsBoolean())
-                {
-                    OSDMap unpacked = (OSDMap)result["_Result"];
-
-                    if (unpacked != null)
-                    {
-                        reason = unpacked["reason"].AsString();
-                        myipaddress = unpacked["your_ip"].AsString();
-                        return unpacked["success"].AsBoolean();
-                    }
-                }
-                
-                reason = result["Message"] != null ? result["Message"].AsString() : "error";
-                return false;
-            }
-            catch (Exception e)
-            {
-                m_log.Warn("[REMOTE SIMULATION CONNECTOR]: CreateAgent failed with exception: " + e.ToString());
-                reason = e.Message;
-            }
-
-            return false;
-        }
     }
 }
diff --git a/OpenSim/Services/Connectors/Hypergrid/HGFriendsServicesConnector.cs b/OpenSim/Services/Connectors/Hypergrid/HGFriendsServicesConnector.cs
index e984a54..622d4e1 100644
--- a/OpenSim/Services/Connectors/Hypergrid/HGFriendsServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/HGFriendsServicesConnector.cs
@@ -277,7 +277,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
             {
                 reply = SynchronousRestFormsRequester.MakeRequest("POST",
                         uri,
-                        ServerUtils.BuildQueryString(sendData));
+                        ServerUtils.BuildQueryString(sendData), 15);
             }
             catch (Exception e)
             {
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index d7e38f1..5f5b7a7 100644
--- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
@@ -44,13 +44,14 @@ using Nini.Config;
 
 namespace OpenSim.Services.Connectors.Hypergrid
 {
-    public class UserAgentServiceConnector : IUserAgentService
+    public class UserAgentServiceConnector : SimulationServiceConnector, IUserAgentService
     {
         private static readonly ILog m_log =
             LogManager.GetLogger(
             MethodBase.GetCurrentMethod().DeclaringType);
 
-        string m_ServerURL;
+        private string m_ServerURL;
+        private GridRegion m_Gatekeeper;
 
         public UserAgentServiceConnector(string url) : this(url, true)
         {
@@ -102,9 +103,15 @@ namespace OpenSim.Services.Connectors.Hypergrid
             m_log.DebugFormat("[USER AGENT CONNECTOR]: UserAgentServiceConnector started for {0}", m_ServerURL);
         }
 
+        protected override string AgentPath()
+        {
+            return "homeagent/";
+        }
 
-        // The Login service calls this interface with a non-null [client] ipaddress 
-        public bool LoginAgentToGrid(AgentCircuitData aCircuit, GridRegion gatekeeper, GridRegion destination, IPEndPoint ipaddress, out string reason)
+        // The Login service calls this interface with fromLogin=true 
+        // Sims call it with fromLogin=false
+        // Either way, this is verified by the handler
+        public bool LoginAgentToGrid(AgentCircuitData aCircuit, GridRegion gatekeeper, GridRegion destination, bool fromLogin, out string reason)
         {
             reason = String.Empty;
 
@@ -115,119 +122,34 @@ namespace OpenSim.Services.Connectors.Hypergrid
                 return false;
             }
 
-            string uri = m_ServerURL + "homeagent/" + aCircuit.AgentID + "/";
-
-            Console.WriteLine("   >>> LoginAgentToGrid <<< " + uri);
-
-            HttpWebRequest AgentCreateRequest = (HttpWebRequest)WebRequest.Create(uri);
-            AgentCreateRequest.Method = "POST";
-            AgentCreateRequest.ContentType = "application/json";
-            AgentCreateRequest.Timeout = 10000;
-            //AgentCreateRequest.KeepAlive = false;
-            //AgentCreateRequest.Headers.Add("Authorization", authKey);
-
-            // Fill it in
-            OSDMap args = PackCreateAgentArguments(aCircuit, gatekeeper, destination, ipaddress);
-
-            string strBuffer = "";
-            byte[] buffer = new byte[1];
-            try
-            {
-                strBuffer = OSDParser.SerializeJsonString(args);
-                Encoding str = Util.UTF8;
-                buffer = str.GetBytes(strBuffer);
-
-            }
-            catch (Exception e)
-            {
-                m_log.WarnFormat("[USER AGENT CONNECTOR]: Exception thrown on serialization of ChildCreate: {0}", e.Message);
-                // ignore. buffer will be empty, caller should check.
-            }
-
-            Stream os = null;
-            try
-            { // send the Post
-                AgentCreateRequest.ContentLength = buffer.Length;   //Count bytes to send
-                os = AgentCreateRequest.GetRequestStream();
-                os.Write(buffer, 0, strBuffer.Length);         //Send it
-                m_log.InfoFormat("[USER AGENT CONNECTOR]: Posted CreateAgent request to remote sim {0}, region {1}, x={2} y={3}",
-                    uri, destination.RegionName, destination.RegionLocX, destination.RegionLocY);
-            }
-            //catch (WebException ex)
-            catch
-            {
-                //m_log.InfoFormat("[USER AGENT CONNECTOR]: Bad send on ChildAgentUpdate {0}", ex.Message);
-                reason = "cannot contact remote region";
-                return false;
-            }
-            finally
-            {
-                if (os != null)
-                    os.Close();
-            }
-
-            // Let's wait for the response
-            //m_log.Info("[USER AGENT CONNECTOR]: Waiting for a reply after DoCreateChildAgentCall");
+            GridRegion home = new GridRegion();
+            home.ServerURI = m_ServerURL;
+            home.RegionID = destination.RegionID;
+            home.RegionLocX = destination.RegionLocX;
+            home.RegionLocY = destination.RegionLocY;
 
-            try
-            {
-                using (WebResponse webResponse = AgentCreateRequest.GetResponse())
-                {
-                    if (webResponse == null)
-                    {
-                        m_log.Info("[USER AGENT CONNECTOR]: Null reply on DoCreateChildAgentCall post");
-                    }
-                    else
-                    {
-                        using (Stream s = webResponse.GetResponseStream())
-                        {
-                            using (StreamReader sr = new StreamReader(s))
-                            {
-                                string response = sr.ReadToEnd().Trim();
-                                m_log.InfoFormat("[USER AGENT CONNECTOR]: DoCreateChildAgentCall reply was {0} ", response);
-
-                                if (!String.IsNullOrEmpty(response))
-                                {
-                                    try
-                                    {
-                                        // we assume we got an OSDMap back
-                                        OSDMap r = Util.GetOSDMap(response);
-                                        bool success = r["success"].AsBoolean();
-                                        reason = r["reason"].AsString();
-                                        return success;
-                                    }
-                                    catch (NullReferenceException e)
-                                    {
-                                        m_log.InfoFormat("[USER AGENT CONNECTOR]: exception on reply of DoCreateChildAgentCall {0}", e.Message);
-
-                                        // check for old style response
-                                        if (response.ToLower().StartsWith("true"))
-                                            return true;
-
-                                        return false;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            catch (WebException ex)
-            {
-                m_log.InfoFormat("[USER AGENT CONNECTOR]: exception on reply of DoCreateChildAgentCall {0}", ex.Message);
-                reason = "Destination did not reply";
-                return false;
-            }
+            m_Gatekeeper = gatekeeper;
 
-            return true;
+            Console.WriteLine("   >>> LoginAgentToGrid <<< " + home.ServerURI);
 
+            uint flags = fromLogin ? (uint)TeleportFlags.ViaLogin : (uint)TeleportFlags.ViaHome;
+            return CreateAgent(home, aCircuit, flags, out reason);
         }
 
 
         // The simulators call this interface
         public bool LoginAgentToGrid(AgentCircuitData aCircuit, GridRegion gatekeeper, GridRegion destination, out string reason)
         {
-            return LoginAgentToGrid(aCircuit, gatekeeper, destination, null, out reason);
+            return LoginAgentToGrid(aCircuit, gatekeeper, destination, false, out reason);
+        }
+
+        protected override void PackData(OSDMap args, AgentCircuitData aCircuit, GridRegion destination, uint flags)
+        {
+            base.PackData(args, aCircuit, destination, flags);
+            args["gatekeeper_serveruri"] = OSD.FromString(m_Gatekeeper.ServerURI);
+            args["gatekeeper_host"] = OSD.FromString(m_Gatekeeper.ExternalHostName);
+            args["gatekeeper_port"] = OSD.FromString(m_Gatekeeper.HttpPort.ToString());
+            args["destination_serveruri"] = OSD.FromString(destination.ServerURI);
         }
 
         protected OSDMap PackCreateAgentArguments(AgentCircuitData aCircuit, GridRegion gatekeeper, GridRegion destination, IPEndPoint ipaddress)
diff --git a/OpenSim/Services/Connectors/InstantMessage/InstantMessageServiceConnector.cs b/OpenSim/Services/Connectors/InstantMessage/InstantMessageServiceConnector.cs
index dbce9f6..e19c23d 100644
--- a/OpenSim/Services/Connectors/InstantMessage/InstantMessageServiceConnector.cs
+++ b/OpenSim/Services/Connectors/InstantMessage/InstantMessageServiceConnector.cs
@@ -123,6 +123,7 @@ namespace OpenSim.Services.Connectors.InstantMessage
             gim["position_z"] = msg.Position.Z.ToString();
             gim["region_id"] = msg.RegionID.ToString();
             gim["binary_bucket"] = Convert.ToBase64String(msg.binaryBucket, Base64FormattingOptions.None);
+            gim["region_id"] = new UUID(msg.RegionID).ToString();
 
             return gim;
         }
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
index 44f5e01..36d4ae2 100644
--- a/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/XInventoryServicesConnector.cs
@@ -84,6 +84,30 @@ namespace OpenSim.Services.Connectors
             m_ServerURI = serviceURI;
         }
 
+        private bool CheckReturn(Dictionary<string, object> ret)
+        {
+            if (ret == null)
+                return false;
+
+            if (ret.Count == 0)
+                return false;
+
+            if (ret.ContainsKey("RESULT"))
+            {
+                if (ret["RESULT"] is string)
+                {
+                    bool result;
+
+                    if (bool.TryParse((string)ret["RESULT"], out result))
+                        return result;
+
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
         public bool CreateUserInventory(UUID principalID)
         {
             Dictionary<string,object> ret = MakeRequest("CREATEUSERINVENTORY",
@@ -91,12 +115,7 @@ namespace OpenSim.Services.Connectors
                         { "PRINCIPAL", principalID.ToString() }
                     });
 
-            if (ret == null)
-                return false;
-            if (ret.Count == 0)
-                return false;
-
-            return bool.Parse(ret["RESULT"].ToString());
+            return CheckReturn(ret);
         }
 
         public List<InventoryFolderBase> GetInventorySkeleton(UUID principalID)
@@ -106,9 +125,7 @@ namespace OpenSim.Services.Connectors
                         { "PRINCIPAL", principalID.ToString() }
                     });
 
-            if (ret == null)
-                return null;
-            if (ret.Count == 0)
+            if (!CheckReturn(ret))
                 return null;
 
             Dictionary<string, object> folders = (Dictionary<string, object>)ret["FOLDERS"];
@@ -135,9 +152,7 @@ namespace OpenSim.Services.Connectors
                         { "PRINCIPAL", principalID.ToString() }
                     });
 
-            if (ret == null)
-                return null;
-            if (ret.Count == 0)
+            if (!CheckReturn(ret))
                 return null;
 
             return BuildFolder((Dictionary<string, object>)ret["folder"]);
@@ -151,9 +166,7 @@ namespace OpenSim.Services.Connectors
                         { "TYPE", ((int)type).ToString() }
                     });
 
-            if (ret == null)
-                return null;
-            if (ret.Count == 0)
+            if (!CheckReturn(ret))
                 return null;
 
             return BuildFolder((Dictionary<string, object>)ret["folder"]);
@@ -174,9 +187,7 @@ namespace OpenSim.Services.Connectors
                             { "FOLDER", folderID.ToString() }
                         });
 
-                if (ret == null)
-                    return null;
-                if (ret.Count == 0)
+                if (!CheckReturn(ret))
                     return null;
 
                 Dictionary<string,object> folders =
@@ -205,9 +216,7 @@ namespace OpenSim.Services.Connectors
                         { "FOLDER", folderID.ToString() }
                     });
 
-            if (ret == null)
-                return null;
-            if (ret.Count == 0)
+            if (!CheckReturn(ret))
                 return null;
 
             Dictionary<string, object> items = (Dictionary<string, object>)ret["ITEMS"];
@@ -230,10 +239,7 @@ namespace OpenSim.Services.Connectors
                         { "ID", folder.ID.ToString() }
                     });
 
-            if (ret == null)
-                return false;
-
-            return bool.Parse(ret["RESULT"].ToString());
+            return CheckReturn(ret);
         }
 
         public bool UpdateFolder(InventoryFolderBase folder)
@@ -248,10 +254,7 @@ namespace OpenSim.Services.Connectors
                         { "ID", folder.ID.ToString() }
                     });
 
-            if (ret == null)
-                return false;
-
-            return bool.Parse(ret["RESULT"].ToString());
+            return CheckReturn(ret);
         }
 
         public bool MoveFolder(InventoryFolderBase folder)
@@ -263,10 +266,7 @@ namespace OpenSim.Services.Connectors
                         { "PRINCIPAL", folder.Owner.ToString() }
                     });
 
-            if (ret == null)
-                return false;
-
-            return bool.Parse(ret["RESULT"].ToString());
+            return CheckReturn(ret);
         }
 
         public bool DeleteFolders(UUID principalID, List<UUID> folderIDs)
@@ -282,10 +282,7 @@ namespace OpenSim.Services.Connectors
                         { "FOLDERS", slist }
                     });
 
-            if (ret == null)
-                return false;
-
-            return bool.Parse(ret["RESULT"].ToString());
+            return CheckReturn(ret);
         }
 
         public bool PurgeFolder(InventoryFolderBase folder)
@@ -295,10 +292,7 @@ namespace OpenSim.Services.Connectors
                         { "ID", folder.ID.ToString() }
                     });
 
-            if (ret == null)
-                return false;
-
-            return bool.Parse(ret["RESULT"].ToString());
+            return CheckReturn(ret);
         }
 
         public bool AddItem(InventoryItemBase item)
@@ -330,10 +324,7 @@ namespace OpenSim.Services.Connectors
                         { "CreationDate", item.CreationDate.ToString() }
                     });
 
-            if (ret == null)
-                return false;
-
-            return bool.Parse(ret["RESULT"].ToString());
+            return CheckReturn(ret);
         }
 
         public bool UpdateItem(InventoryItemBase item)
@@ -365,10 +356,7 @@ namespace OpenSim.Services.Connectors
                         { "CreationDate", item.CreationDate.ToString() }
                     });
 
-            if (ret == null)
-                return false;
-
-            return bool.Parse(ret["RESULT"].ToString());
+            return CheckReturn(ret);
         }
 
         public bool MoveItems(UUID principalID, List<InventoryItemBase> items)
@@ -389,10 +377,7 @@ namespace OpenSim.Services.Connectors
                         { "DESTLIST", destlist }
                     });
 
-            if (ret == null)
-                return false;
-
-            return bool.Parse(ret["RESULT"].ToString());
+            return CheckReturn(ret);
         }
 
         public bool DeleteItems(UUID principalID, List<UUID> itemIDs)
@@ -408,10 +393,7 @@ namespace OpenSim.Services.Connectors
                         { "ITEMS", slist }
                     });
 
-            if (ret == null)
-                return false;
-
-            return bool.Parse(ret["RESULT"].ToString());
+            return CheckReturn(ret);
         }
 
         public InventoryItemBase GetItem(InventoryItemBase item)
@@ -423,9 +405,7 @@ namespace OpenSim.Services.Connectors
                         { "ID", item.ID.ToString() }
                     });
 
-                if (ret == null)
-                    return null;
-                if (ret.Count == 0)
+                if (!CheckReturn(ret))
                     return null;
 
                 return BuildItem((Dictionary<string, object>)ret["item"]);
@@ -447,9 +427,7 @@ namespace OpenSim.Services.Connectors
                         { "ID", folder.ID.ToString() }
                     });
 
-                if (ret == null)
-                    return null;
-                if (ret.Count == 0)
+                if (!CheckReturn(ret))
                     return null;
 
                 return BuildFolder((Dictionary<string, object>)ret["folder"]);
@@ -469,7 +447,7 @@ namespace OpenSim.Services.Connectors
                         { "PRINCIPAL", principalID.ToString() }
                     });
 
-            if (ret == null)
+            if (!CheckReturn(ret))
                 return null;
 
             List<InventoryItemBase> items = new List<InventoryItemBase>();
@@ -488,10 +466,22 @@ namespace OpenSim.Services.Connectors
                         { "ASSET", assetID.ToString() }
                     });
 
+            // We cannot use CheckReturn() here because valid values for RESULT are "false" (in the case of request failure) or an int           
             if (ret == null)
                 return 0;
 
-            return int.Parse(ret["RESULT"].ToString());
+            if (ret.ContainsKey("RESULT"))
+            {
+                if (ret["RESULT"] is string)
+                {
+                    int intResult;
+
+                    if (int.TryParse ((string)ret["RESULT"], out intResult))
+                        return intResult;
+                }
+            }
+
+            return 0;
         }
 
         public InventoryCollection GetUserInventory(UUID principalID)
@@ -508,9 +498,7 @@ namespace OpenSim.Services.Connectors
                             { "PRINCIPAL", principalID.ToString() }
                         });
 
-                if (ret == null)
-                    return null;
-                if (ret.Count == 0)
+                if (!CheckReturn(ret))
                     return null;
 
                 Dictionary<string, object> folders =
diff --git a/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
index b36fa23..245703c 100644
--- a/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
@@ -98,7 +98,7 @@ namespace OpenSim.Services.Connectors
             catch (Exception e)
             {
                 m_log.WarnFormat(
-                    "[NEIGHBOUR SERVICE CONNCTOR]: Unable to parse uri {0} to send HelloNeighbour from {1} to {2}.  Exception {3}{4}",
+                    "[NEIGHBOUR SERVICES CONNECTOR]: Unable to parse uri {0} to send HelloNeighbour from {1} to {2}.  Exception {3}{4}",
                     uri, thisRegion.RegionName, region.RegionName, e.Message, e.StackTrace);
 
                 return false;
@@ -117,7 +117,7 @@ namespace OpenSim.Services.Connectors
             catch (Exception e)
             {
                 m_log.WarnFormat(
-                    "[NEIGHBOUR SERVICE CONNCTOR]: PackRegionInfoData failed for HelloNeighbour from {0} to {1}.  Exception {2}{3}",
+                    "[NEIGHBOUR SERVICES CONNECTOR]: PackRegionInfoData failed for HelloNeighbour from {0} to {1}.  Exception {2}{3}",
                     thisRegion.RegionName, region.RegionName, e.Message, e.StackTrace);
 
                 return false;
@@ -137,7 +137,7 @@ namespace OpenSim.Services.Connectors
             catch (Exception e)
             {
                 m_log.WarnFormat(
-                    "[NEIGHBOUR SERVICE CONNCTOR]: Exception thrown on serialization of HelloNeighbour from {0} to {1}.  Exception {2}{3}",
+                    "[NEIGHBOUR SERVICES CONNECTOR]: Exception thrown on serialization of HelloNeighbour from {0} to {1}.  Exception {2}{3}",
                     thisRegion.RegionName, region.RegionName, e.Message, e.StackTrace);
 
                 return false;
@@ -175,7 +175,7 @@ namespace OpenSim.Services.Connectors
                     if (webResponse == null)
                     {
                         m_log.DebugFormat(
-                            "[REST COMMS]: Null reply on DoHelloNeighbourCall post from {0} to {1}",
+                            "[NEIGHBOUR SERVICES CONNECTOR]: Null reply on DoHelloNeighbourCall post from {0} to {1}",
                             thisRegion.RegionName, region.RegionName);
                     }
 
@@ -193,7 +193,7 @@ namespace OpenSim.Services.Connectors
             catch (Exception e)
             {
                 m_log.WarnFormat(
-                    "[NEIGHBOUR SERVICE CONNCTOR]: Exception on reply of DoHelloNeighbourCall from {0} back to {1}.  Exception {2}{3}",
+                    "[NEIGHBOUR SERVICES CONNECTOR]: Exception on reply of DoHelloNeighbourCall from {0} back to {1}.  Exception {2}{3}",
                     region.RegionName, thisRegion.RegionName, e.Message, e.StackTrace);
 
                 return false;
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
index 74b980c..6f8d9ed 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.IO;
 using System.Net;
 using System.Reflection;
@@ -122,7 +123,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 m_Enabled = true;
         }
 
-        #region IAssetService
+#region IAssetService
 
         public AssetBase Get(string id)
         {
@@ -140,8 +141,9 @@ namespace OpenSim.Services.Connectors.SimianGrid
                     return asset;
             }
 
-            return GetRemote(id);
+            return SimianGetOperation(id);
         }
+        
 
         public AssetBase GetCached(string id)
         {
@@ -164,8 +166,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 throw new InvalidOperationException();
             }
 
-            AssetMetadata metadata = null;
-
             // Cache fetch
             if (m_cache != null)
             {
@@ -174,50 +174,18 @@ namespace OpenSim.Services.Connectors.SimianGrid
                     return asset.Metadata;
             }
 
-            Uri url;
-
-            // Determine if id is an absolute URL or a grid-relative UUID
-            if (!Uri.TryCreate(id, UriKind.Absolute, out url))
-                url = new Uri(m_serverUrl + id);
-
-            try
-            {
-                HttpWebRequest request = UntrustedHttpWebRequest.Create(url);
-                request.Method = "HEAD";
-
-                using (WebResponse response = request.GetResponse())
-                {
-                    using (Stream responseStream = response.GetResponseStream())
-                    {
-                        // Create the metadata object
-                        metadata = new AssetMetadata();
-                        metadata.ContentType = response.ContentType;
-                        metadata.ID = id;
-
-                        UUID uuid;
-                        if (UUID.TryParse(id, out uuid))
-                            metadata.FullID = uuid;
-
-                        string lastModifiedStr = response.Headers.Get("Last-Modified");
-                        if (!String.IsNullOrEmpty(lastModifiedStr))
-                        {
-                            DateTime lastModified;
-                            if (DateTime.TryParse(lastModifiedStr, out lastModified))
-                                metadata.CreationDate = lastModified;
-                        }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                m_log.Warn("[SIMIAN ASSET CONNECTOR]: Asset HEAD from " + url + " failed: " + ex.Message);
-            }
-
-            return metadata;
+            // return GetRemoteMetadata(id);
+            return SimianGetMetadataOperation(id);
         }
-
+        
         public byte[] GetData(string id)
         {
+            if (String.IsNullOrEmpty(m_serverUrl))
+            {
+                m_log.Error("[SIMIAN ASSET CONNECTOR]: No AssetServerURI configured");
+                throw new InvalidOperationException();
+            }
+
             AssetBase asset = Get(id);
 
             if (asset != null)
@@ -255,7 +223,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
             Util.FireAndForget(
                 delegate(object o)
                 {
-                    AssetBase asset = GetRemote(id);
+                    AssetBase asset = SimianGetOperation(id);
                     handler(id, sender, asset);
                 }
             );
@@ -278,7 +246,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
             }
 
             bool storedInCache = false;
-            string errorMessage = null;
 
             // AssetID handling
             if (String.IsNullOrEmpty(asset.ID) || asset.ID == ZeroID)
@@ -307,83 +274,9 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 return asset.ID;
             }
 
-            // Distinguish public and private assets
-            bool isPublic = true;
-            switch ((AssetType)asset.Type)
-            {
-                case AssetType.CallingCard:
-                case AssetType.Gesture:
-                case AssetType.LSLBytecode:
-                case AssetType.LSLText:
-                    isPublic = false;
-                    break;
-            }
-
-            // Make sure ContentType is set
-            if (String.IsNullOrEmpty(asset.Metadata.ContentType))
-                asset.Metadata.ContentType = SLUtil.SLAssetTypeToContentType(asset.Type);
-
-            // Build the remote storage request
-            List<MultipartForm.Element> postParameters = new List<MultipartForm.Element>()
-            {
-                new MultipartForm.Parameter("AssetID", asset.FullID.ToString()),
-                new MultipartForm.Parameter("CreatorID", asset.Metadata.CreatorID),
-                new MultipartForm.Parameter("Temporary", asset.Temporary ? "1" : "0"),
-                new MultipartForm.Parameter("Public", isPublic ? "1" : "0"),
-                new MultipartForm.File("Asset", asset.Name, asset.Metadata.ContentType, asset.Data)
-            };
-
-            // Make the remote storage request
-            try
-            {
-                // Simian does not require the asset ID to be in the URL because it's in the post data.
-                // By appending it to the URL also, we allow caching proxies (squid) to invalidate asset URLs
-                HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_serverUrl + asset.FullID.ToString());
-
-                using (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())
-                                    return asset.ID;
-                                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;
-            }
-
-            m_log.WarnFormat("[SIMIAN ASSET CONNECTOR]: Failed to store asset \"{0}\" ({1}, {2}): {3}",
-                asset.Name, asset.ID, asset.Metadata.ContentType, errorMessage);
-
-            return null;
+            return SimianStoreOperation(asset);
         }
-
+        
         /// <summary>
         /// Update an asset's content
         /// </summary>
@@ -393,11 +286,17 @@ namespace OpenSim.Services.Connectors.SimianGrid
         /// <returns></returns>
         public bool UpdateContent(string id, byte[] data)
         {
+            if (String.IsNullOrEmpty(m_serverUrl))
+            {
+                m_log.Error("[SIMIAN ASSET CONNECTOR]: No AssetServerURI configured");
+                throw new InvalidOperationException();
+            }
+
             AssetBase asset = Get(id);
 
             if (asset == null)
             {
-                m_log.Warn("[SIMIAN ASSET CONNECTOR]: Failed to fetch asset " + id + " for updating");
+                m_log.WarnFormat("[SIMIAN ASSET CONNECTOR]: Failed to fetch asset {0} for updating", id);
                 return false;
             }
 
@@ -420,83 +319,347 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 throw new InvalidOperationException();
             }
 
-            //string errorMessage = String.Empty;
-            string url = m_serverUrl + id;
-
             if (m_cache != null)
                 m_cache.Expire(id);
 
+            return SimianDeleteOperation(id);
+        }
+        
+#endregion IAssetService
+
+#region SimianOperations
+        /// <summary>
+        /// Invokes the xRemoveAsset operation on the simian server to delete an asset
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        private bool SimianDeleteOperation(string id)
+        {
             try
             {
-                HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(url);
-                request.Method = "DELETE";
+                NameValueCollection requestArgs = new NameValueCollection
+                    {
+                            { "RequestMethod", "xRemoveAsset" },
+                            { "AssetID", id }
+                    };
 
-                using (HttpWebResponse response = (HttpWebResponse)request.GetResponse())
+                OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs);
+                if (! response["Success"].AsBoolean())
                 {
-                    if (response.StatusCode != HttpStatusCode.NoContent)
-                    {
-                        m_log.Warn("[SIMIAN ASSET CONNECTOR]: Unexpected response when deleting asset " + url + ": " +
-                            response.StatusCode + " (" + response.StatusDescription + ")");
-                    }
+                    m_log.WarnFormat("[SIMIAN ASSET CONNECTOR]: failed to delete asset; {0}",response["Message"].AsString());
+                    return false;
                 }
-
+                
                 return true;
+                
             }
             catch (Exception ex)
             {
-                m_log.Warn("[SIMIAN ASSET CONNECTOR]: Failed to delete asset " + id + " from the asset service: " + ex.Message);
-                return false;
+                m_log.WarnFormat("[SIMIAN ASSET CONNECTOR]: failed to delete asset {0}; {1}", id, ex.Message);
             }
-        }
 
-        #endregion IAssetService
+            return false;
+        }
 
-        private AssetBase GetRemote(string id)
+        /// <summary>
+        /// Invokes the xAddAsset operation on the simian server to create or update an asset
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        private string SimianStoreOperation(AssetBase asset)
         {
-            AssetBase asset = null;
-            Uri url;
+            try
+            {
+                NameValueCollection requestArgs = new NameValueCollection
+                    {
+                            { "RequestMethod", "xAddAsset" },
+                            { "ContentType", asset.Metadata.ContentType },
+                            { "EncodedData", Convert.ToBase64String(asset.Data) },
+                            { "AssetID", asset.FullID.ToString() },
+                            { "CreatorID", asset.Metadata.CreatorID },
+                            { "Temporary", asset.Temporary ? "1" : "0" },
+                            { "Name", asset.Name }
+                    };
+                
+                OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs);
+                if (! response["Success"].AsBoolean())
+                {
+                    m_log.WarnFormat("[SIMIAN ASSET CONNECTOR] failed to store asset; {0}",response["Message"].AsString());
+                    return null;
+                }
 
-            // Determine if id is an absolute URL or a grid-relative UUID
-            if (!Uri.TryCreate(id, UriKind.Absolute, out url))
-                url = new Uri(m_serverUrl + id);
+                // asset.ID is always set before calling this function
+                return asset.ID;
+                
+            }
+            catch (Exception ex)
+            {
+                m_log.ErrorFormat("[SIMIAN ASSET CONNECTOR] failed to store asset; {0}",ex.Message);
+            }
+            
+            return null;
+        }
 
-            try
+        /// <summary>
+        /// Invokes the xGetAsset operation on the simian server to get data associated with an asset
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        private AssetBase SimianGetOperation(string id)
+        {
+            try 
             {
-                HttpWebRequest request = UntrustedHttpWebRequest.Create(url);
+                NameValueCollection requestArgs = new NameValueCollection
+                    {
+                            { "RequestMethod", "xGetAsset" },
+                            { "ID", id } 
+                    };
 
-                using (WebResponse response = request.GetResponse())
+                OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs);
+                if (! response["Success"].AsBoolean())
                 {
-                    using (Stream responseStream = response.GetResponseStream())
-                    {
-                        string creatorID = response.Headers.GetOne("X-Asset-Creator-Id") ?? String.Empty;
-
-                        // Create the asset object
-                        asset = new AssetBase(id, String.Empty, SLUtil.ContentTypeToSLAssetType(response.ContentType), creatorID);
-
-                        UUID assetID;
-                        if (UUID.TryParse(id, out assetID))
-                            asset.FullID = assetID;
-
-                        // Grab the asset data from the response stream
-                        using (MemoryStream stream = new MemoryStream())
-                        {
-                            responseStream.CopyStream(stream, Int32.MaxValue);
-                            asset.Data = stream.ToArray();
-                        }
-                    }
+                    m_log.WarnFormat("[SIMIAN ASSET CONNECTOR] Failed to get asset; {0}",response["Message"].AsString());
+                    return null;
                 }
+            
+                AssetBase asset = new AssetBase();
 
-                // Cache store
-                if (m_cache != null && asset != null)
-                    m_cache.Cache(asset);
+                asset.ID = id;
+                asset.Name = String.Empty;
+                asset.Metadata.ContentType = response["ContentType"].AsString(); // this will also set the asset Type property
+                asset.CreatorID = response["CreatorID"].AsString();
+                asset.Data = System.Convert.FromBase64String(response["EncodedData"].AsString());
+                asset.Local = false;
+                asset.Temporary = response["Temporary"];
 
                 return asset;
             }
             catch (Exception ex)
             {
-                m_log.Warn("[SIMIAN ASSET CONNECTOR]: Asset GET from " + url + " failed: " + ex.Message);
-                return null;
+                m_log.WarnFormat("[SIMIAN ASSET CONNECTOR]: failed to retrieve asset {0}; {1}", id, ex.Message);
             }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Invokes the xGetAssetMetadata operation on the simian server to retrieve metadata for an asset
+        /// This operation is generally used to determine if an asset exists in the database
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        private AssetMetadata SimianGetMetadataOperation(string id)
+        {
+            try
+            {
+                NameValueCollection requestArgs = new NameValueCollection
+                    {
+                            { "RequestMethod", "xGetAssetMetadata" },
+                            { "ID", id } 
+                    };
+
+                OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs);
+                if (! response["Success"].AsBoolean())
+                {
+                    // this is not really an error, this call is used to test existence
+                    // m_log.DebugFormat("[SIMIAN ASSET CONNECTOR] Failed to get asset metadata; {0}",response["Message"].AsString());
+                    return null;
+                }
+            
+                AssetMetadata metadata = new AssetMetadata();
+                metadata.ID = id;
+                metadata.ContentType = response["ContentType"].AsString();
+                metadata.CreatorID = response["CreatorID"].AsString();
+                metadata.Local = false;
+                metadata.Temporary = response["Temporary"];
+
+                string lastModifiedStr = response["Last-Modified"].AsString();
+                if (! String.IsNullOrEmpty(lastModifiedStr))
+                {
+                    DateTime lastModified;
+                    if (DateTime.TryParse(lastModifiedStr, out lastModified))
+                        metadata.CreationDate = lastModified;
+                }
+
+                return metadata;
+            }
+            catch (Exception ex)
+            {
+                m_log.WarnFormat("[SIMIAN ASSET CONNECTOR]: Failed to get asset metadata; {0}", ex.Message);
+            }
+
+            return null;
         }
+#endregion
+
+        // private AssetMetadata GetRemoteMetadata(string id)
+        // {
+        //     Uri url;
+        //     AssetMetadata metadata = null;
+
+        //     // Determine if id is an absolute URL or a grid-relative UUID
+        //     if (!Uri.TryCreate(id, UriKind.Absolute, out url))
+        //         url = new Uri(m_serverUrl + id);
+
+        //     try
+        //     {
+        //         HttpWebRequest request = UntrustedHttpWebRequest.Create(url);
+        //         request.Method = "HEAD";
+
+        //         using (WebResponse response = request.GetResponse())
+        //         {
+        //             using (Stream responseStream = response.GetResponseStream())
+        //             {
+        //                 // Create the metadata object
+        //                 metadata = new AssetMetadata();
+        //                 metadata.ContentType = response.ContentType;
+        //                 metadata.ID = id;
+
+        //                 UUID uuid;
+        //                 if (UUID.TryParse(id, out uuid))
+        //                     metadata.FullID = uuid;
+
+        //                 string lastModifiedStr = response.Headers.Get("Last-Modified");
+        //                 if (!String.IsNullOrEmpty(lastModifiedStr))
+        //                 {
+        //                     DateTime lastModified;
+        //                     if (DateTime.TryParse(lastModifiedStr, out lastModified))
+        //                         metadata.CreationDate = lastModified;
+        //                 }
+        //             }
+        //         }
+        //     }
+        //     catch (Exception ex)
+        //     {
+        //         m_log.Warn("[SIMIAN ASSET CONNECTOR]: Asset HEAD from " + url + " failed: " + ex.Message);
+        //     }
+
+        //     return metadata;
+        // }
+
+        // private AssetBase GetRemote(string id)
+        // {
+        //     AssetBase asset = null;
+        //     Uri url;
+
+        //     // Determine if id is an absolute URL or a grid-relative UUID
+        //     if (!Uri.TryCreate(id, UriKind.Absolute, out url))
+        //         url = new Uri(m_serverUrl + id);
+
+        //     try
+        //     {
+        //         HttpWebRequest request = UntrustedHttpWebRequest.Create(url);
+
+        //         using (WebResponse response = request.GetResponse())
+        //         {
+        //             using (Stream responseStream = response.GetResponseStream())
+        //             {
+        //                 string creatorID = response.Headers.GetOne("X-Asset-Creator-Id") ?? String.Empty;
+
+        //                 // Create the asset object
+        //                 asset = new AssetBase(id, String.Empty, SLUtil.ContentTypeToSLAssetType(response.ContentType), creatorID);
+
+        //                 UUID assetID;
+        //                 if (UUID.TryParse(id, out assetID))
+        //                     asset.FullID = assetID;
+
+        //                 // Grab the asset data from the response stream
+        //                 using (MemoryStream stream = new MemoryStream())
+        //                 {
+        //                     responseStream.CopyStream(stream, Int32.MaxValue);
+        //                     asset.Data = stream.ToArray();
+        //                 }
+        //             }
+        //         }
+
+        //         // Cache store
+        //         if (m_cache != null && asset != null)
+        //             m_cache.Cache(asset);
+
+        //         return asset;
+        //     }
+        //     catch (Exception ex)
+        //     {
+        //         m_log.Warn("[SIMIAN ASSET CONNECTOR]: Asset GET from " + url + " failed: " + ex.Message);
+        //         return null;
+        //     }
+        // }
+
+        // private string StoreRemote(AssetBase asset)
+        // {
+        //     // Distinguish public and private assets
+        //     bool isPublic = true;
+        //     switch ((AssetType)asset.Type)
+        //     {
+        //         case AssetType.CallingCard:
+        //         case AssetType.Gesture:
+        //         case AssetType.LSLBytecode:
+        //         case AssetType.LSLText:
+        //             isPublic = false;
+        //             break;
+        //     }
+
+        //     string errorMessage = null;
+            
+        //     // Build the remote storage request
+        //     List<MultipartForm.Element> postParameters = new List<MultipartForm.Element>()
+        //     {
+        //         new MultipartForm.Parameter("AssetID", asset.FullID.ToString()),
+        //         new MultipartForm.Parameter("CreatorID", asset.Metadata.CreatorID),
+        //         new MultipartForm.Parameter("Temporary", asset.Temporary ? "1" : "0"),
+        //         new MultipartForm.Parameter("Public", isPublic ? "1" : "0"),
+        //         new MultipartForm.File("Asset", asset.Name, asset.Metadata.ContentType, asset.Data)
+        //     };
+
+        //     // Make the remote storage request
+        //     try
+        //     {
+        //         // Simian does not require the asset ID to be in the URL because it's in the post data.
+        //         // By appending it to the URL also, we allow caching proxies (squid) to invalidate asset URLs
+        //         HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_serverUrl + asset.FullID.ToString());
+
+        //         using (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())
+        //                             return asset.ID;
+        //                         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;
+        //     }
+
+        //     m_log.WarnFormat("[SIMIAN ASSET CONNECTOR]: Failed to store asset \"{0}\" ({1}, {2}): {3}",
+        //         asset.Name, asset.ID, asset.Metadata.ContentType, errorMessage);
+
+        //     return null;
+        // }
     }
 }
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
index 03b19ae..c402907 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
@@ -116,7 +116,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "UserID", principalID.ToString() }
             };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             if (response["Success"].AsBoolean() && response["Identities"] is OSDArray)
             {
                 bool md5hashFound = false;
@@ -159,7 +159,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "SessionID", token }
             };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             if (response["Success"].AsBoolean())
             {
                 return true;
@@ -181,7 +181,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "UserID", principalID.ToString() }
             };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             if (response["Success"].AsBoolean())
             {
                 return true;
@@ -204,7 +204,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "UserID", principalID.ToString() }
             };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             if (response["Success"].AsBoolean() && response["User"] is OSDMap)
             {
                 OSDMap userMap = (OSDMap)response["User"];
@@ -224,7 +224,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                         { "UserID", principalID.ToString() }
                     };
 
-                    response = WebUtil.PostToService(m_serverUrl, requestArgs);
+                    response = SimianGrid.PostToService(m_serverUrl, requestArgs);
                     bool success = response["Success"].AsBoolean();
 
                     if (!success)
@@ -303,7 +303,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "UserID", userID.ToString() }
             };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             if (response["Success"].AsBoolean())
                 return response["SessionID"].AsUUID().ToString();
             else
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
index 841bfa0..a397740 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
@@ -122,7 +122,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "UserID", userID.ToString() }
             };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             if (response["Success"].AsBoolean())
             {
                 OSDMap map = null;
@@ -168,7 +168,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                         { "LLPackedAppearance", OSDParser.SerializeJsonString(map) }
                 };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             bool success = response["Success"].AsBoolean();
 
             if (! success)
@@ -189,7 +189,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "UserID", userID.ToString() }
             };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             if (response["Success"].AsBoolean())
             {
                 OSDMap map = null;
@@ -306,7 +306,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                     { "LLAttachments", OSDParser.SerializeJsonString(items) }
                 };
 
-                OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+                OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
                 bool success = response["Success"].AsBoolean();
 
                 if (!success)
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs b/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs
new file mode 100644
index 0000000..764e71f
--- /dev/null
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs
@@ -0,0 +1,180 @@
+/*
+ * 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.Generic;
+using System.Reflection;
+using System.IO;
+using System.Web;
+
+using log4net;
+using Nini.Config;
+using Mono.Addins;
+
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using Caps = OpenSim.Framework.Capabilities.Caps;
+
+namespace OpenSim.Services.Connectors.SimianGrid
+{
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SimianExternalCapsModule")]
+    public class SimianExternalCapsModule : INonSharedRegionModule, IExternalCapsModule
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private bool m_enabled = true;
+        private Scene m_scene;
+        private String m_simianURL;
+        
+#region IRegionModule Members
+
+        public string Name
+        {
+            get { return this.GetType().Name; }
+        }
+
+        public void Initialise(IConfigSource config)
+        {
+            try 
+            {
+                IConfig m_config;
+               
+                if ((m_config = config.Configs["SimianExternalCaps"]) != null)
+                {
+                    m_enabled = m_config.GetBoolean("Enabled", m_enabled);
+                    if ((m_config = config.Configs["SimianGrid"]) != null)
+                    {
+                        m_simianURL = m_config.GetString("SimianServiceURL");
+                        if (String.IsNullOrEmpty(m_simianURL))
+                        {
+                            //m_log.DebugFormat("[SimianGrid] service URL is not defined");
+                            m_enabled = false;
+                            return;
+                        }
+                    }
+                }
+                else
+                    m_enabled = false;
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("[SimianExternalCaps] initialization error: {0}",e.Message);
+                return;
+            }
+        }
+
+        public void PostInitialise() { }
+        public void Close() { }
+
+        public void AddRegion(Scene scene)
+        { 
+            if (! m_enabled)
+                return;
+            
+            m_scene = scene;
+            m_scene.RegisterModuleInterface<IExternalCapsModule>(this);
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            if (! m_enabled)
+                return;
+
+            m_scene.EventManager.OnRegisterCaps -= RegisterCapsEventHandler;
+            m_scene.EventManager.OnDeregisterCaps -= DeregisterCapsEventHandler;
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+            if (! m_enabled)
+                return;
+
+            m_scene.EventManager.OnRegisterCaps += RegisterCapsEventHandler;
+            m_scene.EventManager.OnDeregisterCaps += DeregisterCapsEventHandler;
+        }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+#endregion
+
+#region IExternalCapsModule
+        // Eg http://grid.sciencesim.com/GridPublic/%CAP%/%OP%/"
+        public bool RegisterExternalUserCapsHandler(UUID agentID, Caps caps, String capName, String urlSkel)
+        {
+            UUID cap = UUID.Random();
+
+            // Call to simian to register the cap we generated
+            // NameValueCollection requestArgs = new NameValueCollection
+            // {
+            //     { "RequestMethod", "AddCapability" },
+            //     { "Resource", "user" },
+            //     { "Expiration", 0 },
+            //     { "OwnerID", agentID.ToString() },
+            //     { "CapabilityID", cap.ToString() }
+            // };
+
+            // OSDMap response = SimianGrid.PostToService(m_simianURL, requestArgs);
+
+            Dictionary<String,String> subs = new Dictionary<String,String>();
+            subs["%OP%"] = capName;
+            subs["%USR%"] = agentID.ToString();
+            subs["%CAP%"] = cap.ToString();
+            subs["%SIM%"] = m_scene.RegionInfo.RegionID.ToString();
+            
+            caps.RegisterHandler(capName,ExpandSkeletonURL(urlSkel,subs));
+            return true;
+        }
+
+#endregion
+
+#region EventHandlers
+        public void RegisterCapsEventHandler(UUID agentID, Caps caps) { }
+        public void DeregisterCapsEventHandler(UUID agentID, Caps caps) { }
+#endregion
+
+        private String ExpandSkeletonURL(String urlSkel, Dictionary<String,String> subs)
+        {
+            String result = urlSkel;
+            
+            foreach (KeyValuePair<String,String> kvp in subs)
+            {
+                result = result.Replace(kvp.Key,kvp.Value);
+            }
+            
+            return result;
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs
index 7422d94..9a8164c 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs
@@ -153,7 +153,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "Value", flags.ToString() }
             };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             bool success = response["Success"].AsBoolean();
 
             if (!success)
@@ -180,7 +180,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "Key", friend }
             };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             bool success = response["Success"].AsBoolean();
 
             if (!success)
@@ -200,7 +200,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "Type", "Friend" }
             };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             if (response["Success"].AsBoolean() && response["Entries"] is OSDArray)
             {
                 return (OSDArray)response["Entries"];
@@ -221,7 +221,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "Type", "Friend" }
             };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             if (response["Success"].AsBoolean() && response["Entries"] is OSDArray)
             {
                 return (OSDArray)response["Entries"];
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
index 847319c..9898da9 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
@@ -26,8 +26,122 @@
  */
 
 using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Reflection;
+using log4net;
 using Mono.Addins;
 using Nini.Config;
+using OpenSim.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
 
 [assembly: Addin("SimianGrid", "1.0")]
 [assembly: AddinDependency("OpenSim", "0.5")]
+
+namespace OpenSim.Services.Connectors.SimianGrid
+{
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SimianExternalCapsModule")]
+    public class SimianGrid : ISharedRegionModule
+    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
+        private IConfig m_config = null;
+
+        private String m_simianURL;
+        
+#region IRegionModule Members
+
+        public string Name
+        {
+            get { return this.GetType().Name; }
+        }
+           
+        public void Initialise(IConfigSource config)
+        {
+            try 
+            {
+                m_config = config.Configs["SimianGrid"];
+               
+                if (m_config != null)
+                {
+                    m_simianURL = m_config.GetString("SimianServiceURL");
+                    if (String.IsNullOrEmpty(m_simianURL))
+                    {
+                        // m_log.DebugFormat("[SimianGrid] service URL is not defined");
+                        return;
+                    }
+                    
+                    InitialiseSimCap();
+                    SimulatorCapability = SimulatorCapability.Trim();
+                    m_log.InfoFormat("[SimianExternalCaps] using {0} as simulator capability",SimulatorCapability);
+                }
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("[SimianExternalCaps] initialization error: {0}",e.Message);
+                return;
+            }
+        }
+
+        public void PostInitialise() { }
+        public void Close() { }
+        public void AddRegion(Scene scene) { }
+        public void RemoveRegion(Scene scene) { }
+        public void RegionLoaded(Scene scene) { }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        ///<summary>
+        /// Try a variety of methods for finding the simian simulator capability; first check the
+        /// configuration itself, then look for a file that contains the cap, then finally look 
+        /// for an environment variable that contains it.
+        ///</summary>
+        private void InitialiseSimCap()
+        {
+            if (m_config.Contains("SimulatorCapability"))
+            {
+                SimulatorCapability = m_config.GetString("SimulatorCapability");
+                return;
+            }
+            
+            if (m_config.Contains("SimulatorCapabilityFile"))
+            {
+                String filename = m_config.GetString("SimulatorCapabilityFile");
+                if (System.IO.File.Exists(filename))
+                {
+                    SimulatorCapability = System.IO.File.ReadAllText(filename);
+                    return;
+                }
+            }
+            
+            if (m_config.Contains("SimulatorCapabilityVariable"))
+            {
+                String envname = m_config.GetString("SimulatorCapabilityVariable");
+                String envvalue = System.Environment.GetEnvironmentVariable(envname);
+                if (envvalue != null)
+                {
+                    SimulatorCapability = envvalue;
+                    return;
+                }
+            }
+
+            m_log.WarnFormat("[SimianExternalCaps] no method specified for simulator capability");
+        }
+        
+#endregion
+
+        public static String SimulatorCapability = UUID.Zero.ToString();
+        public static OSDMap PostToService(string url, NameValueCollection data)
+        {
+            data["cap"] = SimulatorCapability;
+            return WebUtil.PostToService(url, data);
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
index 93fdae3..b999509 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Reflection;
 using System.Net;
 using System.IO;
@@ -43,7 +44,8 @@ using OpenSim.Region.Framework.Scenes;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 
-namespace OpenSim.Region.OptionalModules.Simian
+//namespace OpenSim.Region.OptionalModules.Simian
+namespace OpenSim.Services.Connectors.SimianGrid
 {
     /// <summary>
     /// </summary>
@@ -196,67 +198,84 @@ namespace OpenSim.Region.OptionalModules.Simian
                 }
             }
 
-            List<MultipartForm.Element> postParameters = new List<MultipartForm.Element>()
+            NameValueCollection requestArgs = new NameValueCollection
+                {
+                        { "RequestMethod", "xAddMapTile" },
+                        { "X", scene.RegionInfo.RegionLocX.ToString() },
+                        { "Y", scene.RegionInfo.RegionLocY.ToString() },
+                        { "ContentType", "image/png" },
+                        { "EncodedData", System.Convert.ToBase64String(pngData) }
+                };
+                            
+            OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs);
+            if (! response["Success"].AsBoolean())
             {
-                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)
-            };
+                m_log.WarnFormat("[SIMIAN MAPTILE] failed to store map tile; {0}",response["Message"].AsString());
+                return;
+            }
 
-            string errorMessage = null;
-            int tickstart = Util.EnvironmentTickCount();
+            // 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_serverUrl);
-                request.Timeout = 20000;
-                request.ReadWriteTimeout = 5000;
+            // string errorMessage = null;
+            // int tickstart = Util.EnvironmentTickCount();
 
-                using (HttpWebResponse response = MultipartForm.Post(request, postParameters))
-                {
-                    using (Stream responseStream = response.GetResponseStream())
-                    {
-                        string responseStr = responseStream.GetStreamString();
-                        OSD responseOSD = OSDParser.Deserialize(responseStr);
-                        if (responseOSD.Type == OSDType.Map)
-                        {
-                            OSDMap responseMap = (OSDMap)responseOSD;
-                            if (responseMap["Success"].AsBoolean())
-                                return;
+            // // Make the remote storage request
+            // try
+            // {
+            //     HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_serverUrl);
+            //     request.Timeout = 20000;
+            //     request.ReadWriteTimeout = 5000;
 
-                            errorMessage = "Upload failed: " + responseMap["Message"].AsString();
-                        }
-                        else
-                        {
-                            errorMessage = "Response format was invalid:\n" + responseStr;
-                        }
-                    }
-                }
-            }
-            catch (WebException we)
-            {
-                errorMessage = we.Message;
-                if (we.Status == WebExceptionStatus.ProtocolError)
-                {
-                    HttpWebResponse webResponse = (HttpWebResponse)we.Response;
-                    errorMessage = String.Format("[{0}] {1}",
-                                                 webResponse.StatusCode,webResponse.StatusDescription);
-                }
-            }
-            catch (Exception ex)
-            {
-                errorMessage = ex.Message;
-            }
-            finally
-            {
-                // This just dumps a warning for any operation that takes more than 100 ms
-                int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
-                m_log.DebugFormat("[SIMIAN MAPTILE]: map tile uploaded in {0}ms",tickdiff);
-            }
+            //     using (HttpWebResponse response = MultipartForm.Post(request, postParameters))
+            //     {
+            //         using (Stream responseStream = response.GetResponseStream())
+            //         {
+            //             string responseStr = responseStream.GetStreamString();
+            //             OSD responseOSD = OSDParser.Deserialize(responseStr);
+            //             if (responseOSD.Type == OSDType.Map)
+            //             {
+            //                 OSDMap responseMap = (OSDMap)responseOSD;
+            //                 if (responseMap["Success"].AsBoolean())
+            //                     return;
+
+            //                 errorMessage = "Upload failed: " + responseMap["Message"].AsString();
+            //             }
+            //             else
+            //             {
+            //                 errorMessage = "Response format was invalid:\n" + responseStr;
+            //             }
+            //         }
+            //     }
+            // }
+            // catch (WebException we)
+            // {
+            //     errorMessage = we.Message;
+            //     if (we.Status == WebExceptionStatus.ProtocolError)
+            //     {
+            //         HttpWebResponse webResponse = (HttpWebResponse)we.Response;
+            //         errorMessage = String.Format("[{0}] {1}",
+            //                                      webResponse.StatusCode,webResponse.StatusDescription);
+            //     }
+            // }
+            // catch (Exception ex)
+            // {
+            //     errorMessage = ex.Message;
+            // }
+            // finally
+            // {
+            //     // This just dumps a warning for any operation that takes more than 100 ms
+            //     int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
+            //     m_log.DebugFormat("[SIMIAN MAPTILE]: map tile uploaded in {0}ms",tickdiff);
+            // }
+
+            // m_log.WarnFormat("[SIMIAN MAPTILE]: Failed to store {0} byte tile for {1}: {2}",
+            //                  pngData.Length, scene.RegionInfo.RegionName, errorMessage);
 
-            m_log.WarnFormat("[SIMIAN MAPTILE]: Failed to store {0} byte tile for {1}: {2}",
-                             pngData.Length, scene.RegionInfo.RegionName, errorMessage);
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
index 20eaa3a..36a5182 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
@@ -140,7 +140,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "ExtraData", OSDParser.SerializeJsonString(extraData) }
             };
 
-            OSDMap response = WebUtil.PostToService(m_ServerURI, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_ServerURI, requestArgs);
             if (response["Success"].AsBoolean())
                 return String.Empty;
             else
@@ -156,7 +156,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "Enabled", "0" }
             };
 
-            OSDMap response = WebUtil.PostToService(m_ServerURI, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_ServerURI, requestArgs);
             bool success = response["Success"].AsBoolean();
 
             if (!success)
@@ -203,7 +203,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
             // m_log.DebugFormat("[SIMIAN GRID CONNECTOR] request region with uuid {0}",regionID.ToString());
 
-            OSDMap response = WebUtil.PostToService(m_ServerURI, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_ServerURI, requestArgs);
             if (response["Success"].AsBoolean())
             {
                 // m_log.DebugFormat("[SIMIAN GRID CONNECTOR] uuid request successful {0}",response["Name"].AsString());
@@ -231,7 +231,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
             // m_log.DebugFormat("[SIMIAN GRID CONNECTOR] request grid at {0}",position.ToString());
             
-            OSDMap response = WebUtil.PostToService(m_ServerURI, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_ServerURI, requestArgs);
             if (response["Success"].AsBoolean())
             {
                 // m_log.DebugFormat("[SIMIAN GRID CONNECTOR] position request successful {0}",response["Name"].AsString());
@@ -272,7 +272,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
             // m_log.DebugFormat("[SIMIAN GRID CONNECTOR] request regions with name {0}",name);
 
-            OSDMap response = WebUtil.PostToService(m_ServerURI, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_ServerURI, requestArgs);
             if (response["Success"].AsBoolean())
             {
                 // m_log.DebugFormat("[SIMIAN GRID CONNECTOR] found regions with name {0}",name);
@@ -310,7 +310,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
             //m_log.DebugFormat("[SIMIAN GRID CONNECTOR] request regions by range {0} to {1}",minPosition.ToString(),maxPosition.ToString());
             
 
-            OSDMap response = WebUtil.PostToService(m_ServerURI, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_ServerURI, requestArgs);
             if (response["Success"].AsBoolean())
             {
                 OSDArray array = response["Scenes"] as OSDArray;
@@ -341,6 +341,12 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 return new List<GridRegion>(0);
         }
 
+        public List<GridRegion> GetDefaultHypergridRegions(UUID scopeID)
+        {
+            // TODO: Allow specifying the default grid location
+            return GetDefaultRegions(scopeID);
+        }
+
         public List<GridRegion> GetFallbackRegions(UUID scopeID, int x, int y)
         {
             GridRegion defRegion = GetNearestRegion(new Vector3d(x, y, 0.0), true);
@@ -361,7 +367,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "Enabled", "1" }
             };
 
-            OSDMap response = WebUtil.PostToService(m_ServerURI, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_ServerURI, requestArgs);
             if (response["Success"].AsBoolean())
             {
                 // m_log.DebugFormat("[SIMIAN GRID CONNECTOR] found regions with name {0}",name);
@@ -391,7 +397,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
             m_log.DebugFormat("[SIMIAN GRID CONNECTOR] request region flags for {0}",regionID.ToString());
 
-            OSDMap response = WebUtil.PostToService(m_ServerURI, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_ServerURI, requestArgs);
             if (response["Success"].AsBoolean())
             {
                 OSDMap extraData = response["ExtraData"] as OSDMap;
@@ -498,7 +504,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
             if (onlyEnabled)
                 requestArgs["Enabled"] = "1";
 
-            OSDMap response = WebUtil.PostToService(m_ServerURI, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_ServerURI, requestArgs);
             if (response["Success"].AsBoolean())
             {
                 return ResponseToGridRegion(response);
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
index 36325ce..97eaabe 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
@@ -156,7 +156,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "OwnerID", userID.ToString() }
             };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             bool success = response["Success"].AsBoolean();
 
             if (!success)
@@ -182,7 +182,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "ChildrenOnly", "0" }
             };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             if (response["Success"].AsBoolean() && response["Items"] is OSDArray)
             {
                 OSDArray items = (OSDArray)response["Items"];
@@ -244,7 +244,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "ChildrenOnly", "1" }
             };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             if (response["Success"].AsBoolean() && response["Items"] is OSDArray)
             {
                 OSDArray items = (OSDArray)response["Items"];
@@ -274,7 +274,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "OwnerID", userID.ToString() }
             };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             if (response["Success"].AsBoolean() && response["Folder"] is OSDMap)
             {
                 OSDMap folder = (OSDMap)response["Folder"];
@@ -312,7 +312,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "ChildrenOnly", "1" }
             };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             if (response["Success"].AsBoolean() && response["Items"] is OSDArray)
             {
                 List<InventoryItemBase> items = GetItemsFromResponse((OSDArray)response["Items"]);
@@ -349,7 +349,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "ChildrenOnly", "1" }
             };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             if (response["Success"].AsBoolean() && response["Items"] is OSDArray)
             {
                 OSDArray items = (OSDArray)response["Items"];
@@ -383,7 +383,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "ChildrenOnly", "1" }
             };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             if (response["Success"].AsBoolean() && response["Items"] is OSDArray)
             {
                 OSDArray items = (OSDArray)response["Items"];
@@ -423,7 +423,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "ChildrenOnly", "1" }
             };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             if (response["Success"].AsBoolean() && response["Items"] is OSDArray)
             {
                 OSDArray items = (OSDArray)response["Items"];
@@ -454,7 +454,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "ContentType", SLUtil.SLAssetTypeToContentType(folder.Type) }
             };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             bool success = response["Success"].AsBoolean();
 
             if (!success)
@@ -518,7 +518,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                     { "ItemID", itemID.ToString() }
                 };
 
-                OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+                OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
                 bool success = response["Success"].AsBoolean();
 
                 if (!success)
@@ -546,7 +546,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "FolderID", folder.ID.ToString() }
             };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             bool success = response["Success"].AsBoolean();
 
             if (!success)
@@ -623,7 +623,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "ExtraData", OSDParser.SerializeJsonString(extraData) }
             };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             bool success = response["Success"].AsBoolean();
 
             if (!success)
@@ -847,7 +847,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "Items", String.Join(",", itemIDs) }
             };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             bool success = response["Success"].AsBoolean();
 
             if (!success)
@@ -885,7 +885,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "UserID", userID.ToString() }
             };
 
-            OSDMap response = WebUtil.PostToService(m_userServerUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_userServerUrl, requestArgs);
             if (response["Success"].AsBoolean())
             {
                 OSDMap user = response["User"] as OSDMap;
@@ -916,7 +916,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "Gestures", OSDParser.SerializeJsonString(gestures) }
             };
 
-            OSDMap response = WebUtil.PostToService(m_userServerUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_userServerUrl, requestArgs);
             if (!response["Success"].AsBoolean())
             {
                 m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Failed to save active gestures for " + userID + ": " +
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
index 854bea4..211b775 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
         public void PostInitialise() { }
         public void Close() { }
 
-        public SimianPresenceServiceConnector() { m_activityDetector = new SimianActivityDetector(this); }
+        public SimianPresenceServiceConnector() { }
         public string Name { get { return "SimianPresenceServiceConnector"; } }
         public void AddRegion(Scene scene)
         {
@@ -121,6 +121,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                     if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("="))
                         serviceUrl = serviceUrl + '/';
                     m_serverUrl = serviceUrl;
+                    m_activityDetector = new SimianActivityDetector(this); 
                     m_Enabled = true;
                 }
             }
@@ -137,17 +138,18 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 userID, sessionID, secureSessionID);
 
             NameValueCollection requestArgs = new NameValueCollection
-            {
-                { "RequestMethod", "AddSession" },
-                { "UserID", userID.ToString() }
-            };
+                {
+                        { "RequestMethod", "AddSession" },
+                        { "UserID", userID.ToString() }
+                };
+
             if (sessionID != UUID.Zero)
             {
                 requestArgs["SessionID"] = sessionID.ToString();
                 requestArgs["SecureSessionID"] = secureSessionID.ToString();
             }
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             bool success = response["Success"].AsBoolean();
 
             if (!success)
@@ -158,15 +160,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public bool LogoutAgent(UUID sessionID)
         {
-//            m_log.InfoFormat("[SIMIAN PRESENCE CONNECTOR]: Logout requested for agent with sessionID " + sessionID);
+            // m_log.InfoFormat("[SIMIAN PRESENCE CONNECTOR]: Logout requested for agent with sessionID " + sessionID);
 
             NameValueCollection requestArgs = new NameValueCollection
-            {
-                { "RequestMethod", "RemoveSession" },
-                { "SessionID", sessionID.ToString() }
-            };
+                {
+                        { "RequestMethod", "RemoveSession" },
+                        { "SessionID", sessionID.ToString() }
+                };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             bool success = response["Success"].AsBoolean();
 
             if (!success)
@@ -177,15 +179,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public bool LogoutRegionAgents(UUID regionID)
         {
-//            m_log.InfoFormat("[SIMIAN PRESENCE CONNECTOR]: Logout requested for all agents in region " + regionID);
+            // m_log.InfoFormat("[SIMIAN PRESENCE CONNECTOR]: Logout requested for all agents in region " + regionID);
 
             NameValueCollection requestArgs = new NameValueCollection
-            {
-                { "RequestMethod", "RemoveSessions" },
-                { "SceneID", regionID.ToString() }
-            };
+                {
+                        { "RequestMethod", "RemoveSessions" },
+                        { "SceneID", regionID.ToString() }
+                };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             bool success = response["Success"].AsBoolean();
 
             if (!success)
@@ -202,49 +204,46 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public PresenceInfo GetAgent(UUID sessionID)
         {
-//            m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for agent with sessionID " + sessionID);
-
-            NameValueCollection requestArgs = new NameValueCollection
-            {
-                { "RequestMethod", "GetSession" },
-                { "SessionID", sessionID.ToString() }
-            };
-
-            OSDMap sessionResponse = WebUtil.PostToService(m_serverUrl, requestArgs);
-            if (sessionResponse["Success"].AsBoolean())
+            OSDMap sessionResponse = GetSessionDataFromSessionID(sessionID);
+            if (sessionResponse == null)
             {
-                UUID userID = sessionResponse["UserID"].AsUUID();
-                m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting user data for " + userID);
-
-                requestArgs = new NameValueCollection
-                {
-                    { "RequestMethod", "GetUser" },
-                    { "UserID", userID.ToString() }
-                };
-
-                OSDMap userResponse = WebUtil.PostToService(m_serverUrl, requestArgs);
-                if (userResponse["Success"].AsBoolean())
-                    return ResponseToPresenceInfo(sessionResponse, userResponse);
-                else
-                    m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve user data for " + userID + ": " + userResponse["Message"].AsString());
+                m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve session {0}: {1}",sessionID.ToString(),sessionResponse["Message"].AsString());
+                return null;
             }
-            else
+            
+            UUID userID = sessionResponse["UserID"].AsUUID();
+            OSDMap userResponse = GetUserData(userID);
+            if (userResponse == null)
             {
-                m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve session " + sessionID + ": " + sessionResponse["Message"].AsString());
+                m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve user data for {0}: {1}",userID.ToString(),userResponse["Message"].AsString());
+                return null;
             }
 
-            return null;
+            return ResponseToPresenceInfo(sessionResponse);
         }
 
         public PresenceInfo[] GetAgents(string[] userIDs)
         {
-            List<PresenceInfo> presences = new List<PresenceInfo>(userIDs.Length);
+            List<PresenceInfo> presences = new List<PresenceInfo>();
+
+            NameValueCollection requestArgs = new NameValueCollection
+            {
+                { "RequestMethod", "GetSessions" },
+                { "UserIDList", String.Join(",",userIDs) }
+            };
 
-            for (int i = 0; i < userIDs.Length; i++)
+            OSDMap sessionListResponse = SimianGrid.PostToService(m_serverUrl, requestArgs);
+            if (! sessionListResponse["Success"].AsBoolean())
             {
-                UUID userID;
-                if (UUID.TryParse(userIDs[i], out userID) && userID != UUID.Zero)
-                    presences.AddRange(GetSessions(userID));
+                m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve sessions: {0}",sessionListResponse["Message"].AsString());
+                return null;
+            }
+            
+            OSDArray sessionList = sessionListResponse["Sessions"] as OSDArray;
+            for (int i = 0; i < sessionList.Count; i++)
+            {
+                OSDMap sessionInfo = sessionList[i] as OSDMap;
+                presences.Add(ResponseToPresenceInfo(sessionInfo));
             }
 
             return presences.ToArray();
@@ -262,7 +261,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public bool LoggedOut(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
         {
-//            m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Logging out user " + userID);
+            // m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Logging out user " + userID);
 
             // Remove the session to mark this user offline
             if (!LogoutAgent(sessionID))
@@ -270,13 +269,13 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
             // Save our last position as user data
             NameValueCollection requestArgs = new NameValueCollection
-            {
-                { "RequestMethod", "AddUserData" },
-                { "UserID", userID.ToString() },
-                { "LastLocation", SerializeLocation(regionID, lastPosition, lastLookAt) }
-            };
+                {
+                        { "RequestMethod", "AddUserData" },
+                        { "UserID", userID.ToString() },
+                        { "LastLocation", SerializeLocation(regionID, lastPosition, lastLookAt) }
+                };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             bool success = response["Success"].AsBoolean();
 
             if (!success)
@@ -287,16 +286,16 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public bool SetHome(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
         {
-//            m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Setting home location for user  " + userID);
+            // m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Setting home location for user  " + userID);
 
             NameValueCollection requestArgs = new NameValueCollection
-            {
-                { "RequestMethod", "AddUserData" },
-                { "UserID", userID.ToString() },
-                { "HomeLocation", SerializeLocation(regionID, position, lookAt) }
-            };
+                {
+                        { "RequestMethod", "AddUserData" },
+                        { "UserID", userID.ToString() },
+                        { "HomeLocation", SerializeLocation(regionID, position, lookAt) }
+                };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             bool success = response["Success"].AsBoolean();
 
             if (!success)
@@ -312,24 +311,19 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public GridUserInfo GetGridUserInfo(string user)
         {
-//            m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for agent " + user);
+            // m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for agent " + user); 
 
             UUID userID = new UUID(user);
-//            m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting user data for " + userID);
+            OSDMap userResponse = GetUserData(userID);
 
-            NameValueCollection requestArgs = new NameValueCollection
+            if (userResponse == null)
             {
-                { "RequestMethod", "GetUser" },
-                { "UserID", userID.ToString() }
-            };
+                m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve user data for {0}", userID);
+            }
 
-            OSDMap userResponse = WebUtil.PostToService(m_serverUrl, requestArgs);
-            if (userResponse["Success"].AsBoolean())
-                return ResponseToGridUserInfo(userResponse);
-            else
-                m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve user data for " + userID + ": " + userResponse["Message"].AsString());
+            // Note that ResponseToGridUserInfo properly checks for and returns a null if passed a null.
+            return ResponseToGridUserInfo(userResponse);
 
-            return null;
         }
 
         #endregion
@@ -338,67 +332,51 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         private OSDMap GetUserData(UUID userID)
         {
-//            m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting user data for " + userID);
+            // m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting user data for " + userID);
 
             NameValueCollection requestArgs = new NameValueCollection
-            {
-                { "RequestMethod", "GetUser" },
-                { "UserID", userID.ToString() }
-            };
+                {
+                        { "RequestMethod", "GetUser" },
+                        { "UserID", userID.ToString() }
+                };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             if (response["Success"].AsBoolean() && response["User"] is OSDMap)
                 return response;
-            else
-                m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve user data for " + userID + ": " + response["Message"].AsString());
 
+            m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve user data for {0}; {1}",userID.ToString(),response["Message"].AsString());
             return null;
         }
 
-        private List<PresenceInfo> GetSessions(UUID userID)
+        private OSDMap GetSessionDataFromSessionID(UUID sessionID)
         {
-            List<PresenceInfo> presences = new List<PresenceInfo>(1);
-
-            OSDMap userResponse = GetUserData(userID);
-            if (userResponse != null)
-            {
-//                m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting sessions for " + userID);
-
-                NameValueCollection requestArgs = new NameValueCollection
+            NameValueCollection requestArgs = new NameValueCollection
                 {
-                    { "RequestMethod", "GetSession" },
-                    { "UserID", userID.ToString() }
+                        { "RequestMethod", "GetSession" },
+                        { "SessionID", sessionID.ToString() }
                 };
 
-                OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
-                if (response["Success"].AsBoolean())
-                {
-                    PresenceInfo presence = ResponseToPresenceInfo(response, userResponse);
-                    if (presence != null)
-                        presences.Add(presence);
-                }
-//                else
-//                {
-//                    m_log.Debug("[SIMIAN PRESENCE CONNECTOR]: No session returned for " + userID + ": " + response["Message"].AsString());
-//                }
-            }
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
+            if (response["Success"].AsBoolean())
+                return response;
 
-            return presences;
+            m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve session data for {0}; {1}",sessionID.ToString(),response["Message"].AsString());
+            return null;
         }
 
         private bool UpdateSession(UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
         {
             // Save our current location as session data
             NameValueCollection requestArgs = new NameValueCollection
-            {
-                { "RequestMethod", "UpdateSession" },
-                { "SessionID", sessionID.ToString() },
-                { "SceneID", regionID.ToString() },
-                { "ScenePosition", lastPosition.ToString() },
-                { "SceneLookAt", lastLookAt.ToString() }
-            };
+                {
+                        { "RequestMethod", "UpdateSession" },
+                        { "SessionID", sessionID.ToString() },
+                        { "SceneID", regionID.ToString() },
+                        { "ScenePosition", lastPosition.ToString() },
+                        { "SceneLookAt", lastLookAt.ToString() }
+                };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             bool success = response["Success"].AsBoolean();
 
             if (!success)
@@ -407,7 +385,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
             return success;
         }
 
-        private PresenceInfo ResponseToPresenceInfo(OSDMap sessionResponse, OSDMap userResponse)
+        private PresenceInfo ResponseToPresenceInfo(OSDMap sessionResponse)
         {
             if (sessionResponse == null)
                 return null;
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
index bd8069f..684a0db 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
@@ -392,7 +392,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "UserID", client.AgentId.ToString() }
             };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             string email = response["Email"].AsString();
 
             if (!response["Success"].AsBoolean())
@@ -443,7 +443,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { key, OSDParser.SerializeJsonString(value) }
             };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             bool success = response["Success"].AsBoolean();
 
             if (!success)
@@ -462,7 +462,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "UserID", userID.ToString() }
             };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             if (response["Success"].AsBoolean() && response["User"] is OSDMap)
             {
                 return (OSDMap)response["User"];
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
index fcb5115..fdc8697 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
@@ -165,7 +165,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "NameQuery", query }
             };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             if (response["Success"].AsBoolean())
             {
                 OSDArray array = response["Users"] as OSDArray;
@@ -209,7 +209,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 { "AccessLevel", data.UserLevel.ToString() }
             };
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             
             if (response["Success"].AsBoolean())
             {
@@ -224,7 +224,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                     { "UserTitle", data.UserTitle }
                 };
 
-                response = WebUtil.PostToService(m_serverUrl, requestArgs);
+                response = SimianGrid.PostToService(m_serverUrl, requestArgs);
                 bool success = response["Success"].AsBoolean();
 
                 if (success)
@@ -257,7 +257,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
             string lookupValue = (requestArgs.Count > 1) ? requestArgs[1] : "(Unknown)";
 //            m_log.DebugFormat("[SIMIAN ACCOUNT CONNECTOR]: Looking up user account with query: " + lookupValue);
 
-            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
             if (response["Success"].AsBoolean())
             {
                 OSDMap user = response["User"] as OSDMap;
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index ef2494a..0e74073 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -79,11 +79,27 @@ namespace OpenSim.Services.Connectors.Simulation
             return "agent/";
         }
 
+        protected virtual void PackData(OSDMap args, AgentCircuitData aCircuit, GridRegion destination, uint flags)
+        {
+                args["destination_x"] = OSD.FromString(destination.RegionLocX.ToString());
+                args["destination_y"] = OSD.FromString(destination.RegionLocY.ToString());
+                args["destination_name"] = OSD.FromString(destination.RegionName);
+                args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
+                args["teleport_flags"] = OSD.FromString(flags.ToString());
+        }
+
         public bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint flags, out string reason)
         {
-            // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CreateAgent start");
-            
+            string tmp = String.Empty;
+            return CreateAgent(destination, aCircuit, flags, out tmp, out reason);
+        }
+
+        public bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint flags, out string myipaddress, out string reason)
+        {
+            m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: Creating agent at {0}", destination.ServerURI);
             reason = String.Empty;
+            myipaddress = String.Empty;
+
             if (destination == null)
             {
                 reason = "Destination not found";
@@ -96,12 +112,7 @@ namespace OpenSim.Services.Connectors.Simulation
             try
             {
                 OSDMap args = aCircuit.PackAgentCircuitData();
-
-                args["destination_x"] = OSD.FromString(destination.RegionLocX.ToString());
-                args["destination_y"] = OSD.FromString(destination.RegionLocY.ToString());
-                args["destination_name"] = OSD.FromString(destination.RegionName);
-                args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
-                args["teleport_flags"] = OSD.FromString(flags.ToString());
+                PackData(args, aCircuit, destination, flags);
 
                 OSDMap result = WebUtil.PostToServiceCompressed(uri, args, 30000);
                 bool success = result["success"].AsBoolean();
@@ -111,6 +122,7 @@ namespace OpenSim.Services.Connectors.Simulation
 
                     reason = data["reason"].AsString();
                     success = data["success"].AsBoolean();
+                    myipaddress = data["your_ip"].AsString();
                     return success;
                 }
               
@@ -125,6 +137,7 @@ namespace OpenSim.Services.Connectors.Simulation
 
                         reason = data["reason"].AsString();
                         success = data["success"].AsBoolean();
+                        myipaddress = data["your_ip"].AsString();
                         m_log.WarnFormat(
                             "[REMOTE SIMULATION CONNECTOR]: Remote simulator {0} did not accept compressed transfer, suggest updating it.", destination.RegionName);
                         return success;
@@ -229,7 +242,7 @@ namespace OpenSim.Services.Connectors.Simulation
         /// </summary>
         private bool UpdateAgent(GridRegion destination, IAgentData cAgentData, int timeout)
         {
-            // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: UpdateAgent start");
+            // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: UpdateAgent in {0}", destination.ServerURI);
 
             // Eventually, we want to use a caps url instead of the agentID
             string uri = destination.ServerURI + AgentPath() + cAgentData.AgentID + "/";
@@ -259,41 +272,6 @@ namespace OpenSim.Services.Connectors.Simulation
             return false;
         }
 
-        /// <summary>
-        /// Not sure what sequence causes this function to be invoked. The only calling
-        /// path is through the GET method 
-        /// </summary>
-        public bool RetrieveAgent(GridRegion destination, UUID id, out IAgentData agent)
-        {
-            // m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: RetrieveAgent start");
-
-            agent = null;
-
-            // Eventually, we want to use a caps url instead of the agentID
-            string uri = destination.ServerURI + AgentPath() + id + "/" + destination.RegionID.ToString() + "/";
-
-            try
-            {
-                OSDMap result = WebUtil.GetFromService(uri, 10000);
-                if (result["Success"].AsBoolean())
-                {
-                    // OSDMap args = Util.GetOSDMap(result["_RawResult"].AsString());
-                    OSDMap args = (OSDMap)result["_Result"];
-                    if (args != null)
-                    {
-                        agent = new CompleteAgentData();
-                        agent.Unpack(args, null);
-                        return true;
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                m_log.Warn("[REMOTE SIMULATION CONNECTOR]: UpdateAgent failed with exception: " + e.ToString());
-            }
-
-            return false;
-        }
 
         /// <summary>
         /// </summary>
@@ -392,35 +370,25 @@ namespace OpenSim.Services.Connectors.Simulation
             return true;
         }
 
-        private bool CloseAgent(GridRegion destination, UUID id, bool ChildOnly)
+        /// <summary>
+        /// </summary>
+        public bool CloseAgent(GridRegion destination, UUID id, string auth_code)
         {
-//            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() + "/?auth=" + auth_code;
+            m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CloseAgent {0}", uri);
 
-                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
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index daebf8b..e72b7f9 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Services.GridService
                 {
                     MainConsole.Instance.Commands.AddCommand("Regions", true,
                             "deregister region id",
-                            "deregister region id <Region UUID>",
+                            "deregister region id <region-id>+",
                             "Deregister a region manually.",
                             String.Empty,
                             HandleDeregisterRegion);
@@ -265,8 +265,9 @@ namespace OpenSim.Services.GridService
                 m_log.DebugFormat("[GRID SERVICE]: Database exception: {0}", e);
             }
 
-            m_log.DebugFormat("[GRID SERVICE]: Region {0} ({1}) registered successfully at {2}-{3}", 
-                regionInfos.RegionName, regionInfos.RegionID, regionInfos.RegionCoordX, regionInfos.RegionCoordY);
+            m_log.DebugFormat("[GRID SERVICE]: Region {0} ({1}) registered successfully at {2}-{3} with flags {4}", 
+                regionInfos.RegionName, regionInfos.RegionID, regionInfos.RegionCoordX, regionInfos.RegionCoordY, 
+                (OpenSim.Framework.RegionFlags)flags);
 
             return String.Empty;
         }
@@ -478,6 +479,33 @@ namespace OpenSim.Services.GridService
             return ret;
         }
 
+        public List<GridRegion> GetDefaultHypergridRegions(UUID scopeID)
+        {
+            List<GridRegion> ret = new List<GridRegion>();
+
+            List<RegionData> regions = m_Database.GetDefaultHypergridRegions(scopeID);
+
+            foreach (RegionData r in regions)
+            {
+                if ((Convert.ToInt32(r.Data["flags"]) & (int)OpenSim.Framework.RegionFlags.RegionOnline) != 0)
+                    ret.Add(RegionData2RegionInfo(r));
+            }
+
+            int hgDefaultRegionsFoundOnline = regions.Count;
+
+            // For now, hypergrid default regions will always be given precedence but we will also return simple default
+            // regions in case no specific hypergrid regions are specified.
+            ret.AddRange(GetDefaultRegions(scopeID));
+
+            int normalDefaultRegionsFoundOnline = ret.Count - hgDefaultRegionsFoundOnline;
+
+            m_log.DebugFormat(
+                "[GRID SERVICE]: GetDefaultHypergridRegions returning {0} hypergrid default and {1} normal default regions", 
+                hgDefaultRegionsFoundOnline, normalDefaultRegionsFoundOnline);
+
+            return ret;
+        }
+
         public List<GridRegion> GetFallbackRegions(UUID scopeID, int x, int y)
         {
             List<GridRegion> ret = new List<GridRegion>();
@@ -526,40 +554,41 @@ namespace OpenSim.Services.GridService
 
         private void HandleDeregisterRegion(string module, string[] cmd)
         {
-            if (cmd.Length != 4)
+            if (cmd.Length < 4)
             {
-                MainConsole.Instance.Output("Syntax: degregister region id <Region UUID>");
+                MainConsole.Instance.Output("Usage: degregister region id <region-id>+");
                 return;
             }
 
-            string rawRegionUuid = cmd[3];
-            UUID regionUuid;
-
-            if (!UUID.TryParse(rawRegionUuid, out regionUuid))
+            for (int i = 3; i < cmd.Length; i++)
             {
-                MainConsole.Instance.OutputFormat("{0} is not a valid region uuid", rawRegionUuid);
-                return;
-            }
+                string rawRegionUuid = cmd[i];
+                UUID regionUuid;
 
-            GridRegion region = GetRegionByUUID(UUID.Zero, regionUuid);
+                if (!UUID.TryParse(rawRegionUuid, out regionUuid))
+                {
+                    MainConsole.Instance.OutputFormat("{0} is not a valid region uuid", rawRegionUuid);
+                    return;
+                }
 
-            if (region == null)
-            {
-                MainConsole.Instance.OutputFormat("No region with UUID {0}", regionUuid);
-                return;
-            }
+                GridRegion region = GetRegionByUUID(UUID.Zero, regionUuid);
 
-            if (DeregisterRegion(regionUuid))
-            {
-                MainConsole.Instance.OutputFormat("Deregistered {0} {1}", region.RegionName, regionUuid);
-            }
-            else
-            {
-                // I don't think this can ever occur if we know that the region exists.
-                MainConsole.Instance.OutputFormat("Error deregistering {0} {1}", region.RegionName, regionUuid);
-            }
+                if (region == null)
+                {
+                    MainConsole.Instance.OutputFormat("No region with UUID {0}", regionUuid);
+                    return;
+                }
 
-            return;
+                if (DeregisterRegion(regionUuid))
+                {
+                    MainConsole.Instance.OutputFormat("Deregistered {0} {1}", region.RegionName, regionUuid);
+                }
+                else
+                {
+                    // I don't think this can ever occur if we know that the region exists.
+                    MainConsole.Instance.OutputFormat("Error deregistering {0} {1}", region.RegionName, regionUuid);
+                }
+            }
         }
 
         private void HandleShowRegions(string module, string[] cmd)
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index 8335724..4024295 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Services.GridService
             {
                 if (m_DefaultRegion == null)
                 {
-                    List<GridRegion> defs = m_GridService.GetDefaultRegions(m_ScopeID);
+                    List<GridRegion> defs = m_GridService.GetDefaultHypergridRegions(m_ScopeID);
                     if (defs != null && defs.Count > 0)
                         m_DefaultRegion = defs[0];
                     else
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 97a0afc..f6136b5 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -58,6 +58,7 @@ namespace OpenSim.Services.HypergridService
         private static IUserAgentService m_UserAgentService;
         private static ISimulationService m_SimulationService;
         private static IGridUserService m_GridUserService;
+        private static IBansService m_BansService;
 
         private static string m_AllowedClients = string.Empty;
         private static string m_DeniedClients = string.Empty;
@@ -87,6 +88,7 @@ namespace OpenSim.Services.HypergridService
                 string presenceService = serverConfig.GetString("PresenceService", String.Empty);
                 string simulationService = serverConfig.GetString("SimulationService", String.Empty);
                 string gridUserService = serverConfig.GetString("GridUserService", String.Empty);
+                string bansService = serverConfig.GetString("BansService", String.Empty);
 
                 // These are mandatory, the others aren't
                 if (gridService == string.Empty || presenceService == string.Empty)
@@ -121,6 +123,8 @@ namespace OpenSim.Services.HypergridService
                     m_UserAgentService = ServerUtils.LoadPlugin<IUserAgentService>(homeUsersService, args);
                 if (gridUserService != string.Empty)
                     m_GridUserService = ServerUtils.LoadPlugin<IGridUserService>(gridUserService, args);
+                if (bansService != string.Empty)
+                    m_BansService = ServerUtils.LoadPlugin<IBansService>(bansService, args);
 
                 if (simService != null)
                     m_SimulationService = simService;
@@ -167,7 +171,7 @@ namespace OpenSim.Services.HypergridService
             m_log.DebugFormat("[GATEKEEPER SERVICE]: Request to link to {0}", (regionName == string.Empty)? "default region" : regionName);
             if (!m_AllowTeleportsToAnyRegion || regionName == string.Empty)
             {
-                List<GridRegion> defs = m_GridService.GetDefaultRegions(m_ScopeID);
+                List<GridRegion> defs = m_GridService.GetDefaultHypergridRegions(m_ScopeID);
                 if (defs != null && defs.Count > 0)
                 {
                     region = defs[0];
@@ -223,7 +227,7 @@ namespace OpenSim.Services.HypergridService
             m_log.InfoFormat("[GATEKEEPER SERVICE]: Login request for {0} {1} @ {2} ({3}) at {4} using viewer {5}, channel {6}, IP {7}, Mac {8}, Id0 {9} Teleport Flags {10}",
                 aCircuit.firstname, aCircuit.lastname, authURL, aCircuit.AgentID, destination.RegionName,
                 aCircuit.Viewer, aCircuit.Channel, aCircuit.IPAddress, aCircuit.Mac, aCircuit.Id0, aCircuit.teleportFlags.ToString());
-            
+
             //
             // Check client
             //
@@ -287,17 +291,16 @@ namespace OpenSim.Services.HypergridService
                     }
                 }
             }
-            m_log.DebugFormat("[GATEKEEPER SERVICE]: User is ok");
 
             //
             // Foreign agents allowed? Exceptions?
             //
-            if (account == null) 
+            if (account == null)
             {
                 bool allowed = m_ForeignAgentsAllowed;
 
                 if (m_ForeignAgentsAllowed && IsException(aCircuit, m_ForeignsAllowedExceptions))
-                        allowed = false;
+                    allowed = false;
 
                 if (!m_ForeignAgentsAllowed && IsException(aCircuit, m_ForeignsDisallowedExceptions))
                     allowed = true;
@@ -311,6 +314,20 @@ namespace OpenSim.Services.HypergridService
                 }
             }
 
+            //
+            // Is the user banned?
+            // This uses a Ban service that's more powerful than the configs
+            //
+            string uui = (account != null ? aCircuit.AgentID.ToString() : Util.ProduceUserUniversalIdentifier(aCircuit));
+            if (m_BansService != null && m_BansService.IsBanned(uui, aCircuit.IPAddress, aCircuit.Id0, authURL))
+            {
+                reason = "You are banned from this world";
+                m_log.InfoFormat("[GATEKEEPER SERVICE]: Login failed, reason: user {0} is banned", uui);
+                return false;
+            }
+
+            m_log.DebugFormat("[GATEKEEPER SERVICE]: User {0} is ok", aCircuit.Name);
+
             bool isFirstLogin = false;
             //
             // Login the presence, if it's not there yet (by the login service)
@@ -328,7 +345,8 @@ namespace OpenSim.Services.HypergridService
                         aCircuit.firstname, aCircuit.lastname);
                     return false;
                 }
-                m_log.DebugFormat("[GATEKEEPER SERVICE]: Login presence ok");
+
+                m_log.DebugFormat("[GATEKEEPER SERVICE]: Login presence {0} is ok", aCircuit.Name);
 
                 // Also login foreigners with GridUser service
                 if (m_GridUserService != null && account == null)
@@ -359,7 +377,9 @@ namespace OpenSim.Services.HypergridService
                 reason = "Destination region not found";
                 return false;
             }
-            m_log.DebugFormat("[GATEKEEPER SERVICE]: destination ok: {0}", destination.RegionName);
+
+            m_log.DebugFormat(
+                "[GATEKEEPER SERVICE]: Destination {0} is ok for {1}", destination.RegionName, aCircuit.Name);
 
             //
             // Adjust the visible name
@@ -393,7 +413,8 @@ namespace OpenSim.Services.HypergridService
             // Preserve our TeleportFlags we have gathered so-far
             loginFlag |= (Constants.TeleportFlags) aCircuit.teleportFlags;
 
-            m_log.DebugFormat("[GATEKEEPER SERVICE]: launching agent {0}", loginFlag);
+            m_log.DebugFormat("[GATEKEEPER SERVICE]: Launching {0} {1}", aCircuit.Name, loginFlag);
+
             return m_SimulationService.CreateAgent(destination, aCircuit, (uint)loginFlag, out reason);
         }
 
@@ -402,6 +423,12 @@ namespace OpenSim.Services.HypergridService
             if (!CheckAddress(aCircuit.ServiceSessionID))
                 return false;
 
+            if (string.IsNullOrEmpty(aCircuit.IPAddress))
+            {
+                m_log.DebugFormat("[GATEKEEPER SERVICE]: Agent did not provide a client IP address.");
+                return false;
+            }
+
             string userURL = string.Empty;
             if (aCircuit.ServiceURLs.ContainsKey("HomeURI"))
                 userURL = aCircuit.ServiceURLs["HomeURI"].ToString();
diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
index eecf757..0601ece 100644
--- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
+++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Services.HypergridService
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
 
-        private string m_HomeURL;
+//        private string m_HomeURL;
         private IUserAccountService m_UserAccountService;
         private IAvatarService m_AvatarService;
 
@@ -96,8 +96,8 @@ namespace OpenSim.Services.HypergridService
                 if (m_AvatarService == null)
                     throw new Exception(String.Format("Unable to create m_AvatarService from {0}", avatarDll));
 
-                m_HomeURL = Util.GetConfigVarFromSections<string>(config, "HomeURI",
-                    new string[] { "Startup", "Hypergrid", m_ConfigName }, String.Empty); 
+//                m_HomeURL = Util.GetConfigVarFromSections<string>(config, "HomeURI",
+//                    new string[] { "Startup", "Hypergrid", m_ConfigName }, String.Empty); 
 
 //                m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService);
             }
@@ -115,6 +115,12 @@ namespace OpenSim.Services.HypergridService
         {
             XInventoryFolder suitcase = GetSuitcaseXFolder(principalID);
 
+            if (suitcase == null)
+            {
+                m_log.WarnFormat("[HG SUITCASE INVENTORY SERVICE]: Found no suitcase folder for user {0} when looking for inventory skeleton", principalID);
+                return null;
+            }
+
             List<XInventoryFolder> tree = GetFolderTree(principalID, suitcase.folderID);
             if (tree == null || (tree != null && tree.Count == 0))
                 return null;
@@ -134,6 +140,7 @@ namespace OpenSim.Services.HypergridService
         public override InventoryCollection GetUserInventory(UUID userID)
         {
             m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: Get Suitcase inventory for user {0}", userID);
+
             InventoryCollection userInventory = new InventoryCollection();
             userInventory.UserID = userID;
             userInventory.Folders = new List<InventoryFolderBase>();
@@ -141,6 +148,12 @@ namespace OpenSim.Services.HypergridService
 
             XInventoryFolder suitcase = GetSuitcaseXFolder(userID);
 
+            if (suitcase == null)
+            {
+                m_log.WarnFormat("[HG SUITCASE INVENTORY SERVICE]: Found no suitcase folder for user {0} when looking for user inventory", userID);
+                return null;
+            }
+
             List<XInventoryFolder> tree = GetFolderTree(userID, suitcase.folderID);
             if (tree == null || (tree != null && tree.Count == 0))
             {
@@ -182,7 +195,8 @@ namespace OpenSim.Services.HypergridService
             m_log.DebugFormat("[HG SUITCASE INVENTORY SERVICE]: GetRootFolder for {0}", principalID);
 
             // Let's find out the local root folder
-            XInventoryFolder root = GetRootXFolder(principalID); ;
+            XInventoryFolder root = GetRootXFolder(principalID);
+
             if (root == null)
             {
                 m_log.WarnFormat("[HG SUITCASE INVENTORY SERVICE]: Unable to retrieve local root folder for user {0}", principalID);
@@ -255,6 +269,13 @@ namespace OpenSim.Services.HypergridService
         {
             //m_log.DebugFormat("[HG INVENTORY SERVICE]: GetFolderForType for {0} {0}", principalID, type);
             XInventoryFolder suitcase = GetSuitcaseXFolder(principalID);
+
+            if (suitcase == null)
+            {
+                m_log.WarnFormat("[HG SUITCASE INVENTORY SERVICE]: Found no suitcase folder for user {0} when looking for child type folder {1}", principalID, type);
+                return null;
+            }
+
             XInventoryFolder[] folders = m_Database.GetFolders(
                     new string[] { "agentID", "type", "parentFolderID" },
                     new string[] { principalID.ToString(), ((int)type).ToString(), suitcase.folderID.ToString() });
@@ -472,6 +493,22 @@ namespace OpenSim.Services.HypergridService
             return null;
         }
 
+        private XInventoryFolder GetCurrentOutfitXFolder(UUID userID)
+        {
+            XInventoryFolder root = GetRootXFolder(userID);
+            if (root == null)
+                return null;
+
+            XInventoryFolder[] folders = m_Database.GetFolders(
+                    new string[] { "agentID", "type", "parentFolderID" },
+                    new string[] { userID.ToString(), ((int)AssetType.CurrentOutfitFolder).ToString(), root.folderID.ToString() });
+
+            if (folders.Length == 0)
+                return null;
+
+            return folders[0];
+        }
+
         private XInventoryFolder GetSuitcaseXFolder(UUID principalID)
         {
             // Warp! Root folder for travelers
@@ -510,6 +547,7 @@ namespace OpenSim.Services.HypergridService
             if (m_SuitcaseTrees.TryGetValue(principalID, out t))
                 return t;
 
+            // Get the tree of the suitcase folder
             t = GetFolderTreeRecursive(folder);
             m_SuitcaseTrees.AddOrUpdate(principalID, t, 5*60); // 5minutes
             return t;
@@ -546,6 +584,7 @@ namespace OpenSim.Services.HypergridService
         private bool IsWithinSuitcaseTree(UUID principalID, UUID folderID)
         {
             XInventoryFolder suitcase = GetSuitcaseXFolder(principalID);
+
             if (suitcase == null)
             {
                 m_log.WarnFormat("[HG SUITCASE INVENTORY SERVICE]: User {0} does not have a Suitcase folder", principalID);
@@ -555,6 +594,9 @@ namespace OpenSim.Services.HypergridService
             List<XInventoryFolder> tree = new List<XInventoryFolder>();
             tree.Add(suitcase); // Warp! the tree is the real root folder plus the children of the suitcase folder
             tree.AddRange(GetFolderTree(principalID, suitcase.folderID));
+            // Also add the Current Outfit folder to the list of available folders
+            tree.Add(GetCurrentOutfitXFolder(principalID));
+
             XInventoryFolder f = tree.Find(delegate(XInventoryFolder fl)
             {
                 if (fl.folderID == folderID) return true;
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index ec76508..b414aca 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.Net;
 using System.Reflection;
 
+using OpenSim.Data;
 using OpenSim.Framework;
 using OpenSim.Services.Connectors.Friends;
 using OpenSim.Services.Connectors.Hypergrid;
@@ -50,14 +51,14 @@ namespace OpenSim.Services.HypergridService
     /// needs to do it for them.
     /// Once we have better clients, this shouldn't be needed.
     /// </summary>
-    public class UserAgentService : IUserAgentService
+    public class UserAgentService : UserAgentServiceBase, IUserAgentService
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
 
         // This will need to go into a DB table
-        static Dictionary<UUID, TravelingAgentInfo> m_TravelingAgents = new Dictionary<UUID, TravelingAgentInfo>();
+        //static Dictionary<UUID, TravelingAgentInfo> m_Database = new Dictionary<UUID, TravelingAgentInfo>();
 
         static bool m_Initialized = false;
 
@@ -86,6 +87,7 @@ namespace OpenSim.Services.HypergridService
         }
 
         public UserAgentService(IConfigSource config, IFriendsSimConnector friendsConnector)
+            : base(config)
         {
             // Let's set this always, because we don't know the sequence
             // of instantiations
@@ -146,6 +148,9 @@ namespace OpenSim.Services.HypergridService
                 if (!m_GridName.EndsWith("/"))
                     m_GridName = m_GridName + "/";
 
+                // Finally some cleanup
+                m_Database.DeleteOld();
+
             }
         }
 
@@ -210,10 +215,10 @@ namespace OpenSim.Services.HypergridService
             return home;
         }
 
-        public bool LoginAgentToGrid(AgentCircuitData agentCircuit, GridRegion gatekeeper, GridRegion finalDestination, IPEndPoint clientIP, out string reason)
+        public bool LoginAgentToGrid(AgentCircuitData agentCircuit, GridRegion gatekeeper, GridRegion finalDestination, bool fromLogin, out string reason)
         {
             m_log.DebugFormat("[USER AGENT SERVICE]: Request to login user {0} {1} (@{2}) to grid {3}", 
-                agentCircuit.firstname, agentCircuit.lastname, ((clientIP == null) ? "stored IP" : clientIP.Address.ToString()), gatekeeper.ServerURI);
+                agentCircuit.firstname, agentCircuit.lastname, (fromLogin ? agentCircuit.IPAddress : "stored IP"), gatekeeper.ServerURI);
 
             string gridName = gatekeeper.ServerURI;
 
@@ -260,12 +265,13 @@ namespace OpenSim.Services.HypergridService
 
             // Generate a new service session
             agentCircuit.ServiceSessionID = region.ServerURI + ";" + UUID.Random();
-            TravelingAgentInfo old = UpdateTravelInfo(agentCircuit, region);
+            TravelingAgentInfo old = null;
+            TravelingAgentInfo travel = CreateTravelInfo(agentCircuit, region, fromLogin, out old);
             
             bool success = false;
             string myExternalIP = string.Empty;
 
-            m_log.DebugFormat("[USER AGENT SERVICE]: this grid: {0}, desired grid: {1}", m_GridName, gridName);
+            m_log.DebugFormat("[USER AGENT SERVICE]: this grid: {0}, desired grid: {1}, desired region: {2}", m_GridName, gridName, region.RegionID);
 
             if (m_GridName == gridName)
                 success = m_GatekeeperService.LoginAgent(agentCircuit, finalDestination, out reason);
@@ -282,23 +288,21 @@ namespace OpenSim.Services.HypergridService
                 m_log.DebugFormat("[USER AGENT SERVICE]: Unable to login user {0} {1} to grid {2}, reason: {3}", 
                     agentCircuit.firstname, agentCircuit.lastname, region.ServerURI, reason);
 
-                // restore the old travel info
-                lock (m_TravelingAgents)
-                {
-                    if (old == null)
-                        m_TravelingAgents.Remove(agentCircuit.SessionID);
-                    else
-                        m_TravelingAgents[agentCircuit.SessionID] = old;
-                }
+                if (old != null)
+                    StoreTravelInfo(old);
+                else
+                    m_Database.Delete(agentCircuit.SessionID);
 
                 return false;
             }
 
+            // Everything is ok
+
+            // Update the perceived IP Address of our grid 
             m_log.DebugFormat("[USER AGENT SERVICE]: Gatekeeper sees me as {0}", myExternalIP);
-            // else set the IP addresses associated with this client
-            if (clientIP != null)
-                m_TravelingAgents[agentCircuit.SessionID].ClientIPAddress = clientIP.Address.ToString();
-            m_TravelingAgents[agentCircuit.SessionID].MyIpAddress = myExternalIP;
+            travel.MyIpAddress = myExternalIP;
+
+            StoreTravelInfo(travel);
 
             return true;
         }
@@ -306,60 +310,42 @@ namespace OpenSim.Services.HypergridService
         public bool LoginAgentToGrid(AgentCircuitData agentCircuit, GridRegion gatekeeper, GridRegion finalDestination, out string reason)
         {
             reason = string.Empty;
-            return LoginAgentToGrid(agentCircuit, gatekeeper, finalDestination, null, out reason);
+            return LoginAgentToGrid(agentCircuit, gatekeeper, finalDestination, false, out reason);
         }
 
-        private void SetClientIP(UUID sessionID, string ip)
+        TravelingAgentInfo CreateTravelInfo(AgentCircuitData agentCircuit, GridRegion region, bool fromLogin, out TravelingAgentInfo existing)
         {
-            if (m_TravelingAgents.ContainsKey(sessionID))
-            {
-                m_log.DebugFormat("[USER AGENT SERVICE]: Setting IP {0} for session {1}", ip, sessionID);
-                m_TravelingAgents[sessionID].ClientIPAddress = ip;
-            }
-        }
+            HGTravelingData hgt = m_Database.Get(agentCircuit.SessionID);
+            existing = null;
 
-        TravelingAgentInfo UpdateTravelInfo(AgentCircuitData agentCircuit, GridRegion region)
-        {
-            TravelingAgentInfo travel = new TravelingAgentInfo();
-            TravelingAgentInfo old = null;
-            lock (m_TravelingAgents)
+            if (hgt != null)
             {
-                if (m_TravelingAgents.ContainsKey(agentCircuit.SessionID))
-                {
-                    // Very important! Override whatever this agent comes with.
-                    // UserAgentService always sets the IP for every new agent
-                    // with the original IP address.
-                    agentCircuit.IPAddress = m_TravelingAgents[agentCircuit.SessionID].ClientIPAddress;
-
-                    old = m_TravelingAgents[agentCircuit.SessionID];
-                }
-
-                m_TravelingAgents[agentCircuit.SessionID] = travel;
+                // Very important! Override whatever this agent comes with.
+                // UserAgentService always sets the IP for every new agent
+                // with the original IP address.
+                existing = new TravelingAgentInfo(hgt);
+                agentCircuit.IPAddress = existing.ClientIPAddress;
             }
+
+            TravelingAgentInfo travel = new TravelingAgentInfo(existing);
+            travel.SessionID = agentCircuit.SessionID;
             travel.UserID = agentCircuit.AgentID;
             travel.GridExternalName = region.ServerURI;
             travel.ServiceToken = agentCircuit.ServiceSessionID;
-            if (old != null)
-                travel.ClientIPAddress = old.ClientIPAddress;
 
-            return old;
+            if (fromLogin)
+                travel.ClientIPAddress = agentCircuit.IPAddress;
+
+            StoreTravelInfo(travel);
+
+            return travel;
         }
 
         public void LogoutAgent(UUID userID, UUID sessionID)
         {
             m_log.DebugFormat("[USER AGENT SERVICE]: User {0} logged out", userID);
 
-            lock (m_TravelingAgents)
-            {
-                List<UUID> travels = new List<UUID>();
-                foreach (KeyValuePair<UUID, TravelingAgentInfo> kvp in m_TravelingAgents)
-                    if (kvp.Value == null) // do some clean up
-                        travels.Add(kvp.Key);
-                    else if (kvp.Value.UserID == userID)
-                        travels.Add(kvp.Key);
-                foreach (UUID session in travels)
-                    m_TravelingAgents.Remove(session);
-            }
+            m_Database.Delete(sessionID);
 
             GridUserInfo guinfo = m_GridUserService.GetGridUserInfo(userID.ToString());
             if (guinfo != null)
@@ -369,10 +355,11 @@ namespace OpenSim.Services.HypergridService
         // We need to prevent foreign users with the same UUID as a local user
         public bool IsAgentComingHome(UUID sessionID, string thisGridExternalName)
         {
-            if (!m_TravelingAgents.ContainsKey(sessionID))
+            HGTravelingData hgt = m_Database.Get(sessionID);
+            if (hgt == null)
                 return false;
 
-            TravelingAgentInfo travel = m_TravelingAgents[sessionID];
+            TravelingAgentInfo travel = new TravelingAgentInfo(hgt);
 
             return travel.GridExternalName.ToLower() == thisGridExternalName.ToLower();
         }
@@ -385,29 +372,32 @@ namespace OpenSim.Services.HypergridService
             m_log.DebugFormat("[USER AGENT SERVICE]: Verifying Client session {0} with reported IP {1}.", 
                 sessionID, reportedIP);
 
-            if (m_TravelingAgents.ContainsKey(sessionID))
-            {
-                m_log.DebugFormat("[USER AGENT SERVICE]: Comparing with login IP {0} and MyIP {1}", 
-                    m_TravelingAgents[sessionID].ClientIPAddress, m_TravelingAgents[sessionID].MyIpAddress);
+            HGTravelingData hgt = m_Database.Get(sessionID);
+            if (hgt == null)
+                return false;
 
-                return m_TravelingAgents[sessionID].ClientIPAddress == reportedIP ||
-                    m_TravelingAgents[sessionID].MyIpAddress == reportedIP; // NATed
-            }
+            TravelingAgentInfo travel = new TravelingAgentInfo(hgt);
+
+            bool result = travel.ClientIPAddress == reportedIP || travel.MyIpAddress == reportedIP; // NATed
 
-            return false;
+            m_log.DebugFormat("[USER AGENT SERVICE]: Comparing {0} with login IP {1} and MyIP {1}; result is {3}",
+                                reportedIP, travel.ClientIPAddress, travel.MyIpAddress, result);
+
+            return result;
         }
 
         public bool VerifyAgent(UUID sessionID, string token)
         {
-            if (m_TravelingAgents.ContainsKey(sessionID))
+            HGTravelingData hgt = m_Database.Get(sessionID);
+            if (hgt == null)
             {
-                m_log.DebugFormat("[USER AGENT SERVICE]: Verifying agent token {0} against {1}", token, m_TravelingAgents[sessionID].ServiceToken);
-                return m_TravelingAgents[sessionID].ServiceToken == token;
+                m_log.DebugFormat("[USER AGENT SERVICE]: Token verification for session {0}: no such session", sessionID);
+                return false;
             }
 
-            m_log.DebugFormat("[USER AGENT SERVICE]: Token verification for session {0}: no such session", sessionID);
-
-            return false;
+            TravelingAgentInfo travel = new TravelingAgentInfo(hgt);
+            m_log.DebugFormat("[USER AGENT SERVICE]: Verifying agent token {0} against {1}", token, travel.ServiceToken);
+            return travel.ServiceToken == token;
         }
 
         [Obsolete]
@@ -470,17 +460,17 @@ namespace OpenSim.Services.HypergridService
                 }
             }
 
-            // Lastly, let's notify the rest who may be online somewhere else
-            foreach (string user in usersToBeNotified)
-            {
-                UUID id = new UUID(user);
-                if (m_TravelingAgents.ContainsKey(id) && m_TravelingAgents[id].GridExternalName != m_GridName)
-                {
-                    string url = m_TravelingAgents[id].GridExternalName;
-                    // forward
-                    m_log.WarnFormat("[USER AGENT SERVICE]: User {0} is visiting {1}. HG Status notifications still not implemented.", user, url);
-                }
-            }
+            //// Lastly, let's notify the rest who may be online somewhere else
+            //foreach (string user in usersToBeNotified)
+            //{
+            //    UUID id = new UUID(user);
+            //    if (m_Database.ContainsKey(id) && m_Database[id].GridExternalName != m_GridName)
+            //    {
+            //        string url = m_Database[id].GridExternalName;
+            //        // forward
+            //        m_log.WarnFormat("[USER AGENT SERVICE]: User {0} is visiting {1}. HG Status notifications still not implemented.", user, url);
+            //    }
+            //}
 
             // and finally, let's send the online friends
             if (online)
@@ -607,16 +597,13 @@ namespace OpenSim.Services.HypergridService
 
         public string LocateUser(UUID userID)
         {
-            foreach (TravelingAgentInfo t in m_TravelingAgents.Values)
-            {
-                if (t == null)
-                {
-                    m_log.ErrorFormat("[USER AGENT SERVICE]: Oops! Null TravelingAgentInfo. Please report this on mantis");
-                    continue;
-                }
-                if (t.UserID == userID && !m_GridName.Equals(t.GridExternalName))
-                    return t.GridExternalName;
-            }
+            HGTravelingData[] hgts = m_Database.GetSessions(userID);
+            if (hgts == null)
+                return string.Empty;
+
+            foreach (HGTravelingData t in hgts)
+                if (t.Data.ContainsKey("GridExternalName") && !m_GridName.Equals(t.Data["GridExternalName"]))
+                    return t.Data["GridExternalName"];
 
             return string.Empty;
         }
@@ -687,17 +674,60 @@ namespace OpenSim.Services.HypergridService
             return exception;
         }
 
+        private void StoreTravelInfo(TravelingAgentInfo travel)
+        {
+            if (travel == null)
+                return;
+
+            HGTravelingData hgt = new HGTravelingData();
+            hgt.SessionID = travel.SessionID;
+            hgt.UserID = travel.UserID;
+            hgt.Data = new Dictionary<string, string>();
+            hgt.Data["GridExternalName"] = travel.GridExternalName;
+            hgt.Data["ServiceToken"] = travel.ServiceToken;
+            hgt.Data["ClientIPAddress"] = travel.ClientIPAddress;
+            hgt.Data["MyIPAddress"] = travel.MyIpAddress;
+
+            m_Database.Store(hgt);
+        }
         #endregion
 
     }
 
     class TravelingAgentInfo
     {
+        public UUID SessionID;
         public UUID UserID;
         public string GridExternalName = string.Empty;
         public string ServiceToken = string.Empty;
         public string ClientIPAddress = string.Empty; // as seen from this user agent service
         public string MyIpAddress = string.Empty; // the user agent service's external IP, as seen from the next gatekeeper
+
+        public TravelingAgentInfo(HGTravelingData t)
+        {
+            if (t.Data != null)
+            {
+                SessionID = new UUID(t.SessionID);
+                UserID = new UUID(t.UserID);
+                GridExternalName = t.Data["GridExternalName"];
+                ServiceToken = t.Data["ServiceToken"];
+                ClientIPAddress = t.Data["ClientIPAddress"];
+                MyIpAddress = t.Data["MyIPAddress"];
+            }
+        }
+
+        public TravelingAgentInfo(TravelingAgentInfo old)
+        {
+            if (old != null)
+            {
+                SessionID = old.SessionID;
+                UserID = old.UserID;
+                GridExternalName = old.GridExternalName;
+                ServiceToken = old.ServiceToken;
+                ClientIPAddress = old.ClientIPAddress;
+                MyIpAddress = old.MyIpAddress;
+            }
+        }
     }
 
 }
diff --git a/OpenSim/Services/HypergridService/UserAgentServiceBase.cs b/OpenSim/Services/HypergridService/UserAgentServiceBase.cs
new file mode 100644
index 0000000..a00e5a6
--- /dev/null
+++ b/OpenSim/Services/HypergridService/UserAgentServiceBase.cs
@@ -0,0 +1,84 @@
+/*
+ * 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 Nini.Config;
+using OpenSim.Framework;
+using OpenSim.Data;
+using OpenSim.Services.Interfaces;
+using OpenSim.Services.Base;
+
+namespace OpenSim.Services.HypergridService
+{
+    public class UserAgentServiceBase : ServiceBase
+    {
+        protected IHGTravelingData m_Database = null;
+
+        public UserAgentServiceBase(IConfigSource config)
+            : base(config)
+        {
+            string dllName = String.Empty;
+            string connString = String.Empty;
+            string realm = "hg_traveling_data";
+
+            //
+            // Try reading the [DatabaseService] section, if it exists
+            //
+            IConfig dbConfig = config.Configs["DatabaseService"];
+            if (dbConfig != null)
+            {
+                if (dllName == String.Empty)
+                    dllName = dbConfig.GetString("StorageProvider", String.Empty);
+                if (connString == String.Empty)
+                    connString = dbConfig.GetString("ConnectionString", String.Empty);
+            }
+
+            //
+            // [UserAgentService] section overrides [DatabaseService], if it exists
+            //
+            IConfig gridConfig = config.Configs["UserAgentService"];
+            if (gridConfig != null)
+            {
+                dllName = gridConfig.GetString("StorageProvider", dllName);
+                connString = gridConfig.GetString("ConnectionString", connString);
+                realm = gridConfig.GetString("Realm", realm);
+            }
+
+            //
+            // We tried, but this doesn't exist. We can't proceed.
+            //
+            if (dllName.Equals(String.Empty))
+                throw new Exception("No StorageProvider configured");
+
+            m_Database = LoadPlugin<IHGTravelingData>(dllName, new Object[] { connString, realm });
+            if (m_Database == null)
+                throw new Exception("Could not find a storage interface in the given module");
+
+        }
+    }
+}
diff --git a/OpenSim/Services/Interfaces/IBansService.cs b/OpenSim/Services/Interfaces/IBansService.cs
new file mode 100644
index 0000000..8fd3521
--- /dev/null
+++ b/OpenSim/Services/Interfaces/IBansService.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 System.Collections.Generic;
+
+using OpenSim.Framework;
+using OpenMetaverse;
+
+namespace OpenSim.Services.Interfaces
+{
+    public interface IBansService
+    {
+        /// <summary>
+        /// Are any of the given arguments banned from the grid?
+        /// </summary>
+        /// <param name="userID"></param>
+        /// <param name="ip"></param>
+        /// <param name="id0"></param>
+        /// <param name="origin"></param>
+        /// <returns></returns>
+        bool IsBanned(string userID, string ip, string id0, string origin);
+    }
+
+}
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index 3f4c958..e3c70d3 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -97,6 +97,7 @@ namespace OpenSim.Services.Interfaces
         List<GridRegion> GetRegionRange(UUID scopeID, int xmin, int xmax, int ymin, int ymax);
 
         List<GridRegion> GetDefaultRegions(UUID scopeID);
+        List<GridRegion> GetDefaultHypergridRegions(UUID scopeID);
         List<GridRegion> GetFallbackRegions(UUID scopeID, int x, int y);
         List<GridRegion> GetHyperlinks(UUID scopeID);
 
@@ -137,7 +138,10 @@ namespace OpenSim.Services.Interfaces
                 if ( m_serverURI != string.Empty ) {
                     return m_serverURI;
                 } else {
-                    return "http://" + m_externalHostName + ":" + m_httpPort + "/";
+                    if (m_httpPort == 0)
+                        return "http://" + m_externalHostName + "/";
+                    else
+                        return "http://" + m_externalHostName + ":" + m_httpPort + "/";
                 }
             }
             set { 
diff --git a/OpenSim/Services/Interfaces/IHypergridServices.cs b/OpenSim/Services/Interfaces/IHypergridServices.cs
index 3dc877a..f9e7f08 100644
--- a/OpenSim/Services/Interfaces/IHypergridServices.cs
+++ b/OpenSim/Services/Interfaces/IHypergridServices.cs
@@ -48,10 +48,7 @@ namespace OpenSim.Services.Interfaces
     /// </summary>
     public interface IUserAgentService
     {
-        // called by login service only
-        bool LoginAgentToGrid(AgentCircuitData agent, GridRegion gatekeeper, GridRegion finalDestination, IPEndPoint clientIP, out string reason);
-        // called by simulators
-        bool LoginAgentToGrid(AgentCircuitData agent, GridRegion gatekeeper, GridRegion finalDestination, out string reason);
+        bool LoginAgentToGrid(AgentCircuitData agent, GridRegion gatekeeper, GridRegion finalDestination, bool fromLogin, out string reason);
         void LogoutAgent(UUID userID, UUID sessionID);
         GridRegion GetHomeRegion(UUID userID, out Vector3 position, out Vector3 lookAt);
         Dictionary<string, object> GetServerURLs(UUID userID);
diff --git a/OpenSim/Services/Interfaces/ISimulationService.cs b/OpenSim/Services/Interfaces/ISimulationService.cs
index a963b8e..1c82b3e 100644
--- a/OpenSim/Services/Interfaces/ISimulationService.cs
+++ b/OpenSim/Services/Interfaces/ISimulationService.cs
@@ -75,8 +75,6 @@ namespace OpenSim.Services.Interfaces
         /// <returns></returns>
         bool UpdateAgent(GridRegion destination, AgentPosition data);
 
-        bool RetrieveAgent(GridRegion destination, UUID id, out IAgentData agent);
-
         bool QueryAccess(GridRegion destination, UUID id, Vector3 position, out string version, out string reason);
 
         /// <summary>
@@ -90,20 +88,12 @@ 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>
         /// <param name="id"></param>
         /// <returns></returns>
-        bool CloseAgent(GridRegion destination, UUID id);
+        bool CloseAgent(GridRegion destination, UUID id, string auth_token);
 
         #endregion Agents
 
diff --git a/OpenSim/Services/Interfaces/IUserProfilesService.cs b/OpenSim/Services/Interfaces/IUserProfilesService.cs
new file mode 100644
index 0000000..319d307
--- /dev/null
+++ b/OpenSim/Services/Interfaces/IUserProfilesService.cs
@@ -0,0 +1,75 @@
+/*
+ * 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 OpenSim.Framework;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+
+namespace OpenSim.Services.Interfaces
+{
+    public interface IUserProfilesService
+    {
+        #region Classifieds
+        OSD AvatarClassifiedsRequest(UUID creatorId);
+        bool ClassifiedUpdate(UserClassifiedAdd ad, ref string result);
+        bool ClassifiedInfoRequest(ref UserClassifiedAdd ad, ref string result);
+        bool ClassifiedDelete(UUID recordId);
+        #endregion Classifieds
+        
+        #region Picks
+        OSD AvatarPicksRequest(UUID creatorId);
+        bool PickInfoRequest(ref UserProfilePick pick, ref string result);
+        bool PicksUpdate(ref UserProfilePick pick, ref string result);
+        bool PicksDelete(UUID pickId);
+        #endregion Picks
+        
+        #region Notes
+        bool AvatarNotesRequest(ref UserProfileNotes note);
+        bool NotesUpdate(ref UserProfileNotes note, ref string result);
+        #endregion Notes
+        
+        #region Profile Properties
+        bool AvatarPropertiesRequest(ref UserProfileProperties prop, ref string result);
+        bool AvatarPropertiesUpdate(ref UserProfileProperties prop, ref string result);
+        #endregion Profile Properties
+        
+        #region Interests
+        bool AvatarInterestsUpdate(UserProfileProperties prop, ref string result);
+        #endregion Interests
+
+        #region Utility
+        OSD AvatarImageAssetsRequest(UUID avatarId);
+        #endregion Utility
+
+        #region UserData
+        bool RequestUserAppData(ref UserAppData prop, ref string result);
+        bool SetUserAppData(UserAppData prop, ref string result);
+        #endregion UserData
+    }
+}
+
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index e2f947c..057c492 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -196,6 +196,7 @@ namespace OpenSim.Services.LLLoginService
         private BuddyList m_buddyList = null;
 
         private string currency;
+        private string classifiedFee;
 
         static LLLoginResponse()
         {
@@ -233,7 +234,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, UUID realID)
+            string DSTZone, string destinationsURL, string avatarsURL, UUID realID, string classifiedFee)
             : this()
         {
             FillOutInventoryData(invSkel, libService);
@@ -253,9 +254,13 @@ namespace OpenSim.Services.LLLoginService
             MapTileURL = mapTileURL;
             ProfileURL = profileURL;
             OpenIDURL = openIDURL;
+            DestinationsURL = destinationsURL;
+            AvatarsURL = avatarsURL;
 
             SearchURL = searchURL;
             Currency = currency;
+            ClassifiedFee = classifiedFee;
+
 
             FillOutHomeData(pinfo, home);
             LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z);
@@ -470,6 +475,7 @@ namespace OpenSim.Services.LLLoginService
             searchURL = String.Empty;
 
             currency = String.Empty;
+            ClassifiedFee = "0";
         }
 
 
@@ -543,6 +549,12 @@ namespace OpenSim.Services.LLLoginService
                 if (profileURL != String.Empty)
                     responseData["profile-server-url"] = profileURL;
 
+                if (DestinationsURL != String.Empty)
+                    responseData["destination_guide_url"] = DestinationsURL;
+
+                if (AvatarsURL != String.Empty)
+                    responseData["avatar_picker_url"] = AvatarsURL;
+
                 // We need to send an openid_token back in the response too
                 if (openIDURL != String.Empty)
                     responseData["openid_url"] = openIDURL;
@@ -557,6 +569,9 @@ namespace OpenSim.Services.LLLoginService
                     // responseData["real_currency"] = currency;
                     responseData["currency"] = currency;
                 }
+                
+                if (ClassifiedFee != String.Empty)
+                    responseData["classified_fee"] = ClassifiedFee;
 
                 responseData["login"] = "true";
 
@@ -662,6 +677,9 @@ namespace OpenSim.Services.LLLoginService
                 if (searchURL != String.Empty)
                     map["search"] = OSD.FromString(searchURL);
 
+                if (ClassifiedFee != String.Empty)
+                    map["classified_fee"] = OSD.FromString(ClassifiedFee);
+
                 if (m_buddyList != null)
                 {
                     map["buddy-list"] = ArrayListToOSDArray(m_buddyList.ToArray());
@@ -1073,6 +1091,22 @@ namespace OpenSim.Services.LLLoginService
             set { currency = value; }
         }
 
+        public string ClassifiedFee
+        {
+            get { return classifiedFee; }
+            set { classifiedFee = value; }
+        }
+
+        public string DestinationsURL
+        {
+            get; set;
+        }
+
+        public string AvatarsURL
+        {
+            get; set;
+        }
+
         #endregion
 
         public class UserInfo
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index ede2353..faf7f71 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -78,6 +78,9 @@ namespace OpenSim.Services.LLLoginService
         protected string m_OpenIDURL;
         protected string m_SearchURL;
         protected string m_Currency;
+        protected string m_ClassifiedFee;
+        protected string m_DestinationGuide;
+        protected string m_AvatarPicker;
 
         protected string m_AllowedClients;
         protected string m_DeniedClients;
@@ -117,6 +120,9 @@ namespace OpenSim.Services.LLLoginService
             m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty);
             m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty);
             m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty);
+            m_ClassifiedFee = m_LoginServerConfig.GetString("ClassifiedFee", string.Empty);
+            m_DestinationGuide = m_LoginServerConfig.GetString ("DestinationGuide", string.Empty);
+            m_AvatarPicker = m_LoginServerConfig.GetString ("AvatarPicker", string.Empty);
 
             m_AllowedClients = m_LoginServerConfig.GetString("AllowedClients", string.Empty);
             m_DeniedClients = m_LoginServerConfig.GetString("DeniedClients", string.Empty);
@@ -461,7 +467,8 @@ 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, realID);
+                        m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone,
+                        m_DestinationGuide, m_AvatarPicker, realID, m_ClassifiedFee);
 
                 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName);
 
@@ -934,7 +941,7 @@ namespace OpenSim.Services.LLLoginService
         private bool LaunchAgentIndirectly(GridRegion gatekeeper, GridRegion destination, AgentCircuitData aCircuit, IPEndPoint clientIP, out string reason)
         {
             m_log.Debug("[LLOGIN SERVICE] Launching agent at " + destination.RegionName);
-            if (m_UserAgentService.LoginAgentToGrid(aCircuit, gatekeeper, destination, clientIP, out reason))
+            if (m_UserAgentService.LoginAgentToGrid(aCircuit, gatekeeper, destination, true, out reason))
                 return true;
             return false;
         }
diff --git a/OpenSim/Services/MapImageService/MapImageService.cs b/OpenSim/Services/MapImageService/MapImageService.cs
index a85ee70..9ba5dab 100644
--- a/OpenSim/Services/MapImageService/MapImageService.cs
+++ b/OpenSim/Services/MapImageService/MapImageService.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Services.MapImageService
                     {
                         Bitmap waterTile = new Bitmap(IMAGE_WIDTH, IMAGE_WIDTH);
                         FillImage(waterTile, m_Watercolor);
-                        waterTile.Save(m_WaterTileFile);
+                        waterTile.Save(m_WaterTileFile, ImageFormat.Jpeg);
                     }
                 }
             }
diff --git a/OpenSim/Services/UserAccountService/GridUserService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs
index 43fa04b..944411f 100644
--- a/OpenSim/Services/UserAccountService/GridUserService.cs
+++ b/OpenSim/Services/UserAccountService/GridUserService.cs
@@ -46,12 +46,66 @@ namespace OpenSim.Services.UserAccountService
 
         public GridUserService(IConfigSource config) : base(config) 
         {
-            m_log.Debug("[USER GRID SERVICE]: Starting user grid service");
+            m_log.Debug("[GRID USER SERVICE]: Starting user grid service");
+
+            MainConsole.Instance.Commands.AddCommand(
+                "Users", false,
+                "show grid users online",
+                "show grid users online",
+                "Show number of grid users registered as online.", 
+                "This number may not be accurate as a region may crash or not be cleanly shutdown and leave grid users shown as online\n."
+                + "For this reason, users online for more than 5 days are not currently counted",
+                HandleShowGridUsersOnline);
+        }
+
+        protected void HandleShowGridUsersOnline(string module, string[] cmdparams)
+        {
+//            if (cmdparams.Length != 4)
+//            {
+//                MainConsole.Instance.Output("Usage: show grid users online");
+//                return;
+//            }
+
+//            int onlineCount;
+            int onlineRecentlyCount = 0;
+
+            DateTime now = DateTime.UtcNow;
+
+            foreach (GridUserData gu in m_Database.GetAll(""))
+            {
+                if (bool.Parse(gu.Data["Online"]))
+                {
+//                    onlineCount++;
+
+                    int unixLoginTime = int.Parse(gu.Data["Login"]);
+
+                    if ((now - Util.ToDateTime(unixLoginTime)).Days < 5)
+                        onlineRecentlyCount++;
+                }
+            }
+
+            MainConsole.Instance.OutputFormat("Users online: {0}", onlineRecentlyCount);
         }
 
         public virtual GridUserInfo GetGridUserInfo(string userID)
         {
-            GridUserData d = m_Database.Get(userID);
+            GridUserData d = null;
+            if (userID.Length > 36) // it's a UUI
+                d = m_Database.Get(userID);
+            else // it's a UUID
+            {
+                GridUserData[] ds = m_Database.GetAll(userID);
+                if (ds == null)
+                    return null;
+
+                if (ds.Length > 0)
+                {
+                    d = ds[0];
+                    foreach (GridUserData dd in ds)
+                        if (dd.UserID.Length > d.UserID.Length) // find the longest
+                            d = dd;
+                }
+            }
 
             if (d == null)
                 return null;
@@ -73,7 +127,7 @@ namespace OpenSim.Services.UserAccountService
             return info;
         }
 
-        public GridUserInfo[] GetGridUserInfo(string[] userIDs)
+        public virtual GridUserInfo[] GetGridUserInfo(string[] userIDs)
         {
             List<GridUserInfo> ret = new List<GridUserInfo>();
 
@@ -140,7 +194,7 @@ namespace OpenSim.Services.UserAccountService
 
         public bool SetLastPosition(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt)
         {
-            //m_log.DebugFormat("[Grid User Service]: SetLastPosition for {0}", userID);
+            m_log.DebugFormat("[GRID USER SERVICE]: SetLastPosition for {0}", userID);
             GridUserData d = m_Database.Get(userID);
             if (d == null)
             {
diff --git a/OpenSim/Services/UserProfilesService/UserProfilesService.cs b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
new file mode 100644
index 0000000..d00f34d
--- /dev/null
+++ b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
@@ -0,0 +1,187 @@
+/*
+ * 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 System.Text;
+using Nini.Config;
+using log4net;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
+using OpenSim.Services.UserAccountService;
+using OpenSim.Data;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework;
+
+namespace OpenSim.Services.ProfilesService
+{
+    public class UserProfilesService: UserProfilesServiceBase, IUserProfilesService
+    {
+        static readonly ILog m_log =
+            LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+        
+        IUserAccountService userAccounts;
+        IAuthenticationService authService;
+
+        public UserProfilesService(IConfigSource config, string configName):
+            base(config, configName)
+        {
+            IConfig Config = config.Configs[configName];
+            if (Config == null)
+            {
+                m_log.Warn("[PROFILES]: No configuration found!");
+                return;
+            }
+            Object[] args = null;
+            
+            args = new Object[] { config };
+            string accountService = Config.GetString("UserAccountService", String.Empty);
+            if (accountService != string.Empty)
+                userAccounts = ServerUtils.LoadPlugin<IUserAccountService>(accountService, args);
+            
+            args = new Object[] { config };
+            string authServiceConfig = Config.GetString("AuthenticationServiceModule", String.Empty);
+            if (accountService != string.Empty)
+                authService = ServerUtils.LoadPlugin<IAuthenticationService>(authServiceConfig, args);
+        }
+        
+        #region Classifieds
+        public OSD AvatarClassifiedsRequest(UUID creatorId)
+        {
+            OSDArray records = ProfilesData.GetClassifiedRecords(creatorId);
+            
+            return records;
+        }
+        
+        public bool ClassifiedUpdate(UserClassifiedAdd ad, ref string result)
+        {
+            if(!ProfilesData.UpdateClassifiedRecord(ad, ref result))
+            {
+                return false;
+            }
+            result = "success";
+            return true;
+        }
+        
+        public bool ClassifiedDelete(UUID recordId)
+        {
+            if(ProfilesData.DeleteClassifiedRecord(recordId))
+                return true;
+            
+            return false;
+        }
+        
+        public bool ClassifiedInfoRequest(ref UserClassifiedAdd ad, ref string result)
+        {
+            if(ProfilesData.GetClassifiedInfo(ref ad, ref result))
+                return true;
+            
+            return false;
+        }
+        #endregion Classifieds
+        
+        #region Picks
+        public OSD AvatarPicksRequest(UUID creatorId)
+        {
+            OSDArray records = ProfilesData.GetAvatarPicks(creatorId);
+            
+            return records;
+        }
+        
+        public bool PickInfoRequest(ref UserProfilePick pick, ref string result)
+        {
+            pick = ProfilesData.GetPickInfo(pick.CreatorId, pick.PickId);
+            result = "OK";
+            return true;
+        }
+        
+        public bool PicksUpdate(ref UserProfilePick pick, ref string result)
+        {
+            return ProfilesData.UpdatePicksRecord(pick);
+        }
+        
+        public bool PicksDelete(UUID pickId)
+        {
+            return ProfilesData.DeletePicksRecord(pickId);
+        }
+        #endregion Picks
+        
+        #region Notes
+        public bool AvatarNotesRequest(ref UserProfileNotes note)
+        {
+            return ProfilesData.GetAvatarNotes(ref note);
+        }
+        
+        public bool NotesUpdate(ref UserProfileNotes note, ref string result)
+        {
+            return ProfilesData.UpdateAvatarNotes(ref note, ref result);
+        }
+        #endregion Notes
+        
+        #region Profile Properties
+        public bool AvatarPropertiesRequest(ref UserProfileProperties prop, ref string result)
+        {
+            return ProfilesData.GetAvatarProperties(ref prop, ref result);
+        }
+        
+        public bool AvatarPropertiesUpdate(ref UserProfileProperties prop, ref string result)
+        {
+            return ProfilesData.UpdateAvatarProperties(ref prop, ref result);
+        }
+        #endregion Profile Properties
+        
+        #region Interests
+        public bool AvatarInterestsUpdate(UserProfileProperties prop, ref string result)
+        {
+            return ProfilesData.UpdateAvatarInterests(prop, ref result);
+        }
+        #endregion Interests
+
+        #region Utility
+        public OSD AvatarImageAssetsRequest(UUID avatarId)
+        {
+            OSDArray records = ProfilesData.GetUserImageAssets(avatarId);
+            return records;
+        }
+        #endregion Utility
+
+        #region UserData
+        public bool RequestUserAppData(ref UserAppData prop, ref string result)
+        {
+            return ProfilesData.GetUserAppData(ref prop, ref result);
+        }
+        
+        public bool SetUserAppData(UserAppData prop, ref string result)
+        {
+            return true;
+        }
+        #endregion UserData
+    }
+}
+
diff --git a/OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs b/OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs
new file mode 100644
index 0000000..927f7c9
--- /dev/null
+++ b/OpenSim/Services/UserProfilesService/UserProfilesServiceBase.cs
@@ -0,0 +1,86 @@
+/*
+ * 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 Nini.Config;
+using log4net;
+using OpenSim.Services.Base;
+using OpenSim.Data;
+
+namespace OpenSim.Services.ProfilesService
+{
+    public class UserProfilesServiceBase: ServiceBase
+    {
+        static readonly ILog m_log =
+            LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        public IProfilesData ProfilesData;
+
+        public string ConfigName
+        {
+            get; private set;
+        }
+
+        public UserProfilesServiceBase(IConfigSource config, string configName):
+            base(config)
+        {
+            if(string.IsNullOrEmpty(configName))
+            {
+                m_log.WarnFormat("[PROFILES]: Configuration section not given!");
+                return;
+            }
+
+            string dllName = String.Empty;
+            string connString = null;
+            string realm = String.Empty;
+
+            IConfig dbConfig = config.Configs["DatabaseService"];
+            if (dbConfig != null)
+            {
+                if (dllName == String.Empty)
+                    dllName = dbConfig.GetString("StorageProvider", String.Empty);
+                if (string.IsNullOrEmpty(connString))
+                    connString = dbConfig.GetString("ConnectionString", String.Empty);
+            }
+            
+            IConfig ProfilesConfig = config.Configs[configName];
+            if (ProfilesConfig != null)
+            {
+                connString = ProfilesConfig.GetString("ConnectionString", connString);
+                realm = ProfilesConfig.GetString("Realm", realm);
+            }
+            
+            ProfilesData = LoadPlugin<IProfilesData>(dllName, new Object[] { connString });
+            if (ProfilesData == null)
+                throw new Exception("Could not find a storage interface in the given module");
+
+        }
+    }
+}
+
diff --git a/OpenSim/Tests/Clients/Assets/AssetsClient.cs b/OpenSim/Tests/Clients/Assets/AssetsClient.cs
new file mode 100644
index 0000000..e988d0e
--- /dev/null
+++ b/OpenSim/Tests/Clients/Assets/AssetsClient.cs
@@ -0,0 +1,126 @@
+/*
+ * 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.Net;
+using System.Text;
+using System.Reflection;
+using System.Threading;
+
+using OpenMetaverse;
+using log4net;
+using log4net.Appender;
+using log4net.Layout;
+
+using OpenSim.Framework;
+using OpenSim.Services.Interfaces;
+using OpenSim.Services.Connectors;
+
+namespace OpenSim.Tests.Clients.AssetsClient
+{
+    public class AssetsClient
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+
+        private static int m_MaxThreadID = 0;
+        private static readonly int NREQS = 150;
+        private static int m_NReceived = 0;
+
+        public static void Main(string[] args)
+        {
+            ConsoleAppender consoleAppender = new ConsoleAppender();
+            consoleAppender.Layout =
+                new PatternLayout("[%thread] - %message%newline");
+            log4net.Config.BasicConfigurator.Configure(consoleAppender);
+
+            string serverURI = "http://127.0.0.1:8003";
+            if (args.Length > 1)
+                serverURI = args[1];
+            int max1, max2;
+            ThreadPool.GetMaxThreads(out max1, out max2);
+            m_log.InfoFormat("[ASSET CLIENT]: Connecting to {0} max threads = {1} - {2}", serverURI, max1, max2);
+            ThreadPool.GetMinThreads(out max1, out max2);
+            m_log.InfoFormat("[ASSET CLIENT]: Connecting to {0} min threads = {1} - {2}", serverURI, max1, max2);
+
+            if (!ThreadPool.SetMinThreads(1, 1))
+                m_log.WarnFormat("[ASSET CLIENT]: Failed to set min threads");
+
+            if (!ThreadPool.SetMaxThreads(10, 3))
+                m_log.WarnFormat("[ASSET CLIENT]: Failed to set max threads");
+
+            ThreadPool.GetMaxThreads(out max1, out max2);
+            m_log.InfoFormat("[ASSET CLIENT]: Post set max threads = {1} - {2}", serverURI, max1, max2);
+            ThreadPool.GetMinThreads(out max1, out max2);
+            m_log.InfoFormat("[ASSET CLIENT]: Post set min threads = {1} - {2}", serverURI, max1, max2);
+
+            ServicePointManager.DefaultConnectionLimit = 12;
+
+            AssetServicesConnector m_Connector = new AssetServicesConnector(serverURI);
+            m_Connector.MaxAssetRequestConcurrency = 30;
+
+            for (int i = 0; i < NREQS; i++)
+            {
+                UUID uuid = UUID.Random();
+                m_Connector.Get(uuid.ToString(), null, ResponseReceived);
+                m_log.InfoFormat("[ASSET CLIENT]: [{0}] requested asset {1}", i, uuid);
+            }
+
+            for (int i = 0; i < 500; i++)
+            {
+                var x = i;
+                ThreadPool.QueueUserWorkItem(delegate
+                {
+                    Dummy(x);
+                });
+            }
+
+            Thread.Sleep(30 * 1000);
+            m_log.InfoFormat("[ASSET CLIENT]: Received responses {0}", m_NReceived);
+        }
+
+        private static void ResponseReceived(string id, Object sender, AssetBase asset)
+        {
+            if (Thread.CurrentThread.ManagedThreadId > m_MaxThreadID)
+                m_MaxThreadID = Thread.CurrentThread.ManagedThreadId;
+            int max1, max2;
+            ThreadPool.GetAvailableThreads(out max1, out max2);
+            m_log.InfoFormat("[ASSET CLIENT]: Received asset {0} ({1}) ({2}-{3}) {4}", id, m_MaxThreadID, max1, max2, DateTime.Now.ToString("hh:mm:ss"));
+            m_NReceived++;
+        }
+
+        private static void Dummy(int i)
+        {
+            int max1, max2;
+            ThreadPool.GetAvailableThreads(out max1, out max2);
+            m_log.InfoFormat("[ASSET CLIENT]: ({0}) Hello! {1} - {2} {3}", i, max1, max2, DateTime.Now.ToString("hh:mm:ss"));
+            Thread.Sleep(2000);
+        }
+    }
+}
diff --git a/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs b/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs
index 6cc7ff2..ff6608d 100644
--- a/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs
@@ -31,6 +31,7 @@ using System.IO;
 using System.Net;
 using System.Reflection;
 using System.Text;
+using System.Threading;
 using log4net;
 using Nini.Config;
 using NUnit.Framework;
@@ -59,7 +60,8 @@ namespace OpenSim.Tests.Common
         /// A list that will be populated with any TestClients set up in response to 
         /// being informed about a destination region.
         /// </param>
-        public static void SetUpInformClientOfNeighbour(TestClient tc, List<TestClient> neighbourTcs)
+        public static void SetupInformClientOfNeighbourTriggersNeighbourClientCreate(
+            TestClient tc, List<TestClient> neighbourTcs)
         {
             // XXX: Confusingly, this is also used for non-neighbour notification (as in teleports that do not use the
             // event queue).
@@ -75,17 +77,52 @@ namespace OpenSim.Tests.Common
                     "[TEST CLIENT]: Processing inform client of neighbour located at {0},{1} at {2}", 
                     x, y, neighbourExternalEndPoint);
 
-                // In response to this message, we are going to make a teleport to the scene we've previous been told
-                // about by test code (this needs to be improved).
                 AgentCircuitData newAgent = tc.RequestClientInfo();
 
                 Scene neighbourScene;
                 SceneManager.Instance.TryGetScene(x, y, out neighbourScene);
 
-                TestClient neighbourTc = new TestClient(newAgent, neighbourScene, SceneManager.Instance);
+                TestClient neighbourTc = new TestClient(newAgent, neighbourScene);
                 neighbourTcs.Add(neighbourTc);
                 neighbourScene.AddNewClient(neighbourTc, PresenceType.User);
             };
         }
+
+        /// <summary>
+        /// Set up correct handling of the InformClientOfNeighbour call from the source region that triggers the
+        /// viewer to setup a connection with the destination region.
+        /// </summary>
+        /// <param name='tc'></param>
+        /// <param name='neighbourTcs'>
+        /// A list that will be populated with any TestClients set up in response to 
+        /// being informed about a destination region.
+        /// </param>
+        public static void SetupSendRegionTeleportTriggersDestinationClientCreateAndCompleteMovement(
+            TestClient client, List<TestClient> destinationClients)
+        {
+            client.OnTestClientSendRegionTeleport 
+                += (regionHandle, simAccess, regionExternalEndPoint, locationID, flags, capsURL) =>
+            {
+                uint x, y;
+                Utils.LongToUInts(regionHandle, out x, out y);
+                x /= Constants.RegionSize;
+                y /= Constants.RegionSize;
+
+                m_log.DebugFormat(
+                    "[TEST CLIENT]: Processing send region teleport for destination at {0},{1} at {2}", 
+                    x, y, regionExternalEndPoint);
+
+                AgentCircuitData newAgent = client.RequestClientInfo();
+
+                Scene destinationScene;
+                SceneManager.Instance.TryGetScene(x, y, out destinationScene);
+
+                TestClient destinationClient = new TestClient(newAgent, destinationScene);
+                destinationClients.Add(destinationClient);
+                destinationScene.AddNewClient(destinationClient, PresenceType.User);
+
+                ThreadPool.UnsafeQueueUserWorkItem(o => destinationClient.CompleteMovement(), null);
+            };
+        }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index bdd9093..d9bb85e 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -447,9 +447,6 @@ namespace OpenSim.Tests.Common
         /// Add a root agent where the details of the agent connection (apart from the id) are unimportant for the test
         /// </summary>
         /// <remarks>
-        /// This can be used for tests where there is only one region or where there are multiple non-neighbour regions
-        /// and teleport doesn't take place.
-        ///
         /// XXX: Use the version of this method that takes the UserAccount structure wherever possible - this will
         /// make the agent circuit data (e.g. first, lastname) consistent with the user account data.
         /// </remarks>
@@ -462,22 +459,6 @@ namespace OpenSim.Tests.Common
         }
 
         /// <summary>
-        /// Add a root agent where the details of the agent connection (apart from the id) are unimportant for the test
-        /// </summary>
-        /// <remarks>
-        /// XXX: Use the version of this method that takes the UserAccount structure wherever possible - this will
-        /// make the agent circuit data (e.g. first, lastname) consistent with the user account data.
-        /// </remarks>
-        /// <param name="scene"></param>
-        /// <param name="agentId"></param>
-        /// <param name="sceneManager"></param>
-        /// <returns></returns>
-        public static ScenePresence AddScenePresence(Scene scene, UUID agentId, SceneManager sceneManager)
-        {
-            return AddScenePresence(scene, GenerateAgentData(agentId), sceneManager);
-        }
-
-        /// <summary>
         /// Add a root agent.
         /// </summary>
         /// <param name="scene"></param>
@@ -508,31 +489,7 @@ namespace OpenSim.Tests.Common
         /// <returns></returns>
         public static ScenePresence AddScenePresence(Scene scene, AgentCircuitData agentData)
         {
-            return AddScenePresence(scene, agentData, null);
-        }
-
-        /// <summary>
-        /// Add a root agent.
-        /// </summary>
-        /// <remarks>
-        /// This function
-        ///
-        /// 1)  Tells the scene that an agent is coming.  Normally, the login service (local if standalone, from the
-        /// userserver if grid) would give initial login data back to the client and separately tell the scene that the
-        /// agent was coming.
-        ///
-        /// 2)  Connects the agent with the scene
-        ///
-        /// This function performs actions equivalent with notifying the scene that an agent is
-        /// coming and then actually connecting the agent to the scene.  The one step missed out is the very first
-        /// </remarks>
-        /// <param name="scene"></param>
-        /// <param name="agentData"></param>
-        /// <param name="sceneManager"></param>
-        /// <returns></returns>
-        public static ScenePresence AddScenePresence(Scene scene, AgentCircuitData agentData, SceneManager sceneManager)
-        {
-            return AddScenePresence(scene, new TestClient(agentData, scene, sceneManager), agentData, sceneManager);
+            return AddScenePresence(scene, new TestClient(agentData, scene), agentData);
         }
 
         /// <summary>
@@ -552,10 +509,9 @@ namespace OpenSim.Tests.Common
         /// </remarks>
         /// <param name="scene"></param>
         /// <param name="agentData"></param>
-        /// <param name="sceneManager"></param>
         /// <returns></returns>
         public static ScenePresence AddScenePresence(
-            Scene scene, IClientAPI client, AgentCircuitData agentData, SceneManager sceneManager)
+            Scene scene, IClientAPI client, AgentCircuitData agentData)
         {
             // We emulate the proper login sequence here by doing things in four stages
 
@@ -578,10 +534,6 @@ namespace OpenSim.Tests.Common
         /// Introduce an agent into the scene by adding a new client.
         /// </summary>
         /// <returns>The scene presence added</returns>
-        /// <param name='sceneManager'>
-        /// Scene manager.  Can be null if there is only one region in the test or multiple regions that are not
-        /// neighbours and where no teleporting takes place.
-        /// </param>
         /// <param name='scene'></param>
         /// <param name='testClient'></param>
         /// <param name='agentData'></param>
@@ -607,7 +559,7 @@ namespace OpenSim.Tests.Common
             acd.child = true;
 
             // XXX: ViaLogin may not be correct for child agents
-            TestClient client = new TestClient(acd, scene, null);
+            TestClient client = new TestClient(acd, scene);
             return IntroduceClientToScene(scene, client, acd, TeleportFlags.ViaLogin);
         }
 
diff --git a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
index a1794c9..b3b75af 100644
--- a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
@@ -218,12 +218,37 @@ namespace OpenSim.Tests.Common
         public static InventoryFolderBase CreateInventoryFolder(
             IInventoryService inventoryService, UUID userId, string path, bool useExistingFolders)
         {
+            return CreateInventoryFolder(inventoryService, userId, UUID.Random(), path, useExistingFolders);
+        }
+
+        /// <summary>
+        /// Create inventory folders starting from the user's root folder.
+        /// </summary>
+        /// <param name="inventoryService"></param>
+        /// <param name="userId"></param>
+        /// <param name="folderId"></param>
+        /// <param name="path">
+        /// The folders to create.  Multiple folders can be specified on a path delimited by the PATH_DELIMITER
+        /// </param>
+        /// <param name="useExistingFolders">
+        /// If true, then folders in the path which already the same name are
+        /// used.  This applies to the terminal folder as well.  
+        /// If false, then all folders in the path are created, even if there is already a folder at a particular
+        /// level with the same name.
+        /// </param>
+        /// <returns>
+        /// The folder created.  If the path contains multiple folders then the last one created is returned.
+        /// Will return null if the root folder could not be found.
+        /// </returns>
+        public static InventoryFolderBase CreateInventoryFolder(
+            IInventoryService inventoryService, UUID userId, UUID folderId, string path, bool useExistingFolders)
+        {
             InventoryFolderBase rootFolder = inventoryService.GetRootFolder(userId);
 
             if (null == rootFolder)
                 return null;
 
-            return CreateInventoryFolder(inventoryService, rootFolder, path, useExistingFolders);
+            return CreateInventoryFolder(inventoryService, folderId, rootFolder, path, useExistingFolders);
         }
 
         /// <summary>
@@ -235,6 +260,7 @@ namespace OpenSim.Tests.Common
         /// TODO: May need to make it an option to create duplicate folders.
         /// </remarks>
         /// <param name="inventoryService"></param>
+        /// <param name="folderId">ID of the folder to create</param>
         /// <param name="parentFolder"></param>
         /// <param name="path">
         /// The folder to create.
@@ -249,7 +275,7 @@ namespace OpenSim.Tests.Common
         /// The folder created.  If the path contains multiple folders then the last one created is returned.
         /// </returns>
         public static InventoryFolderBase CreateInventoryFolder(
-            IInventoryService inventoryService, InventoryFolderBase parentFolder, string path, bool useExistingFolders)
+            IInventoryService inventoryService, UUID folderId, InventoryFolderBase parentFolder, string path, bool useExistingFolders)
         {
             string[] components = path.Split(new string[] { PATH_DELIMITER }, 2, StringSplitOptions.None);
 
@@ -262,9 +288,16 @@ namespace OpenSim.Tests.Common
             {
 //                Console.WriteLine("Creating folder {0} at {1}", components[0], parentFolder.Name);
 
+                UUID folderIdForCreate;
+
+                if (components.Length > 1)
+                    folderIdForCreate = UUID.Random();
+                else
+                    folderIdForCreate = folderId;
+
                 folder 
                     = new InventoryFolderBase(
-                        UUID.Random(), components[0], parentFolder.Owner, (short)AssetType.Unknown, parentFolder.ID, 0);
+                        folderIdForCreate, components[0], parentFolder.Owner, (short)AssetType.Unknown, parentFolder.ID, 0);
                 
                 inventoryService.AddFolder(folder);
             }
@@ -274,7 +307,7 @@ namespace OpenSim.Tests.Common
 //            }
 
             if (components.Length > 1)
-                return CreateInventoryFolder(inventoryService, folder, components[1], useExistingFolders);
+                return CreateInventoryFolder(inventoryService, folderId, folder, components[1], useExistingFolders);
             else
                 return folder;
         }
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index dce2fd7..e8520f2 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -47,9 +47,9 @@ namespace OpenSim.Tests.Common.Mock
         EventWaitHandle wh = new EventWaitHandle (false, EventResetMode.AutoReset, "Crossing");
 
         private Scene m_scene;
-        private SceneManager m_sceneManager;
 
         // Properties so that we can get at received data for test purposes
+        public List<uint> ReceivedKills { get; private set; }
         public List<UUID> ReceivedOfflineNotifications { get; private set; }
         public List<UUID> ReceivedOnlineNotifications { get; private set; }
         public List<UUID> ReceivedFriendshipTerminations { get; private set; }
@@ -61,6 +61,12 @@ namespace OpenSim.Tests.Common.Mock
         // Test client specific events - for use by tests to implement some IClientAPI behaviour.
         public event Action<RegionInfo, Vector3, Vector3> OnReceivedMoveAgentIntoRegion;
         public event Action<ulong, IPEndPoint> OnTestClientInformClientOfNeighbour;
+        public event TestClientOnSendRegionTeleportDelegate OnTestClientSendRegionTeleport;
+        public event Action<GridInstantMessage> OnReceivedInstantMessage;
+
+        public delegate void TestClientOnSendRegionTeleportDelegate(
+            ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint,
+            uint locationID, uint flags, string capsURL);
 
 // disable warning: public events, part of the public API
 #pragma warning disable 67
@@ -106,6 +112,7 @@ namespace OpenSim.Tests.Common.Mock
         public event Action<IClientAPI, bool> OnCompleteMovementToRegion;
         public event UpdateAgent OnPreAgentUpdate;
         public event UpdateAgent OnAgentUpdate;
+        public event UpdateAgent OnAgentCameraUpdate;
         public event AgentRequestSit OnAgentRequestSit;
         public event AgentSit OnAgentSit;
         public event AvatarPickerRequest OnAvatarPickerRequest;
@@ -197,6 +204,7 @@ namespace OpenSim.Tests.Common.Mock
         public event EstateCovenantRequest OnEstateCovenantRequest;
         public event EstateChangeInfo OnEstateChangeInfo;
         public event EstateManageTelehub OnEstateManageTelehub;
+        public event CachedTextureRequest OnCachedTextureRequest;
 
         public event ObjectDuplicateOnRay OnObjectDuplicateOnRay;
 
@@ -435,33 +443,21 @@ namespace OpenSim.Tests.Common.Mock
         /// <summary>
         /// Constructor
         /// </summary>
-        /// <remarks>
-        /// Can be used for a test where there is only one region or where there are multiple regions that are not
-        /// neighbours and where no teleporting takes place.  In other situations, the constructor that takes in a
-        /// scene manager should be used.
-        /// </remarks>
-        /// <param name="agentData"></param>
-        /// <param name="scene"></param>
-        public TestClient(AgentCircuitData agentData, Scene scene) : this(agentData, scene, null) {}
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
         /// <param name="agentData"></param>
         /// <param name="scene"></param>
         /// <param name="sceneManager"></param>
-        public TestClient(AgentCircuitData agentData, Scene scene, SceneManager sceneManager)
+        public TestClient(AgentCircuitData agentData, Scene scene)
         {
             m_agentId = agentData.AgentID;
             m_firstName = agentData.firstname;
             m_lastName = agentData.lastname;
             m_circuitCode = agentData.circuitcode;
             m_scene = scene;
-            m_sceneManager = sceneManager;
             SessionId = agentData.SessionID;
             SecureSessionId = agentData.SecureSessionID;
             CapsSeedUrl = agentData.CapsPath;
 
+            ReceivedKills = new List<uint>();
             ReceivedOfflineNotifications = new List<UUID>();
             ReceivedOnlineNotifications = new List<UUID>();
             ReceivedFriendshipTerminations = new List<UUID>();
@@ -484,7 +480,20 @@ namespace OpenSim.Tests.Common.Mock
 
         public void CompleteMovement()
         {
-            OnCompleteMovementToRegion(this, true);
+            if (OnCompleteMovementToRegion != null)
+                OnCompleteMovementToRegion(this, true);
+        }
+
+        /// <summary>
+        /// Emulate sending an IM from the viewer to the simulator.
+        /// </summary>
+        /// <param name='im'></param>
+        public void HandleImprovedInstantMessage(GridInstantMessage im)
+        {
+            ImprovedInstantMessage handlerInstantMessage = OnInstantMessage;
+
+            if (handlerInstantMessage != null)
+                handlerInstantMessage(this, im);
         }
 
         public virtual void ActivateGesture(UUID assetId, UUID gestureId)
@@ -499,6 +508,11 @@ namespace OpenSim.Tests.Common.Mock
         {
         }
 
+        public void SendCachedTextureResponse(ISceneEntity avatar, int serial, List<CachedTextureResponseArg> cachedTextures)
+        {
+
+        }
+
         public virtual void Kick(string message)
         {
         }
@@ -513,11 +527,11 @@ namespace OpenSim.Tests.Common.Mock
 
         public virtual void SendAgentDataUpdate(UUID agentid, UUID activegroupid, string firstname, string lastname, ulong grouppowers, string groupname, string grouptitle)
         {
-
         }
 
-        public virtual void SendKillObject(ulong regionHandle, List<uint> localID)
+        public virtual void SendKillObject(List<uint> localID)
         {
+            ReceivedKills.AddRange(localID);
         }
 
         public virtual void SetChildAgentThrottle(byte[] throttle)
@@ -526,15 +540,13 @@ namespace OpenSim.Tests.Common.Mock
 
         public void SetAgentThrottleSilent(int throttle, int setting)
         {
-
-
         }
+
         public byte[] GetThrottlesPacked(float multiplier)
         {
             return new byte[0];
         }
 
-
         public virtual void SendAnimations(UUID[] animations, int[] seqs, UUID sourceAgentId, UUID[] objectIDs)
         {
         }
@@ -547,7 +559,8 @@ namespace OpenSim.Tests.Common.Mock
 
         public void SendInstantMessage(GridInstantMessage im)
         {
-
+            if (OnReceivedInstantMessage != null)
+                OnReceivedInstantMessage(im);
         }
 
         public void SendGenericMessage(string method, UUID invoice, List<string> message)
@@ -585,7 +598,7 @@ namespace OpenSim.Tests.Common.Mock
         {
             AgentCircuitData agentData = new AgentCircuitData();
             agentData.AgentID = AgentId;
-            agentData.SessionID = UUID.Zero;
+            agentData.SessionID = SessionId; 
             agentData.SecureSessionID = UUID.Zero;
             agentData.circuitcode = m_circuitCode;
             agentData.child = false;
@@ -608,21 +621,25 @@ namespace OpenSim.Tests.Common.Mock
                 OnTestClientInformClientOfNeighbour(neighbourHandle, neighbourExternalEndPoint);
         }
 
-        public virtual void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint,
-                                               uint locationID, uint flags, string capsURL)
+        public virtual void SendRegionTeleport(
+            ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint,
+            uint locationID, uint flags, string capsURL)
         {
-            m_log.DebugFormat("[TEST CLIENT]: Received SendRegionTeleport");
+            m_log.DebugFormat(
+                "[TEST CLIENT]: Received SendRegionTeleport for {0} {1} on {2}", m_firstName, m_lastName, m_scene.Name);
 
             CapsSeedUrl = capsURL;
 
-            // We don't do this here so that the source region can complete processing first in a single-threaded
-            // regression test scenario.  The test itself will have to call CompleteTeleportClientSide() after a teleport
-            // CompleteTeleportClientSide();
+            if (OnTestClientSendRegionTeleport != null)
+                OnTestClientSendRegionTeleport(
+                    regionHandle, simAccess, regionExternalEndPoint, locationID, flags, capsURL);
         }
 
         public virtual void SendTeleportFailed(string reason)
         {
-            m_log.DebugFormat("[TEST CLIENT]: Teleport failed with reason {0}", reason);
+            m_log.DebugFormat(
+                "[TEST CLIENT]: Teleport failed for {0} {1} on {2} with reason {3}", 
+                m_firstName, m_lastName, m_scene.Name, reason);
         }
 
         public virtual void CrossRegion(ulong newRegionHandle, Vector3 pos, Vector3 lookAt,
@@ -1260,7 +1277,7 @@ namespace OpenSim.Tests.Common.Mock
         {
         }
 
-        public void StopFlying(ISceneEntity presence)
+        public void SendAgentTerseUpdate(ISceneEntity presence)
         {
         }
 
diff --git a/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs
index ccbdf81..2be5524 100644
--- a/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs
@@ -53,6 +53,9 @@ namespace OpenSim.Tests.Common.Mock
 
         public XInventoryFolder[] GetFolders(string[] fields, string[] vals)
         {
+//            Console.WriteLine(
+//                "Requesting folders, fields {0}, vals {1}", string.Join(",", fields), string.Join(",", vals));
+
             List<XInventoryFolder> origFolders
                 = Get<XInventoryFolder>(fields, vals, m_allFolders.Values.ToList());
 
@@ -104,7 +107,30 @@ namespace OpenSim.Tests.Common.Mock
         }
 
         public bool MoveItem(string id, string newParent) { throw new NotImplementedException(); }
-        public bool MoveFolder(string id, string newParent) { throw new NotImplementedException(); }
+
+        public bool MoveFolder(string id, string newParent) 
+        { 
+            // Don't use GetFolders() here - it takes a clone!
+            XInventoryFolder folder = m_allFolders[new UUID(id)];
+
+            if (folder == null)
+                return false;
+
+            folder.parentFolderID = new UUID(newParent);
+
+//            XInventoryFolder[] newParentFolders 
+//                = GetFolders(new string[] { "folderID" }, new string[] { folder.parentFolderID.ToString() });
+
+//            Console.WriteLine(
+//                "Moved folder {0} {1}, to {2} {3}", 
+//                folder.folderName, folder.folderID, newParentFolders[0].folderName, folder.parentFolderID);
+
+            // TODO: Really need to implement folder version incrementing, though this should be common code anyway,
+            // not reimplemented in each db plugin.
+
+            return true;
+        }
+
         public XInventoryItem[] GetActiveGestures(UUID principalID) { throw new NotImplementedException(); }
         public int GetAssetPermissions(UUID principalID, UUID assetID) { throw new NotImplementedException(); }
     }
diff --git a/OpenSim/Tests/Common/OpenSimTestCase.cs b/OpenSim/Tests/Common/OpenSimTestCase.cs
index 8c40923..3c47faa 100644
--- a/OpenSim/Tests/Common/OpenSimTestCase.cs
+++ b/OpenSim/Tests/Common/OpenSimTestCase.cs
@@ -27,6 +27,7 @@
 
 using System;
 using NUnit.Framework;
+using OpenSim.Framework.Servers;
 
 namespace OpenSim.Tests.Common
 {
@@ -40,7 +41,14 @@ namespace OpenSim.Tests.Common
             // Disable logging for each test so that one where logging is enabled doesn't cause all subsequent tests
             // to have logging on if it failed with an exception.
             TestHelpers.DisableLogging();
+
+            // This is an unfortunate bit of clean up we have to do because MainServer manages things through static
+            // variables and the VM is not restarted between tests.
+            if (MainServer.Instance != null)
+            {
+                MainServer.RemoveHttpServer(MainServer.Instance.Port);
+//                MainServer.Instance = null;
+            }
         }
     }
-}
-
+}
\ No newline at end of file
diff --git a/OpenSim/Tools/Configger/ConfigurationLoader.cs b/OpenSim/Tools/Configger/ConfigurationLoader.cs
index 28bcc99..72ba185 100644
--- a/OpenSim/Tools/Configger/ConfigurationLoader.cs
+++ b/OpenSim/Tools/Configger/ConfigurationLoader.cs
@@ -239,7 +239,6 @@ namespace OpenSim.Tools.Configger
                 config.Set("physics", "OpenDynamicsEngine");
                 config.Set("meshing", "Meshmerizer");
                 config.Set("physical_prim", true);
-                config.Set("see_into_this_sim_from_neighbor", true);
                 config.Set("serverside_object_permissions", true);
                 config.Set("storage_plugin", "OpenSim.Data.SQLite.dll");
                 config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");
diff --git a/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs
index 9a9371d..9bc8512 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/AbstractBehaviour.cs
@@ -35,6 +35,11 @@ namespace pCampBot
 {
     public class AbstractBehaviour : IBehaviour
     {
+        /// <summary>
+        /// Abbreviated name of this behaviour. 
+        /// </summary>
+        public string AbbreviatedName { get; protected set; }
+
         public string Name { get; protected set; }
 
         public Bot Bot { get; protected set; }
@@ -45,5 +50,7 @@ namespace pCampBot
         {
             Bot = bot;
         }
+
+        public virtual void Close() {}
     }
 }
diff --git a/OpenSim/Tools/pCampBot/Behaviours/CrossBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/CrossBehaviour.cs
index 1e01c64..4d806fc 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/CrossBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/CrossBehaviour.cs
@@ -47,7 +47,11 @@ namespace pCampBot
 
         public const int m_regionCrossingTimeout = 1000 * 60;
 
-        public CrossBehaviour() { Name = "Cross"; }
+        public CrossBehaviour() 
+        { 
+            AbbreviatedName = "c";
+            Name = "Cross"; 
+        }
 
         public override void Action()
         {
diff --git a/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs
index 66a336a..59f6244 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/GrabbingBehaviour.cs
@@ -29,6 +29,7 @@ using OpenMetaverse;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using pCampBot.Interfaces;
 
 namespace pCampBot
@@ -41,7 +42,11 @@ namespace pCampBot
     /// </remarks>
     public class GrabbingBehaviour : AbstractBehaviour
     {
-        public GrabbingBehaviour() { Name = "Grabbing"; }
+        public GrabbingBehaviour() 
+        { 
+            AbbreviatedName = "g";
+            Name = "Grabbing"; 
+        }
 
         public override void Action()
         {
@@ -56,6 +61,8 @@ namespace pCampBot
             Bot.Client.Self.Grab(prim.LocalID);
             Bot.Client.Self.GrabUpdate(prim.ID, Vector3.Zero);
             Bot.Client.Self.DeGrab(prim.LocalID);
+
+            Thread.Sleep(1000);
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs
new file mode 100644
index 0000000..9a3075c
--- /dev/null
+++ b/OpenSim/Tools/pCampBot/Behaviours/NoneBehaviour.cs
@@ -0,0 +1,47 @@
+/*
+ * 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;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using pCampBot.Interfaces;
+
+namespace pCampBot
+{
+    /// <summary>
+    /// Do nothing
+    /// </summary>
+    public class NoneBehaviour : AbstractBehaviour
+    {
+        public NoneBehaviour() 
+        { 
+            AbbreviatedName = "n";
+            Name = "None"; 
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs
index daa7485..6fd2b7c 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour.cs
@@ -46,6 +46,7 @@ namespace pCampBot
 
         public PhysicsBehaviour()
         {
+            AbbreviatedName = "p";
             Name = "Physics";
             talkarray = readexcuses();
         }
@@ -77,6 +78,12 @@ namespace pCampBot
                 Bot.Client.Self.Chat(randomf, 0, ChatType.Normal);
         }
 
+        public override void Close()
+        {
+            if (Bot.ConnectionState == ConnectionState.Connected)
+                Bot.Client.Self.Jump(false);
+        }
+
         private string[] readexcuses()
         {
             string allexcuses = "";
diff --git a/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs b/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs
index fbb4e96..81f250d 100644
--- a/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/TeleportBehaviour.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using System.Threading;
 using log4net;
 using OpenMetaverse;
 using pCampBot.Interfaces;
@@ -42,7 +43,11 @@ namespace pCampBot
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public TeleportBehaviour() { Name = "Teleport"; }
+        public TeleportBehaviour() 
+        {
+            AbbreviatedName = "t";
+            Name = "Teleport"; 
+        }
 
         public override void Action()
         {
@@ -70,6 +75,8 @@ namespace pCampBot
                 Bot.Name, sourceRegion.Name, Bot.Client.Self.SimPosition, destRegion.Name, destPosition);
 
             Bot.Client.Self.Teleport(destRegion.RegionHandle, destPosition);
+
+            Thread.Sleep(Bot.Random.Next(3000, 10000));
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Tools/pCampBot/Bot.cs b/OpenSim/Tools/pCampBot/Bot.cs
index 9821180..d0a4ef3 100644
--- a/OpenSim/Tools/pCampBot/Bot.cs
+++ b/OpenSim/Tools/pCampBot/Bot.cs
@@ -59,22 +59,23 @@ namespace pCampBot
         public delegate void AnEvent(Bot callbot, EventType someevent); // event delegate for bot events
 
         /// <summary>
-        /// Bot manager.
+        /// Controls whether bots request textures for the object information they receive
         /// </summary>
-        public BotManager Manager { get; private set; }
+        public bool RequestObjectTextures { get; set; }
 
         /// <summary>
-        /// Bot config, passed from BotManager.
+        /// Bot manager.
         /// </summary>
-        private IConfig startupConfig;
+        public BotManager Manager { get; private set; }
 
         /// <summary>
         /// Behaviours implemented by this bot.
         /// </summary>
         /// <remarks>
-        /// Lock this list before manipulating it.
+        /// Indexed by abbreviated name.  There can only be one instance of a particular behaviour.
+        /// Lock this structure before manipulating it.
         /// </remarks>
-        public List<IBehaviour> Behaviours { get; private set; }
+        public Dictionary<string, IBehaviour> Behaviours { get; private set; }
 
         /// <summary>
         /// Objects that the bot has discovered.
@@ -97,11 +98,35 @@ namespace pCampBot
         /// </summary>
         public ConnectionState ConnectionState { get; private set; }
 
+        public List<Simulator> Simulators
+        {
+            get
+            {
+                lock (Client.Network.Simulators)
+                    return new List<Simulator>(Client.Network.Simulators);
+            }
+        }
+
+        /// <summary>
+        /// The number of connections that this bot has to different simulators.
+        /// </summary>
+        /// <value>Includes both root and child connections.</value>
+        public int SimulatorsCount
+        {
+            get
+            {
+                lock (Client.Network.Simulators)
+                    return Client.Network.Simulators.Count;
+            }
+        }
+
         public string FirstName { get; private set; }
         public string LastName { get; private set; }
         public string Name { get; private set; }
         public string Password { get; private set; }
         public string LoginUri { get; private set; }
+        public string StartLocation { get; private set; }
+
         public string saveDir;
         public string wear;
 
@@ -137,94 +162,177 @@ namespace pCampBot
         /// <param name="behaviours"></param>
         public Bot(
             BotManager bm, List<IBehaviour> behaviours,
-            string firstName, string lastName, string password, string loginUri)
+            string firstName, string lastName, string password, string startLocation, string loginUri)
         {
             ConnectionState = ConnectionState.Disconnected;
 
-            behaviours.ForEach(b => b.Initialize(this));
-            
-            Client = new GridClient();
-
             Random = new Random(Environment.TickCount);// We do stuff randomly here
             FirstName = firstName;
             LastName = lastName;
             Name = string.Format("{0} {1}", FirstName, LastName);
             Password = password;
             LoginUri = loginUri;
+            StartLocation = startLocation;
 
             Manager = bm;
-            startupConfig = bm.Config;
-            readconfig();
 
-            Behaviours = behaviours;
+            Behaviours = new Dictionary<string, IBehaviour>();
+            foreach (IBehaviour behaviour in behaviours)
+                AddBehaviour(behaviour);
+
+            // Only calling for use as a template.
+            CreateLibOmvClient();
+        }
+
+        public bool TryGetBehaviour(string abbreviatedName, out IBehaviour behaviour)
+        {
+            lock (Behaviours)
+                return Behaviours.TryGetValue(abbreviatedName, out behaviour);
+        }
+
+        public bool AddBehaviour(IBehaviour behaviour)
+        {
+            lock (Behaviours)
+            {
+                if (!Behaviours.ContainsKey(behaviour.AbbreviatedName))
+                {                    
+                    behaviour.Initialize(this);
+                    Behaviours.Add(behaviour.AbbreviatedName, behaviour);
+
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        public bool RemoveBehaviour(string abbreviatedName)
+        {
+            lock (Behaviours)
+            {
+                IBehaviour behaviour;
+
+                if (!Behaviours.TryGetValue(abbreviatedName, out behaviour))
+                    return false;
+
+                behaviour.Close();
+                Behaviours.Remove(abbreviatedName);
+
+                return true;
+            }
+        }
+
+        private void CreateLibOmvClient()
+        {
+            GridClient newClient = new GridClient();
+
+            if (Client != null)
+            {
+                newClient.Settings.LOGIN_SERVER = Client.Settings.LOGIN_SERVER;
+                newClient.Settings.ALWAYS_DECODE_OBJECTS = Client.Settings.ALWAYS_DECODE_OBJECTS;
+                newClient.Settings.AVATAR_TRACKING = Client.Settings.AVATAR_TRACKING;
+                newClient.Settings.OBJECT_TRACKING = Client.Settings.OBJECT_TRACKING;
+                newClient.Settings.SEND_AGENT_THROTTLE = Client.Settings.SEND_AGENT_THROTTLE;
+                newClient.Settings.SEND_AGENT_UPDATES = Client.Settings.SEND_AGENT_UPDATES;
+                newClient.Settings.SEND_PINGS = Client.Settings.SEND_PINGS;
+                newClient.Settings.STORE_LAND_PATCHES = Client.Settings.STORE_LAND_PATCHES;
+                newClient.Settings.USE_ASSET_CACHE = Client.Settings.USE_ASSET_CACHE;
+                newClient.Settings.MULTIPLE_SIMS = Client.Settings.MULTIPLE_SIMS;
+                newClient.Throttle.Asset = Client.Throttle.Asset;
+                newClient.Throttle.Land = Client.Throttle.Land;
+                newClient.Throttle.Task = Client.Throttle.Task;
+                newClient.Throttle.Texture = Client.Throttle.Texture;
+                newClient.Throttle.Wind = Client.Throttle.Wind;
+                newClient.Throttle.Total = Client.Throttle.Total;
+            }
+            else
+            {
+                newClient.Settings.LOGIN_SERVER = LoginUri;
+                newClient.Settings.ALWAYS_DECODE_OBJECTS = false;
+                newClient.Settings.AVATAR_TRACKING = false;
+                newClient.Settings.OBJECT_TRACKING = false;
+                newClient.Settings.SEND_AGENT_THROTTLE = true;
+                newClient.Settings.SEND_PINGS = true;
+                newClient.Settings.STORE_LAND_PATCHES = false;
+                newClient.Settings.USE_ASSET_CACHE = false;
+                newClient.Settings.MULTIPLE_SIMS = true;
+                newClient.Throttle.Asset = 100000;
+                newClient.Throttle.Land = 100000;
+                newClient.Throttle.Task = 100000;
+                newClient.Throttle.Texture = 100000;
+                newClient.Throttle.Wind = 100000;
+                newClient.Throttle.Total = 400000;
+            }
+
+            newClient.Network.LoginProgress += this.Network_LoginProgress;
+            newClient.Network.SimConnected += this.Network_SimConnected;
+            newClient.Network.Disconnected += this.Network_OnDisconnected;
+            newClient.Objects.ObjectUpdate += Objects_NewPrim;
+
+            Client = newClient;
         }
 
         //We do our actions here.  This is where one would
         //add additional steps and/or things the bot should do
         private void Action()
         {
-            while (true)
+            while (ConnectionState != ConnectionState.Disconnecting)
+            {
                 lock (Behaviours)
-                    Behaviours.ForEach(
-                        b =>
-                        {
-                            Thread.Sleep(Random.Next(3000, 10000));
-                        
-                            // m_log.DebugFormat("[pCAMPBOT]: For {0} performing action {1}", Name, b.GetType());
-                            b.Action();
-                        }
-                    );
-        }
+                {
+                    foreach (IBehaviour behaviour in Behaviours.Values)
+                    {
+//                        Thread.Sleep(Random.Next(3000, 10000));
+                    
+                        // m_log.DebugFormat("[pCAMPBOT]: For {0} performing action {1}", Name, b.GetType());
+                        behaviour.Action();
+                    }
+                }
 
-        /// <summary>
-        /// Read the Nini config and initialize
-        /// </summary>
-        public void readconfig()
-        {
-            wear = startupConfig.GetString("wear", "no");
+                // XXX: This is a really shitty way of yielding so that behaviours can be added/removed
+                Thread.Sleep(100);
+            }
+
+            lock (Behaviours)
+                foreach (IBehaviour b in Behaviours.Values)
+                    b.Close();
         }
 
         /// <summary>
         /// Tells LibSecondLife to logout and disconnect.  Raises the disconnect events once it finishes.
         /// </summary>
-        public void shutdown()
+        public void Disconnect()
         {
             ConnectionState = ConnectionState.Disconnecting;
 
-            if (m_actionThread != null)
-                m_actionThread.Abort();
+//            if (m_actionThread != null)
+//                m_actionThread.Abort();
 
             Client.Network.Logout();
         }
 
+        public void Connect()
+        {            
+            Thread connectThread = new Thread(ConnectInternal);
+            connectThread.Name = Name;
+            connectThread.IsBackground = true;
+
+            connectThread.Start();
+        }
+
         /// <summary>
         /// This is the bot startup loop.
         /// </summary>
-        public void startup()
+        private void ConnectInternal()
         {
-            Client.Settings.LOGIN_SERVER = LoginUri;
-            Client.Settings.ALWAYS_DECODE_OBJECTS = false;
-            Client.Settings.AVATAR_TRACKING = false;
-            Client.Settings.OBJECT_TRACKING = false;
-            Client.Settings.SEND_AGENT_THROTTLE = true;
-            Client.Settings.SEND_PINGS = true;
-            Client.Settings.STORE_LAND_PATCHES = false;
-            Client.Settings.USE_ASSET_CACHE = false;
-            Client.Settings.MULTIPLE_SIMS = true;
-            Client.Throttle.Asset = 100000;
-            Client.Throttle.Land = 100000;
-            Client.Throttle.Task = 100000;
-            Client.Throttle.Texture = 100000;
-            Client.Throttle.Wind = 100000;
-            Client.Throttle.Total = 400000;
-            Client.Network.LoginProgress += this.Network_LoginProgress;
-            Client.Network.SimConnected += this.Network_SimConnected;
-            Client.Network.Disconnected += this.Network_OnDisconnected;
-            Client.Objects.ObjectUpdate += Objects_NewPrim;
-
             ConnectionState = ConnectionState.Connecting;
 
-            if (Client.Network.Login(FirstName, LastName, Password, "pCampBot", "Your name"))
+            // Current create a new client on each connect.  libomv doesn't seem to process new sim
+            // information (e.g. EstablishAgentCommunication events) if connecting after a disceonnect with the same
+            // client
+            CreateLibOmvClient();
+
+            if (Client.Network.Login(FirstName, LastName, Password, "pCampBot", StartLocation, "Your name"))
             {
                 ConnectionState = ConnectionState.Connected;
 
@@ -268,6 +376,30 @@ namespace pCampBot
             }
         }
 
+        /// <summary>
+        /// Sit this bot on the ground.
+        /// </summary>
+        public void SitOnGround()
+        {
+            if (ConnectionState == ConnectionState.Connected)
+                Client.Self.SitOnGround();
+        }
+
+        /// <summary>
+        /// Stand this bot
+        /// </summary>
+        public void Stand()
+        {
+            if (ConnectionState == ConnectionState.Connected)
+            {
+                // Unlike sit on ground, here libomv checks whether we have SEND_AGENT_UPDATES enabled.
+                bool prevUpdatesSetting = Client.Settings.SEND_AGENT_UPDATES;
+                Client.Settings.SEND_AGENT_UPDATES = true;
+                Client.Self.Stand();
+                Client.Settings.SEND_AGENT_UPDATES = prevUpdatesSetting;
+            }
+        }
+
         public void SaveDefaultAppearance()
         {
             saveDir = "MyAppearance/" + FirstName + "_" + LastName;
@@ -468,6 +600,8 @@ namespace pCampBot
 //                    || args.Reason == NetworkManager.DisconnectType.NetworkTimeout)
 //               && OnDisconnected != null)
 
+
+
            if (
                (args.Reason == NetworkManager.DisconnectType.ClientInitiated
                     || args.Reason == NetworkManager.DisconnectType.ServerInitiated
@@ -481,8 +615,8 @@ namespace pCampBot
 
         public void Objects_NewPrim(object sender, PrimEventArgs args)
         {
-//            if (Name.EndsWith("4"))
-//                throw new Exception("Aaargh");
+            if (!RequestObjectTextures)
+                return;
 
             Primitive prim = args.Prim;
 
diff --git a/OpenSim/Tools/pCampBot/BotManager.cs b/OpenSim/Tools/pCampBot/BotManager.cs
index d615b3f..3c1b11e 100644
--- a/OpenSim/Tools/pCampBot/BotManager.cs
+++ b/OpenSim/Tools/pCampBot/BotManager.cs
@@ -52,6 +52,16 @@ namespace pCampBot
         public const int DefaultLoginDelay = 5000;
 
         /// <summary>
+        /// Is pCampbot in the process of connecting bots?
+        /// </summary>
+        public bool ConnectingBots { get; private set; }
+
+        /// <summary>
+        /// Is pCampbot in the process of disconnecting bots?
+        /// </summary>
+        public bool DisconnectingBots { get; private set; }
+
+        /// <summary>
         /// Delay between logins of multiple bots.
         /// </summary>
         /// <remarks>TODO: This value needs to be configurable by a command line argument.</remarks>
@@ -63,19 +73,24 @@ namespace pCampBot
         protected CommandConsole m_console;
 
         /// <summary>
-        /// Created bots, whether active or inactive.
+        /// Controls whether bots start out sending agent updates on connection.
         /// </summary>
-        protected List<Bot> m_lBot;
+        public bool InitBotSendAgentUpdates { get; set; }
 
         /// <summary>
-        /// Random number generator.
+        /// Controls whether bots request textures for the object information they receive
         /// </summary>
-        public Random Rng { get; private set; }
+        public bool InitBotRequestObjectTextures { get; set; }
 
         /// <summary>
-        /// Overall configuration.
+        /// Created bots, whether active or inactive.
         /// </summary>
-        public IConfig Config { get; private set; }
+        protected List<Bot> m_bots;
+
+        /// <summary>
+        /// Random number generator.
+        /// </summary>
+        public Random Rng { get; private set; }
 
         /// <summary>
         /// Track the assets we have and have not received so we don't endlessly repeat requests.
@@ -88,10 +103,53 @@ namespace pCampBot
         public Dictionary<ulong, GridRegion> RegionsKnown { get; private set; }
 
         /// <summary>
+        /// First name for bots
+        /// </summary>
+        private string m_firstName;
+
+        /// <summary>
+        /// Last name stem for bots
+        /// </summary>
+        private string m_lastNameStem;
+
+        /// <summary>
+        /// Password for bots
+        /// </summary>
+        private string m_password;
+
+        /// <summary>
+        /// Login URI for bots.
+        /// </summary>
+        private string m_loginUri;
+
+        /// <summary>
+        /// Start location for bots.
+        /// </summary>
+        private string m_startUri;
+
+        /// <summary>
+        /// Postfix bot number at which bot sequence starts.
+        /// </summary>
+        private int m_fromBotNumber;
+
+        /// <summary>
+        /// Wear setting for bots.
+        /// </summary>
+        private string m_wearSetting;
+
+        /// <summary>
+        /// Behaviour switches for bots.
+        /// </summary>
+        private HashSet<string> m_defaultBehaviourSwitches = new HashSet<string>();
+
+        /// <summary>
         /// Constructor Creates MainConsole.Instance to take commands and provide the place to write data
         /// </summary>
         public BotManager()
         {
+            InitBotSendAgentUpdates = true;
+            InitBotRequestObjectTextures = true;
+
             LoginDelay = DefaultLoginDelay;
 
             Rng = new Random(Environment.TickCount);
@@ -117,30 +175,61 @@ namespace pCampBot
                 }
             }
 
-            m_console.Commands.AddCommand("bot", false, "shutdown",
-                    "shutdown",
-                    "Shutdown bots and exit", HandleShutdown);
-
-            m_console.Commands.AddCommand("bot", false, "quit",
-                    "quit",
-                    "Shutdown bots and exit",
-                    HandleShutdown);
-
-            m_console.Commands.AddCommand("bot", false, "show regions",
-                    "show regions",
-                    "Show regions known to bots",
-                    HandleShowRegions);
-
-            m_console.Commands.AddCommand("bot", false, "show bots",
-                    "show bots",
-                    "Shows the status of all bots",
-                    HandleShowStatus);
-
-//            m_console.Commands.AddCommand("bot", false, "add bots",
-//                    "add bots <number>",
-//                    "Add more bots", HandleAddBots);
-
-            m_lBot = new List<Bot>();
+            m_console.Commands.AddCommand(
+                "bot", false, "shutdown", "shutdown", "Shutdown bots and exit", HandleShutdown);
+
+            m_console.Commands.AddCommand(
+                "bot", false, "quit", "quit", "Shutdown bots and exit", HandleShutdown);
+
+            m_console.Commands.AddCommand(
+                "bot", false, "connect", "connect [<n>]", "Connect bots",
+                "If an <n> is given, then the first <n> disconnected bots by postfix number are connected.\n"
+                    + "If no <n> is given, then all currently disconnected bots are connected.",
+                HandleConnect);
+
+            m_console.Commands.AddCommand(
+                "bot", false, "disconnect", "disconnect [<n>]", "Disconnect bots",
+                "Disconnecting bots will interupt any bot connection process, including connection on startup.\n"
+                    + "If an <n> is given, then the last <n> connected bots by postfix number are disconnected.\n"
+                    + "If no <n> is given, then all currently connected bots are disconnected.",
+                HandleDisconnect);
+
+            m_console.Commands.AddCommand(
+                "bot", false, "add behaviour", "add behaviour <abbreviated-name> [<bot-number>]", 
+                "Add a behaviour to a bot",
+                "If no bot number is specified then behaviour is added to all bots.\n"
+                    + "Can be performed on connected or disconnected bots.",
+                HandleAddBehaviour);
+
+            m_console.Commands.AddCommand(
+                "bot", false, "remove behaviour", "remove behaviour <abbreviated-name> [<bot-number>]", 
+                "Remove a behaviour from a bot",
+                "If no bot number is specified then behaviour is added to all bots.\n"
+                    + "Can be performed on connected or disconnected bots.",
+                HandleRemoveBehaviour);
+
+            m_console.Commands.AddCommand(
+                "bot", false, "sit", "sit", "Sit all bots on the ground.",
+                HandleSit);
+
+            m_console.Commands.AddCommand(
+                "bot", false, "stand", "stand", "Stand all bots.",
+                HandleStand);
+
+            m_console.Commands.AddCommand(
+                "bot", false, "set bots", "set bots <key> <value>", "Set a setting for all bots.", HandleSetBots);
+
+            m_console.Commands.AddCommand(
+                "bot", false, "show regions", "show regions", "Show regions known to bots", HandleShowRegions);
+
+            m_console.Commands.AddCommand(
+                "bot", false, "show bots", "show bots", "Shows the status of all bots", HandleShowBotsStatus);
+
+            m_console.Commands.AddCommand(
+                "bot", false, "show bot", "show bot <bot-number>", 
+                "Shows the detailed status and settings of a particular bot.", HandleShowBotStatus);
+
+            m_bots = new List<Bot>();
         }
 
         /// <summary>
@@ -148,74 +237,167 @@ namespace pCampBot
         /// </summary>
         /// <param name="botcount">How many bots to start up</param>
         /// <param name="cs">The configuration for the bots to use</param>
-        public void dobotStartup(int botcount, IConfig cs)
+        public void CreateBots(int botcount, IConfig startupConfig)
         {
-            Config = cs;
+            m_firstName = startupConfig.GetString("firstname");
+            m_lastNameStem = startupConfig.GetString("lastname");
+            m_password = startupConfig.GetString("password");
+            m_loginUri = startupConfig.GetString("loginuri");
+            m_fromBotNumber = startupConfig.GetInt("from", 0);
+            m_wearSetting = startupConfig.GetString("wear", "no");
 
-            string firstName = cs.GetString("firstname");
-            string lastNameStem = cs.GetString("lastname");
-            string password = cs.GetString("password");
-            string loginUri = cs.GetString("loginuri");
+            m_startUri = ParseInputStartLocationToUri(startupConfig.GetString("start", "last"));
 
-            HashSet<string> behaviourSwitches = new HashSet<string>();
             Array.ForEach<string>(
-                cs.GetString("behaviours", "p").Split(new char[] { ',' }), b => behaviourSwitches.Add(b));
+                startupConfig.GetString("behaviours", "p").Split(new char[] { ',' }), b => m_defaultBehaviourSwitches.Add(b));
+
+            for (int i = 0; i < botcount; i++)
+            {
+                lock (m_bots)
+                {
+                    string lastName = string.Format("{0}_{1}", m_lastNameStem, i + m_fromBotNumber);
+
+                    CreateBot(
+                        this,
+                        CreateBehavioursFromAbbreviatedNames(m_defaultBehaviourSwitches),
+                        m_firstName, lastName, m_password, m_loginUri, m_startUri, m_wearSetting);
+                }
+            }
+        }
+
+        private List<IBehaviour> CreateBehavioursFromAbbreviatedNames(HashSet<string> abbreviatedNames)
+        {
+            // We must give each bot its own list of instantiated behaviours since they store state.
+            List<IBehaviour> behaviours = new List<IBehaviour>();
+
+            // Hard-coded for now    
+            foreach (string abName in abbreviatedNames)
+            {
+                IBehaviour newBehaviour = null;
+
+                if (abName == "c")
+                    newBehaviour = new CrossBehaviour();
+
+                if (abName == "g")
+                    newBehaviour = new GrabbingBehaviour();
+
+                if (abName == "n")
+                    newBehaviour = new NoneBehaviour();
+
+                if (abName == "p")
+                    newBehaviour = new PhysicsBehaviour();
+
+                if (abName == "t")
+                    newBehaviour = new TeleportBehaviour();
+
+                if (newBehaviour != null)
+                {
+                    behaviours.Add(newBehaviour);
+                }
+                else
+                {
+                    MainConsole.Instance.OutputFormat("No behaviour with abbreviated name {0} found", abName);
+                }
+            }
+
+            return behaviours;
+        }
 
+        public void ConnectBots(int botcount)
+        {
+            ConnectingBots = true;
+
+            Thread connectBotThread = new Thread(o => ConnectBotsInternal(botcount));
+
+            connectBotThread.Name = "Bots connection thread";
+            connectBotThread.Start();
+        }
+
+        private void ConnectBotsInternal(int botCount)
+        {
             MainConsole.Instance.OutputFormat(
-                "[BOT MANAGER]: Starting {0} bots connecting to {1}, named {2} {3}_<n>",
-                botcount,
-                loginUri,
-                firstName,
-                lastNameStem);
+                "[BOT MANAGER]: Starting {0} bots connecting to {1}, location {2}, named {3} {4}_<n>",
+                botCount,
+                m_loginUri,
+                m_startUri,
+                m_firstName,
+                m_lastNameStem);
 
             MainConsole.Instance.OutputFormat("[BOT MANAGER]: Delay between logins is {0}ms", LoginDelay);
+            MainConsole.Instance.OutputFormat("[BOT MANAGER]: BotsSendAgentUpdates is {0}", InitBotSendAgentUpdates);
+            MainConsole.Instance.OutputFormat("[BOT MANAGER]: InitBotRequestObjectTextures is {0}", InitBotRequestObjectTextures);
 
-            for (int i = 0; i < botcount; i++)
+            int connectedBots = 0;
+
+            for (int i = 0; i < m_bots.Count; i++)
             {
-                string lastName = string.Format("{0}_{1}", lastNameStem, i);
-
-                // We must give each bot its own list of instantiated behaviours since they store state.
-                List<IBehaviour> behaviours = new List<IBehaviour>();
-    
-                // Hard-coded for now
-                if (behaviourSwitches.Contains("p"))
-                    behaviours.Add(new PhysicsBehaviour());
-    
-                if (behaviourSwitches.Contains("g"))
-                    behaviours.Add(new GrabbingBehaviour());
-    
-                if (behaviourSwitches.Contains("t"))
-                    behaviours.Add(new TeleportBehaviour());
-    
-                if (behaviourSwitches.Contains("c"))
-                    behaviours.Add(new CrossBehaviour());
-
-                StartBot(this, behaviours, firstName, lastName, password, loginUri);
+                lock (m_bots)
+                {
+                    if (DisconnectingBots)
+                    {
+                        MainConsole.Instance.Output(
+                            "[BOT MANAGER]: Aborting bot connection due to user-initiated disconnection");
+                        break;
+                    }
+
+                    if (m_bots[i].ConnectionState == ConnectionState.Disconnected)
+                    {
+                        m_bots[i].Connect();
+                        connectedBots++;
+
+                        if (connectedBots >= botCount)
+                            break;
+
+                        // Stagger logins
+                        Thread.Sleep(LoginDelay);
+                    }
+                }
             }
+
+            ConnectingBots = false;
         }
 
-//        /// <summary>
-//        /// Add additional bots (and threads) to our bot pool
-//        /// </summary>
-//        /// <param name="botcount">How Many of them to add</param>
-//        public void addbots(int botcount)
-//        {
-//            int len = m_td.Length;
-//            Thread[] m_td2 = new Thread[len + botcount];
-//            for (int i = 0; i < len; i++)
-//            {
-//                m_td2[i] = m_td[i];
-//            }
-//            m_td = m_td2;
-//            int newlen = len + botcount;
-//            for (int i = len; i < newlen; i++)
-//            {
-//                startupBot(Config);
-//            }
-//        }
+        /// <summary>
+        /// Parses the command line start location to a start string/uri that the login mechanism will recognize.
+        /// </summary>
+        /// <returns>
+        /// The input start location to URI.
+        /// </returns>
+        /// <param name='startLocation'>
+        /// Start location.
+        /// </param>
+        private string ParseInputStartLocationToUri(string startLocation)
+        {
+            if (startLocation == "home" || startLocation == "last")
+                return startLocation;
+
+            string regionName;
+
+            // Just a region name or only one (!) extra component.  Like a viewer, we will stick 128/128/0 on the end
+            Vector3 startPos = new Vector3(128, 128, 0);
+
+            string[] startLocationComponents = startLocation.Split('/');
+
+            regionName = startLocationComponents[0];
+
+            if (startLocationComponents.Length >= 2)
+            {
+                float.TryParse(startLocationComponents[1], out startPos.X);
+
+                if (startLocationComponents.Length >= 3)
+                {
+                    float.TryParse(startLocationComponents[2], out startPos.Y);
+
+                    if (startLocationComponents.Length >= 4)
+                        float.TryParse(startLocationComponents[3], out startPos.Z);
+                }
+            }
+
+            return string.Format("uri:{0}&{1}&{2}&{3}", regionName, startPos.X, startPos.Y, startPos.Z);
+        }
 
         /// <summary>
-        /// This starts up the bot and stores the thread for the bot in the thread array
+        /// This creates a bot but does not start it.
         /// </summary>
         /// <param name="bm"></param>
         /// <param name="behaviours">Behaviours for this bot to perform.</param>
@@ -223,30 +405,25 @@ namespace pCampBot
         /// <param name="lastName">Last name</param>
         /// <param name="password">Password</param>
         /// <param name="loginUri">Login URI</param>
-        public void StartBot(
+        /// <param name="startLocation">Location to start the bot.  Can be "last", "home" or a specific sim name.</param>
+        /// <param name="wearSetting"></param>
+        public void CreateBot(
              BotManager bm, List<IBehaviour> behaviours,
-             string firstName, string lastName, string password, string loginUri)
+             string firstName, string lastName, string password, string loginUri, string startLocation, string wearSetting)
         {
             MainConsole.Instance.OutputFormat(
-                "[BOT MANAGER]: Starting bot {0} {1}, behaviours are {2}",
+                "[BOT MANAGER]: Creating bot {0} {1}, behaviours are {2}",
                 firstName, lastName, string.Join(",", behaviours.ConvertAll<string>(b => b.Name).ToArray()));
 
-            Bot pb = new Bot(bm, behaviours, firstName, lastName, password, loginUri);
+            Bot pb = new Bot(bm, behaviours, firstName, lastName, password, startLocation, loginUri);
+            pb.wear = wearSetting;
+            pb.Client.Settings.SEND_AGENT_UPDATES = InitBotSendAgentUpdates;
+            pb.RequestObjectTextures = InitBotRequestObjectTextures;
 
             pb.OnConnected += handlebotEvent;
             pb.OnDisconnected += handlebotEvent;
 
-            lock (m_lBot)
-                m_lBot.Add(pb);
-
-            Thread pbThread = new Thread(pb.startup);
-            pbThread.Name = pb.Name;
-            pbThread.IsBackground = true;
-
-            pbThread.Start();
-
-            // Stagger logins
-            Thread.Sleep(LoginDelay);
+            m_bots.Add(pb);
         }
 
         /// <summary>
@@ -259,52 +436,270 @@ namespace pCampBot
             switch (eventt)
             {
                 case EventType.CONNECTED:
+                {
                     m_log.Info("[" + callbot.FirstName + " " + callbot.LastName + "]: Connected");
                     break;
+                }
+
                 case EventType.DISCONNECTED:
+                {
                     m_log.Info("[" + callbot.FirstName + " " + callbot.LastName + "]: Disconnected");
+                    break;
+                }
+            }
+        }
 
-                    lock (m_lBot)
-                    {
-                        if (m_lBot.TrueForAll(b => b.ConnectionState == ConnectionState.Disconnected))
-                            Environment.Exit(0);
+        /// <summary>
+        /// Standard CreateConsole routine
+        /// </summary>
+        /// <returns></returns>
+        protected CommandConsole CreateConsole()
+        {
+            return new LocalConsole("pCampbot");
+        }
 
-                        break;
+        private void HandleConnect(string module, string[] cmd)
+        {
+            if (ConnectingBots)
+            {
+                MainConsole.Instance.Output("Still connecting bots.  Please wait for previous process to complete.");
+                return;
+            }
+
+            lock (m_bots)
+            {
+                int botsToConnect;
+                int disconnectedBots = m_bots.Count(b => b.ConnectionState == ConnectionState.Disconnected);
+
+                if (cmd.Length == 1)
+                {
+                    botsToConnect = disconnectedBots;
+                }
+                else
+                {
+                    if (!ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, cmd[1], out botsToConnect))
+                        return;
+
+                    botsToConnect = Math.Min(botsToConnect, disconnectedBots);
+                }
+
+                MainConsole.Instance.OutputFormat("Connecting {0} bots", botsToConnect);
+
+                ConnectBots(botsToConnect);
+            }
+        }
+
+        private void HandleAddBehaviour(string module, string[] cmd)
+        {
+            if (cmd.Length < 3 || cmd.Length > 4)
+            {
+                MainConsole.Instance.OutputFormat("Usage: add behaviour <abbreviated-behaviour> [<bot-number>]");
+                return;
+            }
+
+            string rawBehaviours = cmd[2];
+
+            List<Bot> botsToEffect = new List<Bot>();
+
+            if (cmd.Length == 3)
+            {
+                lock (m_bots)
+                    botsToEffect.AddRange(m_bots);
+            }
+            else
+            {
+                int botNumber;
+                if (!ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, cmd[3], out botNumber))
+                    return;
+
+                Bot bot = GetBotFromNumber(botNumber);
+
+                if (bot == null)
+                {
+                    MainConsole.Instance.OutputFormat("Error: No bot found with number {0}", botNumber);
+                    return;
+                }
+
+                botsToEffect.Add(bot);
+            }
+
+
+            HashSet<string> rawAbbreviatedSwitchesToAdd = new HashSet<string>();
+            Array.ForEach<string>(rawBehaviours.Split(new char[] { ',' }), b => rawAbbreviatedSwitchesToAdd.Add(b));
+
+            foreach (Bot bot in botsToEffect)
+            {
+                List<IBehaviour> behavioursAdded = new List<IBehaviour>();
+
+                foreach (IBehaviour behaviour in CreateBehavioursFromAbbreviatedNames(rawAbbreviatedSwitchesToAdd))
+                {
+                    if (bot.AddBehaviour(behaviour))
+                        behavioursAdded.Add(behaviour);
+                }
+
+                MainConsole.Instance.OutputFormat(
+                    "Added behaviours {0} to bot {1}", 
+                    string.Join(", ", behavioursAdded.ConvertAll<string>(b => b.Name).ToArray()), bot.Name);
+            }
+        }
+
+        private void HandleRemoveBehaviour(string module, string[] cmd)
+        {
+            if (cmd.Length < 3 || cmd.Length > 4)
+            {
+                MainConsole.Instance.OutputFormat("Usage: remove behaviour <abbreviated-behaviour> [<bot-number>]");
+                return;
+            }
+
+            string rawBehaviours = cmd[2];
+
+            List<Bot> botsToEffect = new List<Bot>();
+
+            if (cmd.Length == 3)
+            {
+                lock (m_bots)
+                    botsToEffect.AddRange(m_bots);
+            }
+            else
+            {
+                int botNumber;
+                if (!ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, cmd[3], out botNumber))
+                    return;
+
+                Bot bot = GetBotFromNumber(botNumber);
+
+                if (bot == null)
+                {
+                    MainConsole.Instance.OutputFormat("Error: No bot found with number {0}", botNumber);
+                    return;
+                }
+
+                botsToEffect.Add(bot);
+            }
+
+            HashSet<string> abbreviatedBehavioursToRemove = new HashSet<string>();
+            Array.ForEach<string>(rawBehaviours.Split(new char[] { ',' }), b => abbreviatedBehavioursToRemove.Add(b));
+
+            foreach (Bot bot in botsToEffect)
+            {
+                List<IBehaviour> behavioursRemoved = new List<IBehaviour>();
+
+                foreach (string b in abbreviatedBehavioursToRemove)
+                {
+                    IBehaviour behaviour;
+
+                    if (bot.TryGetBehaviour(b, out behaviour))
+                    {
+                        bot.RemoveBehaviour(b);
+                        behavioursRemoved.Add(behaviour);
                     }
+                }
+
+                MainConsole.Instance.OutputFormat(
+                    "Removed behaviours {0} to bot {1}", 
+                    string.Join(", ", behavioursRemoved.ConvertAll<string>(b => b.Name).ToArray()), bot.Name);
             }
         }
 
-        /// <summary>
-        /// Shut down all bots
-        /// </summary>
-        /// <remarks>
-        /// We launch each shutdown on its own thread so that a slow shutting down bot doesn't hold up all the others.
-        /// </remarks>
-        public void doBotShutdown()
+        private void HandleDisconnect(string module, string[] cmd)
         {
-            lock (m_lBot)
+            lock (m_bots)
             {
-                foreach (Bot bot in m_lBot)
+                int botsToDisconnect;
+                int connectedBots = m_bots.Count(b => b.ConnectionState == ConnectionState.Connected);
+
+                if (cmd.Length == 1)
                 {
-                    Bot thisBot = bot;
-                    Util.FireAndForget(o => thisBot.shutdown());
+                    botsToDisconnect = connectedBots;
                 }
+                else
+                {
+                    if (!ConsoleUtil.TryParseConsoleNaturalInt(MainConsole.Instance, cmd[1], out botsToDisconnect))
+                        return;
+
+                    botsToDisconnect = Math.Min(botsToDisconnect, connectedBots);
+                }
+
+                DisconnectingBots = true;
+
+                MainConsole.Instance.OutputFormat("Disconnecting {0} bots", botsToDisconnect);
+
+                int disconnectedBots = 0;
+
+                for (int i = m_bots.Count - 1; i >= 0; i--)
+                {
+                    if (disconnectedBots >= botsToDisconnect)
+                        break;
+
+                    Bot thisBot = m_bots[i];
+
+                    if (thisBot.ConnectionState == ConnectionState.Connected)
+                    {
+                        Util.FireAndForget(o => thisBot.Disconnect());
+                        disconnectedBots++;
+                    }
+                }
+
+                DisconnectingBots = false;
             }
         }
 
-        /// <summary>
-        /// Standard CreateConsole routine
-        /// </summary>
-        /// <returns></returns>
-        protected CommandConsole CreateConsole()
+        private void HandleSit(string module, string[] cmd)
         {
-            return new LocalConsole("pCampbot");
+            lock (m_bots)
+            {
+                m_bots.ForEach(b => b.SitOnGround());
+            }
+        }
+
+        private void HandleStand(string module, string[] cmd)
+        {
+            lock (m_bots)
+            {
+                m_bots.ForEach(b => b.Stand());
+            }
         }
 
         private void HandleShutdown(string module, string[] cmd)
         {
-            m_log.Info("[BOTMANAGER]: Shutting down bots");
-            doBotShutdown();
+            lock (m_bots)
+            {
+                int connectedBots = m_bots.Count(b => b.ConnectionState == ConnectionState.Connected);
+
+                if (connectedBots > 0)
+                {
+                    MainConsole.Instance.OutputFormat("Please disconnect {0} connected bots first", connectedBots);
+                    return;
+                }
+            }
+
+            MainConsole.Instance.Output("Shutting down");
+
+            Environment.Exit(0);
+        }
+
+        private void HandleSetBots(string module, string[] cmd)
+        {
+            string key = cmd[2];
+            string rawValue = cmd[3];
+
+            if (key == "SEND_AGENT_UPDATES")
+            {   
+                bool newSendAgentUpdatesSetting;
+
+                if (!ConsoleUtil.TryParseConsoleBool(MainConsole.Instance, rawValue, out newSendAgentUpdatesSetting))
+                    return;
+
+                MainConsole.Instance.OutputFormat(
+                    "Setting SEND_AGENT_UPDATES to {0} for all bots", newSendAgentUpdatesSetting);
+
+                lock (m_bots)
+                    m_bots.ForEach(b => b.Client.Settings.SEND_AGENT_UPDATES = newSendAgentUpdatesSetting);
+            }
+            else
+            {
+                MainConsole.Instance.Output("Error: Only setting currently available is SEND_AGENT_UPDATES");
+            }
         }
 
         private void HandleShowRegions(string module, string[] cmd)
@@ -322,43 +717,114 @@ namespace pCampBot
             }
         }
 
-        private void HandleShowStatus(string module, string[] cmd)
+        private void HandleShowBotsStatus(string module, string[] cmd)
         {
-            string outputFormat = "{0,-30}  {1, -30}  {2,-14}";
-            MainConsole.Instance.OutputFormat(outputFormat, "Name", "Region", "Status");
-
-            lock (m_lBot)
+            ConsoleDisplayTable cdt = new ConsoleDisplayTable();
+            cdt.AddColumn("Name", 24);
+            cdt.AddColumn("Region", 24);
+            cdt.AddColumn("Status", 13);
+            cdt.AddColumn("Conns", 5);
+            cdt.AddColumn("Behaviours", 20);
+
+            Dictionary<ConnectionState, int> totals = new Dictionary<ConnectionState, int>();
+            foreach (object o in Enum.GetValues(typeof(ConnectionState)))
+                totals[(ConnectionState)o] = 0;
+
+            lock (m_bots)
             {
-                foreach (Bot pb in m_lBot)
+                foreach (Bot bot in m_bots)
                 {
-                    Simulator currentSim = pb.Client.Network.CurrentSim;
-
-                    MainConsole.Instance.OutputFormat(
-                        outputFormat,
-                        pb.Name, currentSim != null ? currentSim.Name : "(none)", pb.ConnectionState);
+                    Simulator currentSim = bot.Client.Network.CurrentSim;
+                    totals[bot.ConnectionState]++;
+
+                    cdt.AddRow(
+                        bot.Name, 
+                        currentSim != null ? currentSim.Name : "(none)", 
+                        bot.ConnectionState, 
+                        bot.SimulatorsCount, 
+                        string.Join(",", bot.Behaviours.Keys.ToArray()));
                 }
             }
+
+            MainConsole.Instance.Output(cdt.ToString());
+
+            ConsoleDisplayList cdl = new ConsoleDisplayList();
+
+            foreach (KeyValuePair<ConnectionState, int> kvp in totals)
+                cdl.AddRow(kvp.Key, kvp.Value);
+
+            MainConsole.Instance.Output(cdl.ToString());
         }
 
-        /*
-        private void HandleQuit(string module, string[] cmd)
+        private void HandleShowBotStatus(string module, string[] cmd)
         {
-            m_console.Warn("DANGER", "This should only be used to quit the program if you've already used the shutdown command and the program hasn't quit");
-            Environment.Exit(0);
+            if (cmd.Length != 3)
+            {
+                MainConsole.Instance.Output("Usage: show bot <n>");
+                return;
+            }
+
+            int botNumber;
+
+            if (!ConsoleUtil.TryParseConsoleInt(MainConsole.Instance, cmd[2], out botNumber))
+                return;
+
+            Bot bot = GetBotFromNumber(botNumber);
+
+            if (bot == null)
+            {
+                MainConsole.Instance.OutputFormat("Error: No bot found with number {0}", botNumber);
+                return;
+            }
+
+            ConsoleDisplayList cdl = new ConsoleDisplayList();
+            cdl.AddRow("Name", bot.Name);
+            cdl.AddRow("Status", bot.ConnectionState);
+
+            Simulator currentSim = bot.Client.Network.CurrentSim;
+            cdl.AddRow("Region", currentSim != null ? currentSim.Name : "(none)");
+
+            List<Simulator> connectedSimulators = bot.Simulators;
+            List<string> simulatorNames = connectedSimulators.ConvertAll<string>(cs => cs.Name);
+            cdl.AddRow("Connections", string.Join(", ", simulatorNames.ToArray()));
+
+            MainConsole.Instance.Output(cdl.ToString());
+
+            MainConsole.Instance.Output("Settings");
+
+            ConsoleDisplayList statusCdl = new ConsoleDisplayList();
+
+            statusCdl.AddRow(
+                "Behaviours", 
+                string.Join(", ", bot.Behaviours.Values.ToList().ConvertAll<string>(b => b.Name).ToArray()));
+
+            GridClient botClient = bot.Client;
+            statusCdl.AddRow("SEND_AGENT_UPDATES", botClient.Settings.SEND_AGENT_UPDATES);
+
+            MainConsole.Instance.Output(statusCdl.ToString());
+        }
+
+        /// <summary>
+        /// Get a specific bot from its number.
+        /// </summary>
+        /// <returns>null if no bot was found</returns>
+        /// <param name='botNumber'></param>
+        private Bot GetBotFromNumber(int botNumber)
+        {
+            string name = GenerateBotNameFromNumber(botNumber);
+
+            Bot bot;
+
+            lock (m_bots)
+                bot = m_bots.Find(b => b.Name == name);
+
+            return bot;
+        }
+
+        private string GenerateBotNameFromNumber(int botNumber)
+        {
+            return string.Format("{0} {1}_{2}", m_firstName, m_lastNameStem, botNumber);
         }
-        */
-//
-//        private void HandleAddBots(string module, string[] cmd)
-//        {
-//            int newbots = 0;
-//            
-//            if (cmd.Length > 2)
-//            {
-//                Int32.TryParse(cmd[2], out newbots);
-//            }
-//            if (newbots > 0)
-//                addbots(newbots);
-//        }
 
         internal void Grid_GridRegion(object o, GridRegionEventArgs args)
         {
@@ -379,4 +845,4 @@ namespace pCampBot
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs b/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs
index 9c984be..0ed4825 100644
--- a/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs
+++ b/OpenSim/Tools/pCampBot/Interfaces/IBehaviour.cs
@@ -32,6 +32,11 @@ namespace pCampBot.Interfaces
     public interface IBehaviour
     {
         /// <summary>
+        /// Abbreviated name of this behaviour. 
+        /// </summary>
+        string AbbreviatedName { get; }
+
+        /// <summary>
         /// Name of this behaviour.
         /// </summary>
         string Name { get; }
@@ -46,6 +51,14 @@ namespace pCampBot.Interfaces
         void Initialize(Bot bot);
 
         /// <summary>
+        /// Close down this behaviour.
+        /// </summary>
+        /// <remarks>
+        /// This is triggered if a behaviour is removed via explicit command and when a bot is disconnected
+        /// </remarks>
+        void Close();
+
+        /// <summary>
         /// Action to take when this behaviour is invoked.
         /// </summary>
         /// <param name="bot"></param>
diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs
index 9e82577..781bb00 100644
--- a/OpenSim/Tools/pCampBot/pCampBot.cs
+++ b/OpenSim/Tools/pCampBot/pCampBot.cs
@@ -26,6 +26,7 @@
  */
 
 using System;
+using System.IO;
 using System.Reflection;
 using System.Threading;
 using log4net;
@@ -50,30 +51,62 @@ namespace pCampBot
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
+        public const string ConfigFileName = "pCampBot.ini";
+
         [STAThread]
         public static void Main(string[] args)
         {
             XmlConfigurator.Configure();
 
-            IConfig config = ParseConfig(args);
-            if (config.Get("help") != null || config.Get("loginuri") == null)
+            IConfig commandLineConfig = ParseConfig(args);
+            if (commandLineConfig.Get("help") != null || commandLineConfig.Get("loginuri") == null)
             {
                 Help();
             }
-            else if (config.Get("firstname") == null ||  config.Get("lastname") == null || config.Get("password") == null)
+            else if (
+                commandLineConfig.Get("firstname") == null 
+                    ||  commandLineConfig.Get("lastname") == null 
+                    || commandLineConfig.Get("password") == null)
             {
                 Console.WriteLine("ERROR: You must supply a firstname, lastname and password for the bots.");
             }
             else
             {
-                int botcount = config.GetInt("botcount", 1);
-
                 BotManager bm = new BotManager();
 
-                //startup specified number of bots.  1 is the default
-                Thread startBotThread = new Thread(o => bm.dobotStartup(botcount, config));
-                startBotThread.Name = "Initial start bots thread";
-                startBotThread.Start();
+                string iniFilePath = Path.GetFullPath(Path.Combine(Util.configDir(), ConfigFileName));
+
+                if (File.Exists(iniFilePath))
+                {
+                    m_log.InfoFormat("[PCAMPBOT]: Reading configuration settings from {0}", iniFilePath);
+
+                    IConfigSource configSource = new IniConfigSource(iniFilePath);
+
+                    IConfig botManagerConfig = configSource.Configs["BotManager"];
+
+                    if (botManagerConfig != null)
+                    {
+                        bm.LoginDelay = botManagerConfig.GetInt("LoginDelay", bm.LoginDelay);
+                    }
+
+                    IConfig botConfig = configSource.Configs["Bot"];
+
+                    if (botConfig != null)
+                    {
+                        bm.InitBotSendAgentUpdates 
+                            = botConfig.GetBoolean("SendAgentUpdates", bm.InitBotSendAgentUpdates);
+                        bm.InitBotRequestObjectTextures
+                            = botConfig.GetBoolean("RequestObjectTextures", bm.InitBotRequestObjectTextures);
+                    }
+                }
+
+                int botcount = commandLineConfig.GetInt("botcount", 1);
+                bool startConnected = commandLineConfig.Get("connect") != null;
+
+                bm.CreateBots(botcount, commandLineConfig);
+
+                if (startConnected)
+                    bm.ConnectBots(botcount);
 
                 while (true)
                 {
@@ -94,8 +127,11 @@ namespace pCampBot
             //Set up our nifty config..  thanks to nini
             ArgvConfigSource cs = new ArgvConfigSource(args);
 
+            cs.AddSwitch("Startup", "connect", "c");
             cs.AddSwitch("Startup", "botcount", "n");
+            cs.AddSwitch("Startup", "from", "f");
             cs.AddSwitch("Startup", "loginuri", "l");
+            cs.AddSwitch("Startup", "start", "s");
             cs.AddSwitch("Startup", "firstname");
             cs.AddSwitch("Startup", "lastname");
             cs.AddSwitch("Startup", "password");
@@ -113,22 +149,27 @@ namespace pCampBot
             // You can either say no, to not load anything, yes, to load one of the default wearables, a folder
             // name, to load an specific folder, or save, to save an avatar with some already existing wearables
             // worn to the folder MyAppearance/FirstName_LastName, and the load it.
+
             Console.WriteLine(
-                "usage: pCampBot <-loginuri loginuri> [OPTIONS]\n" +
-                "Spawns a set of bots to test an OpenSim region\n\n" +
-                "  -l, -loginuri      loginuri for sim to log into (required)\n" +
-                "  -n, -botcount      number of bots to start (default: 1)\n" +
-                "  -firstname         first name for the bots\n" +
-                "  -lastname          lastname for the bots.  Each lastname will have _<bot-number> appended, e.g. Ima Bot_0\n" +
-                "  -password          password for the bots\n" +
-                "  -b, behaviours     behaviours for bots.  Comma separated, e.g. p,g.  Default is p\n" +
-                "    current options are:\n" +
-                "       p (physics)\n" +
-                "       g (grab)\n" +
-                "       t (teleport)\n" +
-//                "       c (cross)" +
-                "  -wear              set appearance folder to load from (default: no)\n" +
-                "  -h, -help          show this message");
+                "usage: pCampBot <-loginuri loginuri> [OPTIONS]\n"
+                    + "Spawns a set of bots to test an OpenSim region\n\n"
+                    + "  -l, -loginuri      loginuri for grid/standalone (required)\n"
+                    + "  -s, -start         start location for bots (optional).  Can be \"last\", \"home\" or a specific location with or without co-ords (e.g. \"region1\" or \"region2/50/30/90\"\n"
+                    + "  -firstname         first name for the bots (required)\n"
+                    + "  -lastname          lastname for the bots (required).  Each lastname will have _<bot-number> appended, e.g. Ima Bot_0\n"
+                    + "  -password          password for the bots (required)\n"
+                    + "  -n, -botcount      number of bots to start (default: 1) (optional)\n"
+                    + "  -f, -from          starting number for login bot names, e.g. 25 will login Ima Bot_25, Ima Bot_26, etc.  (default: 0) (optional)\n"
+                    + "  -c, -connect       connect all bots at startup (optional)\n"
+                    + "  -b, behaviours     behaviours for bots.  Comma separated, e.g. p,g.  Default is p (required)\n"
+                    + "    current options are:\n"
+                    + "       p (physics  - bots constantly move and jump around)\n"
+                    + "       g (grab     - bots randomly click prims whether set clickable or not)\n"
+                    + "       n (none     - bots do nothing)\n"
+                    + "       t (teleport - bots regularly teleport between regions on the grid)\n"
+//                "       c (cross)\n" +
+                    + "  -wear              folder from which to load appearance data, \"no\" if there is no such folder (default: no) (optional)\n"
+                    + "  -h, -help          show this message.\n");
         }
     }
 }
diff --git a/README.md b/README.md
index 552cdef..118fe71 100644
--- a/README.md
+++ b/README.md
@@ -111,3 +111,4 @@ project can always be found at http://opensimulator.org.
 
 Thanks for trying OpenSim, we hope it is a pleasant experience.
 
+
diff --git a/ThirdParty/SmartThreadPool/AssemblyInfo.cs b/ThirdParty/SmartThreadPool/AssemblyInfo.cs
deleted file mode 100644
index e2465b0..0000000
--- a/ThirdParty/SmartThreadPool/AssemblyInfo.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-//
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-//
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]        
-[assembly: ComVisible(false)]
-[assembly: CLSCompliant(true)]
-
-//
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-
-[assembly: AssemblyVersion("0.7.6.*")]
-
-//
-// In order to sign your assembly you must specify a key to use. Refer to the 
-// Microsoft .NET Framework documentation for more information on assembly signing.
-//
-// Use the attributes below to control which key is used for signing. 
-//
-// Notes: 
-//   (*) If no key is specified, the assembly is not signed.
-//   (*) KeyName refers to a key that has been installed in the Crypto Service
-//       Provider (CSP) on your machine. KeyFile refers to a file which contains
-//       a key.
-//   (*) If the KeyFile and the KeyName values are both specified, the 
-//       following processing occurs:
-//       (1) If the KeyName can be found in the CSP, that key is used.
-//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
-//           in the KeyFile is installed into the CSP and used.
-//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
-//       When specifying the KeyFile, the location of the KeyFile should be
-//       relative to the project output directory which is
-//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
-//       located in the project directory, you would specify the AssemblyKeyFile 
-//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
-//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
-//       documentation for more information on this.
-//
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
-[assembly: AssemblyKeyName("")]
diff --git a/ThirdParty/SmartThreadPool/CallerThreadContext.cs b/ThirdParty/SmartThreadPool/CallerThreadContext.cs
index 6ea53f6..e63add5 100644
--- a/ThirdParty/SmartThreadPool/CallerThreadContext.cs
+++ b/ThirdParty/SmartThreadPool/CallerThreadContext.cs
@@ -1,3 +1,6 @@
+
+#if !(_WINDOWS_CE) && !(_SILVERLIGHT) && !(WINDOWS_PHONE)
+
 using System;
 using System.Diagnostics;
 using System.Threading;
@@ -6,218 +9,130 @@ using System.Web;
 using System.Runtime.Remoting.Messaging;
 
 
-namespace Amib.Threading
+namespace Amib.Threading.Internal
 {
-    #region CallerThreadContext class
-
-    /// <summary>
-    /// This class stores the caller call context in order to restore
-    /// it when the work item is executed in the thread pool environment. 
-    /// </summary>
-    internal class CallerThreadContext 
-    {
-        #region Prepare reflection information
-
-        // Cached type information.
-        private static MethodInfo getLogicalCallContextMethodInfo =
-            typeof(Thread).GetMethod("GetLogicalCallContext", BindingFlags.Instance | BindingFlags.NonPublic);
-
-        private static MethodInfo setLogicalCallContextMethodInfo =
-            typeof(Thread).GetMethod("SetLogicalCallContext", BindingFlags.Instance | BindingFlags.NonPublic);
+#region CallerThreadContext class
 
-        private static string HttpContextSlotName = GetHttpContextSlotName();
+        /// <summary>
+        /// This class stores the caller call context in order to restore
+        /// it when the work item is executed in the thread pool environment. 
+        /// </summary>
+        internal class CallerThreadContext 
+        {
+#region Prepare reflection information
 
-        private static string GetHttpContextSlotName()
-        {
-            FieldInfo fi = typeof(HttpContext).GetField("CallContextSlotName", BindingFlags.Static | BindingFlags.NonPublic);
+                // Cached type information.
+                private static readonly MethodInfo getLogicalCallContextMethodInfo =
+                        typeof(Thread).GetMethod("GetLogicalCallContext", BindingFlags.Instance | BindingFlags.NonPublic);
 
-            if( fi != null )
-                return (string)fi.GetValue(null);
-            else // Use the default "HttpContext" slot name
-                return "HttpContext";
-        }
+                private static readonly MethodInfo setLogicalCallContextMethodInfo =
+                        typeof(Thread).GetMethod("SetLogicalCallContext", BindingFlags.Instance | BindingFlags.NonPublic);
 
-        #endregion
-
-        #region Private fields
-
-        private HttpContext _httpContext = null;
-        private LogicalCallContext _callContext = null;
-
-        #endregion
+                private static string HttpContextSlotName = GetHttpContextSlotName();
 
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        private CallerThreadContext()
-        {
-        }
+                private static string GetHttpContextSlotName()
+                {
+                        FieldInfo fi = typeof(HttpContext).GetField("CallContextSlotName", BindingFlags.Static | BindingFlags.NonPublic);
 
-        public bool CapturedCallContext
-        {
-            get
+            if (fi != null)
             {
-                return (null != _callContext);
+                return (string) fi.GetValue(null);
             }
-        }
 
-        public bool CapturedHttpContext
-        {
-            get
-            {
-                return (null != _httpContext);
-            }
-        }
-
-        /// <summary>
-        /// Captures the current thread context
-        /// </summary>
-        /// <returns></returns>
-        public static CallerThreadContext Capture(
-            bool captureCallContext, 
-            bool captureHttpContext)
-        {
-            Debug.Assert(captureCallContext || captureHttpContext);
-
-            CallerThreadContext callerThreadContext = new CallerThreadContext();
-
-            // TODO: In NET 2.0, redo using the new feature of ExecutionContext class - Capture()
-            // Capture Call Context
-            if(captureCallContext && (getLogicalCallContextMethodInfo != null))
-            {
-                callerThreadContext._callContext = (LogicalCallContext)getLogicalCallContextMethodInfo.Invoke(Thread.CurrentThread, null);
-                if (callerThreadContext._callContext != null)
-                {
-                    callerThreadContext._callContext = (LogicalCallContext)callerThreadContext._callContext.Clone();
-                }
-            }
-
-            // Capture httpContext
-            if (captureHttpContext && (null != HttpContext.Current))
-            {
-                callerThreadContext._httpContext = HttpContext.Current;
-            }
-
-            return callerThreadContext;
-        }
+                    return "HttpContext";
+                }
 
-        /// <summary>
-        /// Applies the thread context stored earlier
-        /// </summary>
-        /// <param name="callerThreadContext"></param>
-        public static void Apply(CallerThreadContext callerThreadContext)
-        {
-            if (null == callerThreadContext) 
-            {
-                throw new ArgumentNullException("callerThreadContext");            
-            }
-
-            // Todo: In NET 2.0, redo using the new feature of ExecutionContext class - Run()
-            // Restore call context
-            if ((callerThreadContext._callContext != null) && (setLogicalCallContextMethodInfo != null))
-            {
-                setLogicalCallContextMethodInfo.Invoke(Thread.CurrentThread, new object[] { callerThreadContext._callContext });
-            }
-
-            // Restore HttpContext 
-            if (callerThreadContext._httpContext != null)
-            {
-                CallContext.SetData(HttpContextSlotName, callerThreadContext._httpContext);
-            }
-        }
-    }
-
-    #endregion
-
-}
+        #endregion
 
+#region Private fields
 
-/*
-// Ami Bar
-// amibar@gmail.com
+                private HttpContext _httpContext;
+                private LogicalCallContext _callContext;
 
-using System;
-using System.Threading;
-using System.Globalization;
-using System.Security.Principal;
-using System.Reflection;
-using System.Runtime.Remoting.Contexts;
+        #endregion
 
-namespace Amib.Threading.Internal
-{
-    #region CallerThreadContext class
-
-    /// <summary>
-    /// This class stores the caller thread context in order to restore
-    /// it when the work item is executed in the context of the thread 
-    /// from the pool.
-    /// Note that we can't store the thread's CompressedStack, because 
-    /// it throws a security exception
-    /// </summary>
-    public class CallerThreadContext
-    {
-        private CultureInfo _culture = null;
-        private CultureInfo _cultureUI = null;
-        private IPrincipal _principal;
-        private System.Runtime.Remoting.Contexts.Context _context;
-
-        private static FieldInfo _fieldInfo = GetFieldInfo();
-
-        private static FieldInfo GetFieldInfo()
-        {
-            Type threadType = typeof(Thread);
-            return threadType.GetField(
-                "m_Context",
-                BindingFlags.Instance | BindingFlags.NonPublic);
-        }
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        private CallerThreadContext()
-        {
-        }
-
-        /// <summary>
-        /// Captures the current thread context
-        /// </summary>
-        /// <returns></returns>
-        public static CallerThreadContext Capture()
-        {
-            CallerThreadContext callerThreadContext = new CallerThreadContext();
-
-            Thread thread = Thread.CurrentThread;
-            callerThreadContext._culture = thread.CurrentCulture;
-            callerThreadContext._cultureUI = thread.CurrentUICulture;
-            callerThreadContext._principal = Thread.CurrentPrincipal;
-            callerThreadContext._context = Thread.CurrentContext;
-            return callerThreadContext;
-        }
-
-        /// <summary>
-        /// Applies the thread context stored earlier
-        /// </summary>
-        /// <param name="callerThreadContext"></param>
-        public static void Apply(CallerThreadContext callerThreadContext)
-        {
-            Thread thread = Thread.CurrentThread;
-            thread.CurrentCulture = callerThreadContext._culture;
-            thread.CurrentUICulture = callerThreadContext._cultureUI;
-            Thread.CurrentPrincipal = callerThreadContext._principal;
-
-            // Uncomment the following block to enable the Thread.CurrentThread
-/*
-            if (null != _fieldInfo)
-            {
-                _fieldInfo.SetValue(
-                    Thread.CurrentThread, 
-                    callerThreadContext._context);
-            }
-* /            
-        }
-    }
+                /// <summary>
+                /// Constructor
+                /// </summary>
+                private CallerThreadContext()
+                {
+                }
+
+                public bool CapturedCallContext
+                {
+                        get
+                        {
+                                return (null != _callContext);
+                        }
+                }
+
+                public bool CapturedHttpContext
+                {
+                        get
+                        {
+                                return (null != _httpContext);
+                        }
+                }
+
+                /// <summary>
+                /// Captures the current thread context
+                /// </summary>
+                /// <returns></returns>
+                public static CallerThreadContext Capture(
+                        bool captureCallContext, 
+                        bool captureHttpContext)
+                {
+                        Debug.Assert(captureCallContext || captureHttpContext);
+
+                        CallerThreadContext callerThreadContext = new CallerThreadContext();
+
+                        // TODO: In NET 2.0, redo using the new feature of ExecutionContext class - Capture()
+                        // Capture Call Context
+                        if(captureCallContext && (getLogicalCallContextMethodInfo != null))
+                        {
+                                callerThreadContext._callContext = (LogicalCallContext)getLogicalCallContextMethodInfo.Invoke(Thread.CurrentThread, null);
+                                if (callerThreadContext._callContext != null)
+                                {
+                                        callerThreadContext._callContext = (LogicalCallContext)callerThreadContext._callContext.Clone();
+                                }
+                        }
+
+                        // Capture httpContext
+                        if (captureHttpContext && (null != HttpContext.Current))
+                        {
+                                callerThreadContext._httpContext = HttpContext.Current;
+                        }
+
+                        return callerThreadContext;
+                }
+
+                /// <summary>
+                /// Applies the thread context stored earlier
+                /// </summary>
+                /// <param name="callerThreadContext"></param>
+                public static void Apply(CallerThreadContext callerThreadContext)
+                {
+                        if (null == callerThreadContext) 
+                        {
+                                throw new ArgumentNullException("callerThreadContext");                 
+                        }
+
+                        // Todo: In NET 2.0, redo using the new feature of ExecutionContext class - Run()
+                        // Restore call context
+                        if ((callerThreadContext._callContext != null) && (setLogicalCallContextMethodInfo != null))
+                        {
+                                setLogicalCallContextMethodInfo.Invoke(Thread.CurrentThread, new object[] { callerThreadContext._callContext });
+                        }
+
+                        // Restore HttpContext 
+                        if (callerThreadContext._httpContext != null)
+                        {
+                HttpContext.Current = callerThreadContext._httpContext;
+                                //CallContext.SetData(HttpContextSlotName, callerThreadContext._httpContext);
+                        }
+                }
+        }
 
     #endregion
 }
-*/
-
+#endif
diff --git a/ThirdParty/SmartThreadPool/CanceledWorkItemsGroup.cs b/ThirdParty/SmartThreadPool/CanceledWorkItemsGroup.cs
new file mode 100644
index 0000000..5752957
--- /dev/null
+++ b/ThirdParty/SmartThreadPool/CanceledWorkItemsGroup.cs
@@ -0,0 +1,14 @@
+namespace Amib.Threading.Internal
+{
+    internal class CanceledWorkItemsGroup
+    {
+        public readonly static CanceledWorkItemsGroup NotCanceledWorkItemsGroup = new CanceledWorkItemsGroup();
+
+        public CanceledWorkItemsGroup()
+        {
+            IsCanceled = false;
+        }
+
+        public bool IsCanceled { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/ThirdParty/SmartThreadPool/EventWaitHandle.cs b/ThirdParty/SmartThreadPool/EventWaitHandle.cs
new file mode 100644
index 0000000..25be07a
--- /dev/null
+++ b/ThirdParty/SmartThreadPool/EventWaitHandle.cs
@@ -0,0 +1,104 @@
+#if (_WINDOWS_CE)
+
+using System;
+using System.Runtime.InteropServices;
+using System.Threading;
+
+namespace Amib.Threading.Internal
+{
+    /// <summary>
+    /// EventWaitHandle class
+    /// In WindowsCE this class doesn't exist and I needed the WaitAll and WaitAny implementation.
+    /// So I wrote this class to implement these two methods with some of their overloads.
+    /// It uses the WaitForMultipleObjects API to do the WaitAll and WaitAny.
+    /// Note that this class doesn't even inherit from WaitHandle!
+    /// </summary>
+    public class STPEventWaitHandle
+    {
+        #region Public Constants
+
+        public const int WaitTimeout = Timeout.Infinite;
+
+        #endregion
+
+        #region Private External Constants
+
+        private const Int32 WAIT_FAILED = -1;
+        private const Int32 WAIT_TIMEOUT = 0x102;
+        private const UInt32 INFINITE = 0xFFFFFFFF;
+
+        #endregion
+
+        #region WaitAll and WaitAny
+
+        internal static bool WaitOne(WaitHandle waitHandle, int millisecondsTimeout, bool exitContext)
+        {
+            return waitHandle.WaitOne(millisecondsTimeout, exitContext);
+        }
+
+            private static IntPtr[] PrepareNativeHandles(WaitHandle[] waitHandles)
+            {
+                IntPtr[] nativeHandles = new IntPtr[waitHandles.Length];
+                for (int i = 0; i < waitHandles.Length; i++)
+                {
+                nativeHandles[i] = waitHandles[i].Handle;
+                }
+                return nativeHandles;
+            }
+
+            public static bool WaitAll(WaitHandle[] waitHandles, int millisecondsTimeout, bool exitContext)
+            {
+            uint timeout = millisecondsTimeout < 0 ? INFINITE : (uint)millisecondsTimeout;
+
+            IntPtr[] nativeHandles = PrepareNativeHandles(waitHandles);
+
+                int result = WaitForMultipleObjects((uint)waitHandles.Length, nativeHandles, true, timeout);
+
+            if (result == WAIT_TIMEOUT || result == WAIT_FAILED)
+            {
+                return false;
+            }
+
+                return true;
+            }
+
+
+            public static int WaitAny(WaitHandle[] waitHandles, int millisecondsTimeout, bool exitContext)
+        {
+            uint timeout = millisecondsTimeout < 0 ? INFINITE : (uint)millisecondsTimeout;
+
+            IntPtr[] nativeHandles = PrepareNativeHandles(waitHandles);
+
+            int result = WaitForMultipleObjects((uint)waitHandles.Length, nativeHandles, false, timeout);
+
+            if (result >= 0 && result < waitHandles.Length)
+            {
+                return result;
+            }
+
+            return -1;
+        }
+
+        public static int WaitAny(WaitHandle[] waitHandles)
+        {
+            return WaitAny(waitHandles, Timeout.Infinite, false);
+        }
+
+        public static int WaitAny(WaitHandle[] waitHandles, TimeSpan timeout, bool exitContext)
+        {
+            int millisecondsTimeout = (int)timeout.TotalMilliseconds;
+
+            return WaitAny(waitHandles, millisecondsTimeout, false);
+        }
+ 
+        #endregion
+
+        #region External methods
+
+        [DllImport("coredll.dll", SetLastError = true)]
+        public static extern int WaitForMultipleObjects(uint nCount, IntPtr[] lpHandles, bool fWaitAll, uint dwMilliseconds);
+
+        #endregion
+    }
+}
+#endif
\ No newline at end of file
diff --git a/ThirdParty/SmartThreadPool/EventWaitHandleFactory.cs b/ThirdParty/SmartThreadPool/EventWaitHandleFactory.cs
new file mode 100644
index 0000000..3c9c849
--- /dev/null
+++ b/ThirdParty/SmartThreadPool/EventWaitHandleFactory.cs
@@ -0,0 +1,82 @@
+using System.Threading;
+
+#if (_WINDOWS_CE)
+using System;
+using System.Runtime.InteropServices;
+#endif
+
+namespace Amib.Threading.Internal
+{
+    /// <summary>
+    /// EventWaitHandleFactory class.
+    /// This is a static class that creates AutoResetEvent and ManualResetEvent objects.
+    /// In WindowCE the WaitForMultipleObjects API fails to use the Handle property 
+    /// of XxxResetEvent. It can use only handles that were created by the CreateEvent API.
+    /// Consequently this class creates the needed XxxResetEvent and replaces the handle if
+    /// it's a WindowsCE OS.
+    /// </summary>
+    public static class EventWaitHandleFactory
+    {
+        /// <summary>
+        /// Create a new AutoResetEvent object
+        /// </summary>
+        /// <returns>Return a new AutoResetEvent object</returns>
+        public static AutoResetEvent CreateAutoResetEvent()
+        {
+            AutoResetEvent waitHandle = new AutoResetEvent(false);
+
+#if (_WINDOWS_CE)
+            ReplaceEventHandle(waitHandle, false, false);
+#endif
+
+            return waitHandle;
+        }
+
+        /// <summary>
+        /// Create a new ManualResetEvent object
+        /// </summary>
+        /// <returns>Return a new ManualResetEvent object</returns>
+        public static ManualResetEvent CreateManualResetEvent(bool initialState)
+        {
+            ManualResetEvent waitHandle = new ManualResetEvent(initialState);
+
+#if (_WINDOWS_CE)
+            ReplaceEventHandle(waitHandle, true, initialState);
+#endif
+
+            return waitHandle;
+        }
+
+#if (_WINDOWS_CE)
+
+        /// <summary>
+        /// Replace the event handle
+        /// </summary>
+        /// <param name="waitHandle">The WaitHandle object which its handle needs to be replaced.</param>
+        /// <param name="manualReset">Indicates if the event is a ManualResetEvent (true) or an AutoResetEvent (false)</param>
+        /// <param name="initialState">The initial state of the event</param>
+        private static void ReplaceEventHandle(WaitHandle waitHandle, bool manualReset, bool initialState)
+        {
+            // Store the old handle 
+            IntPtr oldHandle = waitHandle.Handle;
+
+            // Create a new event
+            IntPtr newHandle = CreateEvent(IntPtr.Zero, manualReset, initialState, null);
+
+            // Replace the old event with the new event
+            waitHandle.Handle = newHandle;
+
+            // Close the old event
+            CloseHandle (oldHandle);        
+        }
+
+        [DllImport("coredll.dll", SetLastError = true)]
+        public static extern IntPtr CreateEvent(IntPtr lpEventAttributes, bool bManualReset, bool bInitialState, string lpName);
+
+        //Handle
+        [DllImport("coredll.dll", SetLastError = true)]
+        public static extern bool CloseHandle(IntPtr hObject);
+#endif
+
+    }
+}
diff --git a/ThirdParty/SmartThreadPool/Exceptions.cs b/ThirdParty/SmartThreadPool/Exceptions.cs
index c454709..6c6a88b 100644
--- a/ThirdParty/SmartThreadPool/Exceptions.cs
+++ b/ThirdParty/SmartThreadPool/Exceptions.cs
@@ -1,8 +1,7 @@
-// Ami Bar
-// amibar@gmail.com
-
 using System;
+#if !(_WINDOWS_CE)
 using System.Runtime.Serialization;
+#endif
 
 namespace Amib.Threading
 {
@@ -11,22 +10,39 @@ namespace Amib.Threading
     /// <summary>
     /// Represents an exception in case IWorkItemResult.GetResult has been canceled
     /// </summary>
-    [Serializable]
-    public sealed class WorkItemCancelException : ApplicationException
+    public sealed partial class WorkItemCancelException : Exception
     {
-        public WorkItemCancelException() : base()
+        public WorkItemCancelException()
         {
         }
 
-        public WorkItemCancelException(string message) : base(message)
+        public WorkItemCancelException(string message)
+            : base(message)
         {
         }
 
-        public WorkItemCancelException(string message, Exception e) : base(message, e)
+        public WorkItemCancelException(string message, Exception e)
+            : base(message, e)
         {
         }
+    }
 
-        public WorkItemCancelException(SerializationInfo si, StreamingContext sc) : base(si, sc)
+    /// <summary>
+    /// Represents an exception in case IWorkItemResult.GetResult has been timed out
+    /// </summary>
+    public sealed partial class WorkItemTimeoutException : Exception
+    {
+        public WorkItemTimeoutException()
+        {
+        }
+
+        public WorkItemTimeoutException(string message)
+            : base(message)
+        {
+        }
+
+        public WorkItemTimeoutException(string message, Exception e)
+            : base(message, e)
         {
         }
     }
@@ -34,22 +50,33 @@ namespace Amib.Threading
     /// <summary>
     /// Represents an exception in case IWorkItemResult.GetResult has been timed out
     /// </summary>
-    [Serializable]
-    public sealed class WorkItemTimeoutException : ApplicationException
+    public sealed partial class WorkItemResultException : Exception
     {
-        public WorkItemTimeoutException() : base()
+        public WorkItemResultException()
         {
         }
 
-        public WorkItemTimeoutException(string message) : base(message)
+        public WorkItemResultException(string message)
+            : base(message)
         {
         }
 
-        public WorkItemTimeoutException(string message, Exception e) : base(message, e)
+        public WorkItemResultException(string message, Exception e)
+            : base(message, e)
         {
         }
+    }
 
-        public WorkItemTimeoutException(SerializationInfo si, StreamingContext sc) : base(si, sc)
+
+#if !(_WINDOWS_CE) && !(_SILVERLIGHT) && !(WINDOWS_PHONE)
+    /// <summary>
+    /// Represents an exception in case IWorkItemResult.GetResult has been canceled
+    /// </summary>
+    [Serializable]
+    public sealed partial class WorkItemCancelException
+    {
+        public WorkItemCancelException(SerializationInfo si, StreamingContext sc)
+            : base(si, sc)
         {
         }
     }
@@ -58,24 +85,27 @@ namespace Amib.Threading
     /// Represents an exception in case IWorkItemResult.GetResult has been timed out
     /// </summary>
     [Serializable]
-    public sealed class WorkItemResultException : ApplicationException
+    public sealed partial class WorkItemTimeoutException
     {
-        public WorkItemResultException() : base()
-        {
-        }
-
-        public WorkItemResultException(string message) : base(message)
-        {
-        }
-
-        public WorkItemResultException(string message, Exception e) : base(message, e)
+        public WorkItemTimeoutException(SerializationInfo si, StreamingContext sc)
+            : base(si, sc)
         {
         }
+    }
 
-        public WorkItemResultException(SerializationInfo si, StreamingContext sc) : base(si, sc)
+    /// <summary>
+    /// Represents an exception in case IWorkItemResult.GetResult has been timed out
+    /// </summary>
+    [Serializable]
+    public sealed partial class WorkItemResultException
+    {
+        public WorkItemResultException(SerializationInfo si, StreamingContext sc)
+            : base(si, sc)
         {
         }
     }
 
+#endif
+
     #endregion
 }
diff --git a/ThirdParty/SmartThreadPool/Interfaces.cs b/ThirdParty/SmartThreadPool/Interfaces.cs
index f1c1fcf..513422f 100644
--- a/ThirdParty/SmartThreadPool/Interfaces.cs
+++ b/ThirdParty/SmartThreadPool/Interfaces.cs
@@ -1,271 +1,628 @@
-// Ami Bar
-// amibar@gmail.com
-
 using System;
 using System.Threading;
 
 namespace Amib.Threading
 {
-    #region Delegates
+        #region Delegates
+
+        /// <summary>
+        /// A delegate that represents the method to run as the work item
+        /// </summary>
+        /// <param name="state">A state object for the method to run</param>
+        public delegate object WorkItemCallback(object state);
+
+        /// <summary>
+        /// A delegate to call after the WorkItemCallback completed
+        /// </summary>
+        /// <param name="wir">The work item result object</param>
+    public delegate void PostExecuteWorkItemCallback(IWorkItemResult wir);
 
     /// <summary>
-    /// A delegate that represents the method to run as the work item
+    /// A delegate to call after the WorkItemCallback completed
     /// </summary>
-    /// <param name="state">A state object for the method to run</param>
-    public delegate object WorkItemCallback(object state);
+    /// <param name="wir">The work item result object</param>
+    public delegate void PostExecuteWorkItemCallback<TResult>(IWorkItemResult<TResult> wir);
+
+        /// <summary>
+        /// A delegate to call when a WorkItemsGroup becomes idle
+        /// </summary>
+        /// <param name="workItemsGroup">A reference to the WorkItemsGroup that became idle</param>
+        public delegate void WorkItemsGroupIdleHandler(IWorkItemsGroup workItemsGroup);
 
     /// <summary>
-    /// A delegate to call after the WorkItemCallback completed
+    /// A delegate to call after a thread is created, but before 
+    /// it's first use.
     /// </summary>
-    /// <param name="wir">The work item result object</param>
-    public delegate void PostExecuteWorkItemCallback(IWorkItemResult wir);
+    public delegate void ThreadInitializationHandler();
 
     /// <summary>
-    /// A delegate to call when a WorkItemsGroup becomes idle
+    /// A delegate to call when a thread is about to exit, after 
+    /// it is no longer belong to the pool.
     /// </summary>
-    /// <param name="workItemsGroup">A reference to the WorkItemsGroup that became idle</param>
-    public delegate void WorkItemsGroupIdleHandler(IWorkItemsGroup workItemsGroup);
+    public delegate void ThreadTerminationHandler();
 
-    #endregion
+        #endregion
 
-    #region WorkItem Priority
+        #region WorkItem Priority
 
-    public enum WorkItemPriority
-    {
-        Lowest,
-        BelowNormal,
-        Normal,
-        AboveNormal,
-        Highest,
-    }
+    /// <summary>
+    /// Defines the availeable priorities of a work item.
+    /// The higher the priority a work item has, the sooner
+    /// it will be executed.
+    /// </summary>
+        public enum WorkItemPriority
+        {
+                Lowest,
+                BelowNormal,
+                Normal,
+                AboveNormal,
+                Highest,
+        }
+
+        #endregion
+
+        #region IWorkItemsGroup interface 
+
+        /// <summary>
+        /// IWorkItemsGroup interface
+    /// Created by SmartThreadPool.CreateWorkItemsGroup()
+        /// </summary>
+        public interface IWorkItemsGroup
+        {
+                /// <summary>
+                /// Get/Set the name of the WorkItemsGroup
+                /// </summary>
+                string Name { get; set; }
 
-    #endregion
+        /// <summary>
+        /// Get/Set the maximum number of workitem that execute cocurrency on the thread pool
+        /// </summary>
+        int Concurrency { get; set; }
+
+        /// <summary>
+        /// Get the number of work items waiting in the queue.
+        /// </summary>
+        int WaitingCallbacks { get; }
 
-    #region IHasWorkItemPriority interface 
+        /// <summary>
+        /// Get an array with all the state objects of the currently running items.
+        /// The array represents a snap shot and impact performance.
+        /// </summary>
+        object[] GetStates();
 
-    public interface IHasWorkItemPriority
-    {
-        WorkItemPriority WorkItemPriority { get; }
-    }
+        /// <summary>
+        /// Get the WorkItemsGroup start information
+        /// </summary>
+        WIGStartInfo WIGStartInfo { get; }
 
-    #endregion
+        /// <summary>
+        /// Starts to execute work items
+        /// </summary>
+        void Start();
 
-    #region IWorkItemsGroup interface 
+        /// <summary>
+        /// Cancel all the work items.
+        /// Same as Cancel(false)
+        /// </summary>
+        void Cancel();
 
-    /// <summary>
-    /// IWorkItemsGroup interface
-    /// </summary>
-    public interface IWorkItemsGroup
-    {
         /// <summary>
-        /// Get/Set the name of the WorkItemsGroup
+        /// Cancel all work items using thread abortion
         /// </summary>
-        string Name { get; set; }
+        /// <param name="abortExecution">True to stop work items by raising ThreadAbortException</param>
+        void Cancel(bool abortExecution);
 
+        /// <summary>
+        /// Wait for all work item to complete.
+        /// </summary>
+                void WaitForIdle();
+
+        /// <summary>
+        /// Wait for all work item to complete, until timeout expired
+        /// </summary>
+        /// <param name="timeout">How long to wait for the work items to complete</param>
+        /// <returns>Returns true if work items completed within the timeout, otherwise false.</returns>
+                bool WaitForIdle(TimeSpan timeout);
+
+        /// <summary>
+        /// Wait for all work item to complete, until timeout expired
+        /// </summary>
+        /// <param name="millisecondsTimeout">How long to wait for the work items to complete in milliseconds</param>
+        /// <returns>Returns true if work items completed within the timeout, otherwise false.</returns>
+        bool WaitForIdle(int millisecondsTimeout);
+
+        /// <summary>
+        /// IsIdle is true when there are no work items running or queued.
+        /// </summary>
+        bool IsIdle { get; }
+
+        /// <summary>
+        /// This event is fired when all work items are completed.
+        /// (When IsIdle changes to true)
+        /// This event only work on WorkItemsGroup. On SmartThreadPool
+        /// it throws the NotImplementedException.
+        /// </summary>
+        event WorkItemsGroupIdleHandler OnIdle;
+
+        #region QueueWorkItem
+
+        /// <summary>
+        /// Queue a work item
+        /// </summary>
+        /// <param name="callback">A callback to execute</param>
+        /// <returns>Returns a work item result</returns>        
         IWorkItemResult QueueWorkItem(WorkItemCallback callback);
+
+        /// <summary>
+        /// Queue a work item
+        /// </summary>
+        /// <param name="callback">A callback to execute</param>
+        /// <param name="workItemPriority">The priority of the work item</param>
+        /// <returns>Returns a work item result</returns>
         IWorkItemResult QueueWorkItem(WorkItemCallback callback, WorkItemPriority workItemPriority);
+
+        /// <summary>
+        /// Queue a work item
+        /// </summary>
+        /// <param name="callback">A callback to execute</param>
+        /// <param name="state">
+        /// The context object of the work item. Used for passing arguments to the work item. 
+        /// </param>
+        /// <returns>Returns a work item result</returns>
         IWorkItemResult QueueWorkItem(WorkItemCallback callback, object state);
+
+        /// <summary>
+        /// Queue a work item
+        /// </summary>
+        /// <param name="callback">A callback to execute</param>
+        /// <param name="state">
+        /// The context object of the work item. Used for passing arguments to the work item. 
+        /// </param>
+        /// <param name="workItemPriority">The work item priority</param>
+        /// <returns>Returns a work item result</returns>
         IWorkItemResult QueueWorkItem(WorkItemCallback callback, object state, WorkItemPriority workItemPriority);
+
+        /// <summary>
+        /// Queue a work item
+        /// </summary>
+        /// <param name="callback">A callback to execute</param>
+        /// <param name="state">
+        /// The context object of the work item. Used for passing arguments to the work item. 
+        /// </param>
+        /// <param name="postExecuteWorkItemCallback">
+        /// A delegate to call after the callback completion
+        /// </param>
+        /// <returns>Returns a work item result</returns>
         IWorkItemResult QueueWorkItem(WorkItemCallback callback, object state, PostExecuteWorkItemCallback postExecuteWorkItemCallback);
+
+        /// <summary>
+        /// Queue a work item
+        /// </summary>
+        /// <param name="callback">A callback to execute</param>
+        /// <param name="state">
+        /// The context object of the work item. Used for passing arguments to the work item. 
+        /// </param>
+        /// <param name="postExecuteWorkItemCallback">
+        /// A delegate to call after the callback completion
+        /// </param>
+        /// <param name="workItemPriority">The work item priority</param>
+        /// <returns>Returns a work item result</returns>
         IWorkItemResult QueueWorkItem(WorkItemCallback callback, object state, PostExecuteWorkItemCallback postExecuteWorkItemCallback, WorkItemPriority workItemPriority);
+
+        /// <summary>
+        /// Queue a work item
+        /// </summary>
+        /// <param name="callback">A callback to execute</param>
+        /// <param name="state">
+        /// The context object of the work item. Used for passing arguments to the work item. 
+        /// </param>
+        /// <param name="postExecuteWorkItemCallback">
+        /// A delegate to call after the callback completion
+        /// </param>
+        /// <param name="callToPostExecute">Indicates on which cases to call to the post execute callback</param>
+        /// <returns>Returns a work item result</returns>
         IWorkItemResult QueueWorkItem(WorkItemCallback callback, object state, PostExecuteWorkItemCallback postExecuteWorkItemCallback, CallToPostExecute callToPostExecute);
+
+        /// <summary>
+        /// Queue a work item
+        /// </summary>
+        /// <param name="callback">A callback to execute</param>
+        /// <param name="state">
+        /// The context object of the work item. Used for passing arguments to the work item. 
+        /// </param>
+        /// <param name="postExecuteWorkItemCallback">
+        /// A delegate to call after the callback completion
+        /// </param>
+        /// <param name="callToPostExecute">Indicates on which cases to call to the post execute callback</param>
+        /// <param name="workItemPriority">The work item priority</param>
+        /// <returns>Returns a work item result</returns>
         IWorkItemResult QueueWorkItem(WorkItemCallback callback, object state, PostExecuteWorkItemCallback postExecuteWorkItemCallback, CallToPostExecute callToPostExecute, WorkItemPriority workItemPriority);
 
+        /// <summary>
+        /// Queue a work item
+        /// </summary>
+        /// <param name="workItemInfo">Work item info</param>
+        /// <param name="callback">A callback to execute</param>
+        /// <returns>Returns a work item result</returns>
         IWorkItemResult QueueWorkItem(WorkItemInfo workItemInfo, WorkItemCallback callback);
-        IWorkItemResult QueueWorkItem(WorkItemInfo workItemInfo, WorkItemCallback callback, object state);
-
-        void WaitForIdle();
-        bool WaitForIdle(TimeSpan timeout);
-        bool WaitForIdle(int millisecondsTimeout);
 
-        int WaitingCallbacks { get; }
-        event WorkItemsGroupIdleHandler OnIdle;
-
-        void Cancel();
-        void Start();
-    }
+        /// <summary>
+        /// Queue a work item
+        /// </summary>
+        /// <param name="workItemInfo">Work item information</param>
+        /// <param name="callback">A callback to execute</param>
+        /// <param name="state">
+        /// The context object of the work item. Used for passing arguments to the work item. 
+        /// </param>
+        /// <returns>Returns a work item result</returns>
+        IWorkItemResult QueueWorkItem(WorkItemInfo workItemInfo, WorkItemCallback callback, object state);
 
-    #endregion
+        #endregion
 
-    #region CallToPostExecute enumerator
+        #region QueueWorkItem(Action<...>)
 
-    [Flags]
-    public enum CallToPostExecute
-    {
-        Never                    = 0x00,
-        WhenWorkItemCanceled     = 0x01,
-        WhenWorkItemNotCanceled  = 0x02,
-        Always                   = WhenWorkItemCanceled | WhenWorkItemNotCanceled,
-    }
+        /// <summary>
+        /// Queue a work item.
+        /// </summary>
+        /// <returns>Returns a IWorkItemResult object, but its GetResult() will always return null</returns>
+        IWorkItemResult QueueWorkItem(Action action);
 
-    #endregion
+        /// <summary>
+        /// Queue a work item.
+        /// </summary>
+        /// <returns>Returns a IWorkItemResult object, but its GetResult() will always return null</returns>
+        IWorkItemResult QueueWorkItem (Action action, WorkItemPriority priority);
 
-    #region IWorkItemResult interface
+        /// <summary>
+        /// Queue a work item.
+        /// </summary>
+        /// <returns>Returns a IWorkItemResult object, but its GetResult() will always return null</returns>
+        IWorkItemResult QueueWorkItem<T> (Action<T> action, T arg, WorkItemPriority priority);
 
-    /// <summary>
-    /// IWorkItemResult interface
-    /// </summary>
-    public interface IWorkItemResult
-    {
         /// <summary>
-        /// Get the result of the work item.
-        /// If the work item didn't run yet then the caller waits.
+        /// Queue a work item.
         /// </summary>
-        /// <returns>The result of the work item</returns>
-        object GetResult();
+        /// <returns>Returns a IWorkItemResult object, but its GetResult() will always return null</returns>
+        IWorkItemResult QueueWorkItem<T> (Action<T> action, T arg);
 
         /// <summary>
-        /// Get the result of the work item.
-        /// If the work item didn't run yet then the caller waits until timeout.
+        /// Queue a work item.
         /// </summary>
-        /// <returns>The result of the work item</returns>
-        /// On timeout throws WorkItemTimeoutException
-        object GetResult(
-            int millisecondsTimeout,
-            bool exitContext);
+        /// <returns>Returns a IWorkItemResult object, but its GetResult() will always return null</returns>
+        IWorkItemResult QueueWorkItem<T1, T2>(Action<T1, T2> action, T1 arg1, T2 arg2);
 
         /// <summary>
-        /// Get the result of the work item.
-        /// If the work item didn't run yet then the caller waits until timeout.
+        /// Queue a work item.
         /// </summary>
-        /// <returns>The result of the work item</returns>
-        /// On timeout throws WorkItemTimeoutException
-        object GetResult(            
-            TimeSpan timeout,
-            bool exitContext);
+        /// <returns>Returns a IWorkItemResult object, but its GetResult() will always return null</returns>
+        IWorkItemResult QueueWorkItem<T1, T2> (Action<T1, T2> action, T1 arg1, T2 arg2, WorkItemPriority priority);
 
-        void Abort();
+        /// <summary>
+        /// Queue a work item.
+        /// </summary>
+        /// <returns>Returns a IWorkItemResult object, but its GetResult() will always return null</returns>
+        IWorkItemResult QueueWorkItem<T1, T2, T3>(Action<T1, T2, T3> action, T1 arg1, T2 arg2, T3 arg3);
 
         /// <summary>
-        /// Get the result of the work item.
-        /// If the work item didn't run yet then the caller waits until timeout or until the cancelWaitHandle is signaled.
+        /// Queue a work item.
         /// </summary>
-        /// <param name="millisecondsTimeout">Timeout in milliseconds, or -1 for infinite</param>
-        /// <param name="exitContext">
-        /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
-        /// </param>
-        /// <param name="cancelWaitHandle">A cancel wait handle to interrupt the blocking if needed</param>
-        /// <returns>The result of the work item</returns>
-        /// On timeout throws WorkItemTimeoutException
-        /// On cancel throws WorkItemCancelException
-        object GetResult(            
-            int millisecondsTimeout,
-            bool exitContext,
-            WaitHandle cancelWaitHandle);
+        /// <returns>Returns a IWorkItemResult object, but its GetResult() will always return null</returns>
+        IWorkItemResult QueueWorkItem<T1, T2, T3> (Action<T1, T2, T3> action, T1 arg1, T2 arg2, T3 arg3, WorkItemPriority priority);
 
         /// <summary>
-        /// Get the result of the work item.
-        /// If the work item didn't run yet then the caller waits until timeout or until the cancelWaitHandle is signaled.
+        /// Queue a work item.
         /// </summary>
-        /// <returns>The result of the work item</returns>
-        /// On timeout throws WorkItemTimeoutException
-        /// On cancel throws WorkItemCancelException
-        object GetResult(            
-            TimeSpan timeout,
-            bool exitContext,
-            WaitHandle cancelWaitHandle);
+        /// <returns>Returns a IWorkItemResult object, but its GetResult() will always return null</returns>
+        IWorkItemResult QueueWorkItem<T1, T2, T3, T4>(Action<T1, T2, T3, T4> action, T1 arg1, T2 arg2, T3 arg3, T4 arg4);
 
         /// <summary>
-        /// Get the result of the work item.
-        /// If the work item didn't run yet then the caller waits.
+        /// Queue a work item.
         /// </summary>
-        /// <param name="e">Filled with the exception if one was thrown</param>
-        /// <returns>The result of the work item</returns>
-        object GetResult(out Exception e);
+        /// <returns>Returns a IWorkItemResult object, but its GetResult() will always return null</returns>
+        IWorkItemResult QueueWorkItem<T1, T2, T3, T4> (Action<T1, T2, T3, T4> action, T1 arg1, T2 arg2, T3 arg3, T4 arg4, WorkItemPriority priority);
+
+        #endregion
+
+        #region QueueWorkItem(Func<...>)
 
         /// <summary>
-        /// Get the result of the work item.
-        /// If the work item didn't run yet then the caller waits until timeout.
+        /// Queue a work item.
         /// </summary>
-        /// <param name="e">Filled with the exception if one was thrown</param>
-        /// <returns>The result of the work item</returns>
-        /// On timeout throws WorkItemTimeoutException
-        object GetResult(
-            int millisecondsTimeout,
-            bool exitContext,
-            out Exception e);
+        /// <returns>Returns a IWorkItemResult&lt;TResult&gt; object. 
+        /// its GetResult() returns a TResult object</returns>
+        IWorkItemResult<TResult> QueueWorkItem<TResult>(Func<TResult> func);
 
         /// <summary>
-        /// Get the result of the work item.
-        /// If the work item didn't run yet then the caller waits until timeout.
+        /// Queue a work item.
         /// </summary>
-        /// <param name="e">Filled with the exception if one was thrown</param>
-        /// <returns>The result of the work item</returns>
-        /// On timeout throws WorkItemTimeoutException
-        object GetResult(            
-            TimeSpan timeout,
-            bool exitContext,
-            out Exception e);
+        /// <returns>Returns a IWorkItemResult&lt;TResult&gt; object. 
+        /// its GetResult() returns a TResult object</returns>
+        IWorkItemResult<TResult> QueueWorkItem<T, TResult>(Func<T, TResult> func, T arg);
 
         /// <summary>
-        /// Get the result of the work item.
-        /// If the work item didn't run yet then the caller waits until timeout or until the cancelWaitHandle is signaled.
+        /// Queue a work item.
         /// </summary>
-        /// <param name="millisecondsTimeout">Timeout in milliseconds, or -1 for infinite</param>
-        /// <param name="exitContext">
-        /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
-        /// </param>
-        /// <param name="cancelWaitHandle">A cancel wait handle to interrupt the blocking if needed</param>
-        /// <param name="e">Filled with the exception if one was thrown</param>
-        /// <returns>The result of the work item</returns>
-        /// On timeout throws WorkItemTimeoutException
-        /// On cancel throws WorkItemCancelException
-        object GetResult(            
-            int millisecondsTimeout,
-            bool exitContext,
-            WaitHandle cancelWaitHandle,
-            out Exception e);
+        /// <returns>Returns a IWorkItemResult&lt;TResult&gt; object. 
+        /// its GetResult() returns a TResult object</returns>
+        IWorkItemResult<TResult> QueueWorkItem<T1, T2, TResult>(Func<T1, T2, TResult> func, T1 arg1, T2 arg2);
 
         /// <summary>
-        /// Get the result of the work item.
-        /// If the work item didn't run yet then the caller waits until timeout or until the cancelWaitHandle is signaled.
+        /// Queue a work item.
         /// </summary>
-        /// <returns>The result of the work item</returns>
-        /// <param name="e">Filled with the exception if one was thrown</param>
-        /// On timeout throws WorkItemTimeoutException
-        /// On cancel throws WorkItemCancelException
-        object GetResult(            
-            TimeSpan timeout,
-            bool exitContext,
-            WaitHandle cancelWaitHandle,
-            out Exception e);
+        /// <returns>Returns a IWorkItemResult&lt;TResult&gt; object. 
+        /// its GetResult() returns a TResult object</returns>
+        IWorkItemResult<TResult> QueueWorkItem<T1, T2, T3, TResult>(Func<T1, T2, T3, TResult> func, T1 arg1, T2 arg2, T3 arg3);
 
         /// <summary>
-        /// Gets an indication whether the asynchronous operation has completed.
+        /// Queue a work item.
         /// </summary>
-        bool IsCompleted { get; }
+        /// <returns>Returns a IWorkItemResult&lt;TResult&gt; object. 
+        /// its GetResult() returns a TResult object</returns>
+        IWorkItemResult<TResult> QueueWorkItem<T1, T2, T3, T4, TResult>(Func<T1, T2, T3, T4, TResult> func, T1 arg1, T2 arg2, T3 arg3, T4 arg4);
+
+        #endregion
+    }
+
+        #endregion
 
+        #region CallToPostExecute enumerator
+
+        [Flags]
+        public enum CallToPostExecute
+        {
         /// <summary>
-        /// Gets an indication whether the asynchronous operation has been canceled.
+        /// Never call to the PostExecute call back
         /// </summary>
-        bool IsCanceled { get; }
+                Never                    = 0x00,
 
         /// <summary>
-        /// Gets a user-defined object that qualifies or contains information about an asynchronous operation.
+        /// Call to the PostExecute only when the work item is cancelled
         /// </summary>
-        object State { get; }
+                WhenWorkItemCanceled     = 0x01,
 
         /// <summary>
-        /// Cancel the work item if it didn't start running yet.
+        /// Call to the PostExecute only when the work item is not cancelled
         /// </summary>
-        /// <returns>Returns true on success or false if the work item is in progress or already completed</returns>
-        bool Cancel();
+                WhenWorkItemNotCanceled  = 0x02,
 
         /// <summary>
-        /// Get the work item's priority
+        /// Always call to the PostExecute
         /// </summary>
-        WorkItemPriority WorkItemPriority { get; }
+                Always                   = WhenWorkItemCanceled | WhenWorkItemNotCanceled,
+        }
+
+        #endregion
 
+        #region IWorkItemResult interface
+
+    /// <summary>
+    /// The common interface of IWorkItemResult and IWorkItemResult&lt;T&gt;
+    /// </summary>
+    public interface IWaitableResult
+    {
         /// <summary>
-        /// Return the result, same as GetResult()
+        /// This method intent is for internal use.
         /// </summary>
-        object Result { get; }
+        /// <returns></returns>
+        IWorkItemResult GetWorkItemResult();
 
         /// <summary>
-        /// Returns the exception if occured otherwise returns null.
+        /// This method intent is for internal use.
         /// </summary>
-        object Exception { get; }
+        /// <returns></returns>
+        IWorkItemResult<TResult> GetWorkItemResultT<TResult>();
     }
 
+    /// <summary>
+    /// IWorkItemResult interface.
+    /// Created when a WorkItemCallback work item is queued.
+    /// </summary>
+    public interface IWorkItemResult : IWorkItemResult<object>
+    {
+    }
+
+        /// <summary>
+    /// IWorkItemResult&lt;TResult&gt; interface.
+    /// Created when a Func&lt;TResult&gt; work item is queued.
+        /// </summary>
+    public interface IWorkItemResult<TResult> : IWaitableResult
+        {
+                /// <summary>
+                /// Get the result of the work item.
+                /// If the work item didn't run yet then the caller waits.
+                /// </summary>
+                /// <returns>The result of the work item</returns>
+        TResult GetResult();
+
+                /// <summary>
+                /// Get the result of the work item.
+                /// If the work item didn't run yet then the caller waits until timeout.
+                /// </summary>
+                /// <returns>The result of the work item</returns>
+                /// On timeout throws WorkItemTimeoutException
+        TResult GetResult(
+                        int millisecondsTimeout,
+                        bool exitContext);
+
+                /// <summary>
+                /// Get the result of the work item.
+                /// If the work item didn't run yet then the caller waits until timeout.
+                /// </summary>
+                /// <returns>The result of the work item</returns>
+                /// On timeout throws WorkItemTimeoutException
+        TResult GetResult(                      
+                        TimeSpan timeout,
+                        bool exitContext);
+
+                /// <summary>
+                /// Get the result of the work item.
+                /// If the work item didn't run yet then the caller waits until timeout or until the cancelWaitHandle is signaled.
+                /// </summary>
+                /// <param name="millisecondsTimeout">Timeout in milliseconds, or -1 for infinite</param>
+                /// <param name="exitContext">
+                /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
+                /// </param>
+                /// <param name="cancelWaitHandle">A cancel wait handle to interrupt the blocking if needed</param>
+                /// <returns>The result of the work item</returns>
+                /// On timeout throws WorkItemTimeoutException
+                /// On cancel throws WorkItemCancelException
+        TResult GetResult(                      
+                        int millisecondsTimeout,
+                        bool exitContext,
+                        WaitHandle cancelWaitHandle);
+
+                /// <summary>
+                /// Get the result of the work item.
+                /// If the work item didn't run yet then the caller waits until timeout or until the cancelWaitHandle is signaled.
+                /// </summary>
+                /// <returns>The result of the work item</returns>
+                /// On timeout throws WorkItemTimeoutException
+                /// On cancel throws WorkItemCancelException
+        TResult GetResult(                      
+                        TimeSpan timeout,
+                        bool exitContext,
+                        WaitHandle cancelWaitHandle);
+
+                /// <summary>
+                /// Get the result of the work item.
+                /// If the work item didn't run yet then the caller waits.
+                /// </summary>
+                /// <param name="e">Filled with the exception if one was thrown</param>
+                /// <returns>The result of the work item</returns>
+        TResult GetResult(out Exception e);
+
+                /// <summary>
+                /// Get the result of the work item.
+                /// If the work item didn't run yet then the caller waits until timeout.
+                /// </summary>
+                /// <param name="millisecondsTimeout"></param>
+                /// <param name="exitContext"></param>
+                /// <param name="e">Filled with the exception if one was thrown</param>
+                /// <returns>The result of the work item</returns>
+                /// On timeout throws WorkItemTimeoutException
+        TResult GetResult(
+                        int millisecondsTimeout,
+                        bool exitContext,
+                        out Exception e);
+
+                /// <summary>
+                /// Get the result of the work item.
+                /// If the work item didn't run yet then the caller waits until timeout.
+                /// </summary>
+                /// <param name="exitContext"></param>
+                /// <param name="e">Filled with the exception if one was thrown</param>
+                /// <param name="timeout"></param>
+                /// <returns>The result of the work item</returns>
+                /// On timeout throws WorkItemTimeoutException
+        TResult GetResult(                      
+                        TimeSpan timeout,
+                        bool exitContext,
+                        out Exception e);
+
+                /// <summary>
+                /// Get the result of the work item.
+                /// If the work item didn't run yet then the caller waits until timeout or until the cancelWaitHandle is signaled.
+                /// </summary>
+                /// <param name="millisecondsTimeout">Timeout in milliseconds, or -1 for infinite</param>
+                /// <param name="exitContext">
+                /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
+                /// </param>
+                /// <param name="cancelWaitHandle">A cancel wait handle to interrupt the blocking if needed</param>
+                /// <param name="e">Filled with the exception if one was thrown</param>
+                /// <returns>The result of the work item</returns>
+                /// On timeout throws WorkItemTimeoutException
+                /// On cancel throws WorkItemCancelException
+        TResult GetResult(                      
+                        int millisecondsTimeout,
+                        bool exitContext,
+                        WaitHandle cancelWaitHandle,
+                        out Exception e);
+
+                /// <summary>
+                /// Get the result of the work item.
+                /// If the work item didn't run yet then the caller waits until timeout or until the cancelWaitHandle is signaled.
+                /// </summary>
+                /// <returns>The result of the work item</returns>
+                /// <param name="cancelWaitHandle"></param>
+                /// <param name="e">Filled with the exception if one was thrown</param>
+                /// <param name="timeout"></param>
+                /// <param name="exitContext"></param>
+                /// On timeout throws WorkItemTimeoutException
+                /// On cancel throws WorkItemCancelException
+        TResult GetResult(                      
+                        TimeSpan timeout,
+                        bool exitContext,
+                        WaitHandle cancelWaitHandle,
+                        out Exception e);
+
+                /// <summary>
+                /// Gets an indication whether the asynchronous operation has completed.
+                /// </summary>
+                bool IsCompleted { get; }
+
+                /// <summary>
+                /// Gets an indication whether the asynchronous operation has been canceled.
+                /// </summary>
+                bool IsCanceled { get; }
+
+                /// <summary>
+                /// Gets the user-defined object that contains context data 
+        /// for the work item method.
+                /// </summary>
+                object State { get; }
+
+                /// <summary>
+        /// Same as Cancel(false).
+                /// </summary>
+        bool Cancel();
+
+        /// <summary>
+        /// Cancel the work item execution.
+        /// If the work item is in the queue then it won't execute
+        /// If the work item is completed, it will remain completed
+        /// If the work item is in progress then the user can check the SmartThreadPool.IsWorkItemCanceled
+        ///   property to check if the work item has been cancelled. If the abortExecution is set to true then
+        ///   the Smart Thread Pool will send an AbortException to the running thread to stop the execution 
+        ///   of the work item. When an in progress work item is canceled its GetResult will throw WorkItemCancelException.
+        /// If the work item is already cancelled it will remain cancelled
+        /// </summary>
+        /// <param name="abortExecution">When true send an AbortException to the executing thread.</param>
+        /// <returns>Returns true if the work item was not completed, otherwise false.</returns>
+        bool Cancel(bool abortExecution);
+
+                /// <summary>
+                /// Get the work item's priority
+                /// </summary>
+                WorkItemPriority WorkItemPriority { get; }
+
+                /// <summary>
+                /// Return the result, same as GetResult()
+                /// </summary>
+        TResult Result { get; }
+
+                /// <summary>
+                /// Returns the exception if occured otherwise returns null.
+                /// </summary>
+                object Exception { get; }
+        }
+
+        #endregion
+
+    #region .NET 3.5
+
+    // All these delegate are built-in .NET 3.5
+    // Comment/Remove them when compiling to .NET 3.5 to avoid ambiguity.
+
+    public delegate void Action();
+    public delegate void Action<T1, T2>(T1 arg1, T2 arg2);
+    public delegate void Action<T1, T2, T3>(T1 arg1, T2 arg2, T3 arg3);
+    public delegate void Action<T1, T2, T3, T4>(T1 arg1, T2 arg2, T3 arg3, T4 arg4);
+
+    public delegate TResult Func<TResult>();
+    public delegate TResult Func<T, TResult>(T arg1);
+    public delegate TResult Func<T1, T2, TResult>(T1 arg1, T2 arg2);
+    public delegate TResult Func<T1, T2, T3, TResult>(T1 arg1, T2 arg2, T3 arg3);
+    public delegate TResult Func<T1, T2, T3, T4, TResult>(T1 arg1, T2 arg2, T3 arg3, T4 arg4);
+
     #endregion
 }
diff --git a/ThirdParty/SmartThreadPool/InternalInterfaces.cs b/ThirdParty/SmartThreadPool/InternalInterfaces.cs
new file mode 100644
index 0000000..0072e10
--- /dev/null
+++ b/ThirdParty/SmartThreadPool/InternalInterfaces.cs
@@ -0,0 +1,27 @@
+
+namespace Amib.Threading.Internal
+{
+    /// <summary>
+    /// An internal delegate to call when the WorkItem starts or completes
+    /// </summary>
+    internal delegate void WorkItemStateCallback(WorkItem workItem);
+
+    internal interface IInternalWorkItemResult
+    {
+        event WorkItemStateCallback OnWorkItemStarted;
+        event WorkItemStateCallback OnWorkItemCompleted;
+    }
+
+    internal interface IInternalWaitableResult
+    {
+        /// <summary>
+        /// This method is intent for internal use.
+        /// </summary>   
+        IWorkItemResult GetWorkItemResult();
+    }
+
+    public interface IHasWorkItemPriority
+    {
+        WorkItemPriority WorkItemPriority { get; }
+    }
+}
diff --git a/ThirdParty/SmartThreadPool/PriorityQueue.cs b/ThirdParty/SmartThreadPool/PriorityQueue.cs
index 63d5e84..409c879 100644
--- a/ThirdParty/SmartThreadPool/PriorityQueue.cs
+++ b/ThirdParty/SmartThreadPool/PriorityQueue.cs
@@ -1,240 +1,239 @@
-// Ami Bar
-// amibar@gmail.com
-
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Diagnostics;
 
 namespace Amib.Threading.Internal
 {
-    #region PriorityQueue class
-
-    /// <summary>
-    /// PriorityQueue class
-    /// This class is not thread safe because we use external lock
-    /// </summary>
-    public sealed class PriorityQueue : IEnumerable
-    {
-        #region Private members
-
-        /// <summary>
-        /// The number of queues, there is one for each type of priority
-        /// </summary>
-        private const int _queuesCount = WorkItemPriority.Highest-WorkItemPriority.Lowest+1;
-
-        /// <summary>
-        /// Work items queues. There is one for each type of priority
-        /// </summary>
-        private Queue [] _queues = new Queue[_queuesCount];
-
-        /// <summary>
-        /// The total number of work items within the queues 
-        /// </summary>
-        private int _workItemsCount = 0;
-
-        /// <summary>
-        /// Use with IEnumerable interface
-        /// </summary>
-        private int _version = 0;
-
-        #endregion
-
-        #region Contructor
-
-        public PriorityQueue()
-        {
-            for(int i = 0; i < _queues.Length; ++i)
-            {
-                _queues[i] = new Queue();
-            }
-        }
-
-        #endregion
-
-        #region Methods
-
-        /// <summary>
-        /// Enqueue a work item.
-        /// </summary>
-        /// <param name="workItem">A work item</param>
-        public void Enqueue(IHasWorkItemPriority workItem)
-        {
-            Debug.Assert(null != workItem);
-
-            int queueIndex = _queuesCount-(int)workItem.WorkItemPriority-1;
-            Debug.Assert(queueIndex >= 0);
-            Debug.Assert(queueIndex < _queuesCount);
-
-            _queues[queueIndex].Enqueue(workItem);
-            ++_workItemsCount;
-            ++_version;
-        }
-
-        /// <summary>
-        /// Dequeque a work item.
-        /// </summary>
-        /// <returns>Returns the next work item</returns>
-        public IHasWorkItemPriority Dequeue()
-        {
-            IHasWorkItemPriority workItem = null;
-
-            if(_workItemsCount > 0)
-            {
-                int queueIndex = GetNextNonEmptyQueue(-1);
-                Debug.Assert(queueIndex >= 0);
-                workItem = _queues[queueIndex].Dequeue() as IHasWorkItemPriority;
-                Debug.Assert(null != workItem);
-                --_workItemsCount;
-                ++_version;
-            }
-
-            return workItem;
-        }
-
-        /// <summary>
-        /// Find the next non empty queue starting at queue queueIndex+1
-        /// </summary>
-        /// <param name="queueIndex">The index-1 to start from</param>
-        /// <returns>
-        /// The index of the next non empty queue or -1 if all the queues are empty
-        /// </returns>
-        private int GetNextNonEmptyQueue(int queueIndex)
-        {
-            for(int i = queueIndex+1; i < _queuesCount; ++i)
-            {
-                if(_queues[i].Count > 0)
-                {
-                    return i;
-                }
-            }
-            return -1;
-        }
-
-        /// <summary>
-        /// The number of work items 
-        /// </summary>
-        public int Count
-        {
-            get
-            {
-                return _workItemsCount;
-            }
-        }
-
-        /// <summary>
-        /// Clear all the work items 
-        /// </summary>
-        public void Clear()
-        {
-            if (_workItemsCount > 0)
-            {
-                foreach(Queue queue in _queues)
-                {
-                    queue.Clear();
-                }
-                _workItemsCount = 0;
-                ++_version;
-            }
-        }
-
-        #endregion
-
-        #region IEnumerable Members
-
-        /// <summary>
-        /// Returns an enumerator to iterate over the work items
-        /// </summary>
-        /// <returns>Returns an enumerator</returns>
-        public IEnumerator GetEnumerator()
-        {
-            return new PriorityQueueEnumerator(this);
-        }
-
-        #endregion
-
-        #region PriorityQueueEnumerator
-
-        /// <summary>
-        /// The class the implements the enumerator
-        /// </summary>
-        private class PriorityQueueEnumerator : IEnumerator
-        {
-            private PriorityQueue _priorityQueue;
-            private int _version;
-            private int _queueIndex;
-            private IEnumerator _enumerator;
-
-            public PriorityQueueEnumerator(PriorityQueue priorityQueue)
-            {
-                _priorityQueue = priorityQueue;
-                _version = _priorityQueue._version;
-                _queueIndex = _priorityQueue.GetNextNonEmptyQueue(-1);
-                if (_queueIndex >= 0)
-                {
-                    _enumerator = _priorityQueue._queues[_queueIndex].GetEnumerator();
-                }
-                else
-                {
-                    _enumerator = null;
-                }
-            }
-
-            #region IEnumerator Members
-
-            public void Reset()
-            {
-                _version = _priorityQueue._version;
-                _queueIndex = _priorityQueue.GetNextNonEmptyQueue(-1);
-                if (_queueIndex >= 0)
-                {
-                    _enumerator = _priorityQueue._queues[_queueIndex].GetEnumerator();
-                }
-                else
-                {
-                    _enumerator = null;
-                }
-            }
-
-            public object Current
-            {
-                get
-                {
-                    Debug.Assert(null != _enumerator);
-                    return _enumerator.Current;
-                }
-            }
-
-            public bool MoveNext()
-            {
-                if (null == _enumerator)
-                {
-                    return false;
-                }
-
-                if(_version != _priorityQueue._version)
-                {
-                    throw new InvalidOperationException("The collection has been modified");
-
-                }
-                if (!_enumerator.MoveNext())
-                {
-                    _queueIndex = _priorityQueue.GetNextNonEmptyQueue(_queueIndex);
-                    if(-1 == _queueIndex)
-                    {
-                        return false;
-                    }
-                    _enumerator = _priorityQueue._queues[_queueIndex].GetEnumerator();
-                    _enumerator.MoveNext();
-                    return true;
-                }
-                return true;
-            }
-
-            #endregion
-        }
-
-        #endregion
-    }
-
-    #endregion
+        #region PriorityQueue class
+
+        /// <summary>
+        /// PriorityQueue class
+        /// This class is not thread safe because we use external lock
+        /// </summary>
+        public sealed class PriorityQueue : IEnumerable
+        {
+                #region Private members
+
+                /// <summary>
+                /// The number of queues, there is one for each type of priority
+                /// </summary>
+                private const int _queuesCount = WorkItemPriority.Highest-WorkItemPriority.Lowest+1;
+
+                /// <summary>
+                /// Work items queues. There is one for each type of priority
+                /// </summary>
+        private readonly LinkedList<IHasWorkItemPriority>[] _queues = new LinkedList<IHasWorkItemPriority>[_queuesCount];
+
+                /// <summary>
+                /// The total number of work items within the queues 
+                /// </summary>
+                private int _workItemsCount;
+
+                /// <summary>
+                /// Use with IEnumerable interface
+                /// </summary>
+                private int _version;
+
+                #endregion
+
+                #region Contructor
+
+                public PriorityQueue()
+                {
+                        for(int i = 0; i < _queues.Length; ++i)
+                        {
+                _queues[i] = new LinkedList<IHasWorkItemPriority>();
+                        }
+                }
+
+                #endregion
+
+                #region Methods
+
+                /// <summary>
+                /// Enqueue a work item.
+                /// </summary>
+                /// <param name="workItem">A work item</param>
+                public void Enqueue(IHasWorkItemPriority workItem)
+                {
+                        Debug.Assert(null != workItem);
+
+                        int queueIndex = _queuesCount-(int)workItem.WorkItemPriority-1;
+                        Debug.Assert(queueIndex >= 0);
+                        Debug.Assert(queueIndex < _queuesCount);
+
+                        _queues[queueIndex].AddLast(workItem);
+                        ++_workItemsCount;
+                        ++_version;
+                }
+
+                /// <summary>
+                /// Dequeque a work item.
+                /// </summary>
+                /// <returns>Returns the next work item</returns>
+                public IHasWorkItemPriority Dequeue()
+                {
+                        IHasWorkItemPriority workItem = null;
+
+                        if(_workItemsCount > 0)
+                        {
+                                int queueIndex = GetNextNonEmptyQueue(-1);
+                                Debug.Assert(queueIndex >= 0);
+                workItem = _queues[queueIndex].First.Value;
+                                _queues[queueIndex].RemoveFirst();
+                                Debug.Assert(null != workItem);
+                                --_workItemsCount;
+                                ++_version;
+                        }
+
+                        return workItem;
+                }
+
+                /// <summary>
+                /// Find the next non empty queue starting at queue queueIndex+1
+                /// </summary>
+                /// <param name="queueIndex">The index-1 to start from</param>
+                /// <returns>
+                /// The index of the next non empty queue or -1 if all the queues are empty
+                /// </returns>
+                private int GetNextNonEmptyQueue(int queueIndex)
+                {
+                        for(int i = queueIndex+1; i < _queuesCount; ++i)
+                        {
+                                if(_queues[i].Count > 0)
+                                {
+                                        return i;
+                                }
+                        }
+                        return -1;
+                }
+
+                /// <summary>
+                /// The number of work items 
+                /// </summary>
+                public int Count
+                {
+                        get
+                        {
+                                return _workItemsCount;
+                        }
+                }
+
+                /// <summary>
+                /// Clear all the work items 
+                /// </summary>
+                public void Clear()
+                {
+                        if (_workItemsCount > 0)
+                        {
+                                foreach(LinkedList<IHasWorkItemPriority> queue in _queues)
+                                {
+                                        queue.Clear();
+                                }
+                                _workItemsCount = 0;
+                                ++_version;
+                        }
+                }
+
+                #endregion
+
+                #region IEnumerable Members
+
+                /// <summary>
+                /// Returns an enumerator to iterate over the work items
+                /// </summary>
+                /// <returns>Returns an enumerator</returns>
+                public IEnumerator GetEnumerator()
+                {
+                        return new PriorityQueueEnumerator(this);
+                }
+
+                #endregion
+
+                #region PriorityQueueEnumerator
+
+                /// <summary>
+                /// The class the implements the enumerator
+                /// </summary>
+                private class PriorityQueueEnumerator : IEnumerator
+                {
+                        private readonly PriorityQueue _priorityQueue;
+                        private int _version;
+                        private int _queueIndex;
+                        private IEnumerator _enumerator;
+
+                        public PriorityQueueEnumerator(PriorityQueue priorityQueue)
+                        {
+                                _priorityQueue = priorityQueue;
+                                _version = _priorityQueue._version;
+                                _queueIndex = _priorityQueue.GetNextNonEmptyQueue(-1);
+                                if (_queueIndex >= 0)
+                                {
+                                        _enumerator = _priorityQueue._queues[_queueIndex].GetEnumerator();
+                                }
+                                else
+                                {
+                                        _enumerator = null;
+                                }
+                        }
+
+                        #region IEnumerator Members
+
+                        public void Reset()
+                        {
+                                _version = _priorityQueue._version;
+                                _queueIndex = _priorityQueue.GetNextNonEmptyQueue(-1);
+                                if (_queueIndex >= 0)
+                                {
+                                        _enumerator = _priorityQueue._queues[_queueIndex].GetEnumerator();
+                                }
+                                else
+                                {
+                                        _enumerator = null;
+                                }
+                        }
+
+                        public object Current
+                        {
+                                get
+                                {
+                                        Debug.Assert(null != _enumerator);
+                                        return _enumerator.Current;
+                                }
+                        }
+
+                        public bool MoveNext()
+                        {
+                                if (null == _enumerator)
+                                {
+                                        return false;
+                                }
+
+                                if(_version != _priorityQueue._version)
+                                {
+                                        throw new InvalidOperationException("The collection has been modified");
+
+                                }
+                                if (!_enumerator.MoveNext())
+                                {
+                                        _queueIndex = _priorityQueue.GetNextNonEmptyQueue(_queueIndex);
+                                        if(-1 == _queueIndex)
+                                        {
+                                                return false;
+                                        }
+                                        _enumerator = _priorityQueue._queues[_queueIndex].GetEnumerator();
+                                        _enumerator.MoveNext();
+                                        return true;
+                                }
+                                return true;
+                        }
+
+                        #endregion
+                }
+
+                #endregion
+        }
+
+        #endregion
 }
diff --git a/ThirdParty/SmartThreadPool/Properties/AssemblyInfo.cs b/ThirdParty/SmartThreadPool/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..4728c1f
--- /dev/null
+++ b/ThirdParty/SmartThreadPool/Properties/AssemblyInfo.cs
@@ -0,0 +1,23 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Amib.Threading")]
+[assembly: AssemblyDescription("Smart Thread Pool")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Amib.Threading")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: ComVisible(false)]
+[assembly: Guid("c764a3de-c4f8-434d-85b5-a09830d1e44f")]
+[assembly: AssemblyVersion("2.2.3.0")]
+
+#if (_PUBLISH)
+[assembly: InternalsVisibleTo("STPTests,PublicKey=00240000048000009400000006020000002400005253413100040000010001004fe3d39add741ba7c8d52cd1eb0d94c7d79060ad956cbaff0e51c1dce94db10356b261778bc1ac3114b3218434da6fcd8416dd5507653809598f7d2afc422099ce4f6b7b0477f18e6c57c727ef2a7ab6ee56e6b4589fe44cb0e25f2875a3c65ab0383ee33c4dd93023f7ce1218bebc8b7a9a1dac878938f5c4f45ea74b6bd8ad")]
+#else
+[assembly: InternalsVisibleTo("STPTests")]
+#endif
+
+
diff --git a/ThirdParty/SmartThreadPool/SLExt.cs b/ThirdParty/SmartThreadPool/SLExt.cs
new file mode 100644
index 0000000..23a60bc
--- /dev/null
+++ b/ThirdParty/SmartThreadPool/SLExt.cs
@@ -0,0 +1,16 @@
+#if _SILVERLIGHT
+
+using System.Threading;
+
+namespace Amib.Threading
+{
+    public enum ThreadPriority
+    {
+        Lowest,
+        BelowNormal,
+        Normal,
+        AboveNormal,
+        Highest,
+    }
+}
+#endif
diff --git a/ThirdParty/SmartThreadPool/STPEventWaitHandle.cs b/ThirdParty/SmartThreadPool/STPEventWaitHandle.cs
new file mode 100644
index 0000000..9b17f69
--- /dev/null
+++ b/ThirdParty/SmartThreadPool/STPEventWaitHandle.cs
@@ -0,0 +1,62 @@
+#if !(_WINDOWS_CE)
+
+using System;
+using System.Threading;
+
+namespace Amib.Threading.Internal
+{
+#if _WINDOWS ||  WINDOWS_PHONE
+    internal static class STPEventWaitHandle
+    {
+        public const int WaitTimeout = Timeout.Infinite;
+
+        internal static bool WaitAll(WaitHandle[] waitHandles, int millisecondsTimeout, bool exitContext)
+        {
+            return WaitHandle.WaitAll(waitHandles, millisecondsTimeout);
+        }
+
+        internal static int WaitAny(WaitHandle[] waitHandles)
+        {
+            return WaitHandle.WaitAny(waitHandles);
+        }
+
+        internal static int WaitAny(WaitHandle[] waitHandles, int millisecondsTimeout, bool exitContext)
+        {
+            return WaitHandle.WaitAny(waitHandles, millisecondsTimeout);
+        }
+
+        internal static bool WaitOne(WaitHandle waitHandle, int millisecondsTimeout, bool exitContext)
+        {
+            return waitHandle.WaitOne(millisecondsTimeout);
+        }
+    }
+#else
+    internal static class STPEventWaitHandle
+    {
+        public const int WaitTimeout = Timeout.Infinite;
+
+        internal static bool WaitAll(WaitHandle[] waitHandles, int millisecondsTimeout, bool exitContext)
+        {
+            return WaitHandle.WaitAll(waitHandles, millisecondsTimeout, exitContext);
+        }
+
+        internal static int WaitAny(WaitHandle[] waitHandles)
+        {
+            return WaitHandle.WaitAny(waitHandles);
+        }
+
+        internal static int WaitAny(WaitHandle[] waitHandles, int millisecondsTimeout, bool exitContext)
+        {
+            return WaitHandle.WaitAny(waitHandles, millisecondsTimeout, exitContext);
+        }
+
+        internal static bool WaitOne(WaitHandle waitHandle, int millisecondsTimeout, bool exitContext)
+        {
+            return waitHandle.WaitOne(millisecondsTimeout, exitContext);
+        }
+    }
+#endif
+
+}
+
+#endif
\ No newline at end of file
diff --git a/ThirdParty/SmartThreadPool/STPPerformanceCounter.cs b/ThirdParty/SmartThreadPool/STPPerformanceCounter.cs
index 077cf17..0663d1d 100644
--- a/ThirdParty/SmartThreadPool/STPPerformanceCounter.cs
+++ b/ThirdParty/SmartThreadPool/STPPerformanceCounter.cs
@@ -1,354 +1,448 @@
 using System;
 using System.Diagnostics;
+using System.Threading;
+
+namespace Amib.Threading
+{
+    public interface ISTPPerformanceCountersReader
+    {
+        long InUseThreads { get; }
+        long ActiveThreads { get; }
+        long WorkItemsQueued { get; }
+        long WorkItemsProcessed { get; }
+    }
+}
 
 namespace Amib.Threading.Internal
 {
-    internal enum STPPerformanceCounterType
+    internal interface ISTPInstancePerformanceCounters : IDisposable
     {
-        // Fields
-        ActiveThreads                = 0,
-        InUseThreads                = 1,
-        OverheadThreads                = 2,
-        OverheadThreadsPercent        = 3,
-        OverheadThreadsPercentBase    = 4,
+        void Close();
+        void SampleThreads(long activeThreads, long inUseThreads);
+        void SampleWorkItems(long workItemsQueued, long workItemsProcessed);
+        void SampleWorkItemsWaitTime(TimeSpan workItemWaitTime);
+        void SampleWorkItemsProcessTime(TimeSpan workItemProcessTime);
+    }
+#if !(_WINDOWS_CE) && !(_SILVERLIGHT) && !(WINDOWS_PHONE)
 
-        WorkItems                    = 5,
-        WorkItemsInQueue            = 6,
-        WorkItemsProcessed            = 7,
+    internal enum STPPerformanceCounterType
+        {
+                // Fields
+                ActiveThreads                           = 0,
+                InUseThreads                            = 1,
+                OverheadThreads                         = 2,
+                OverheadThreadsPercent          = 3,
+                OverheadThreadsPercentBase      = 4,
 
-        WorkItemsQueuedPerSecond    = 8,
-        WorkItemsProcessedPerSecond    = 9,
+                WorkItems                                       = 5,
+                WorkItemsInQueue                        = 6,
+                WorkItemsProcessed                      = 7,
 
-        AvgWorkItemWaitTime            = 10,
-        AvgWorkItemWaitTimeBase        = 11,
+                WorkItemsQueuedPerSecond        = 8,
+                WorkItemsProcessedPerSecond     = 9,
 
-        AvgWorkItemProcessTime        = 12,
-        AvgWorkItemProcessTimeBase    = 13,
+                AvgWorkItemWaitTime                     = 10,
+                AvgWorkItemWaitTimeBase         = 11,
 
-        WorkItemsGroups                = 14,
+                AvgWorkItemProcessTime          = 12,
+                AvgWorkItemProcessTimeBase      = 13,
 
-        LastCounter                    = 14,
-    }
- 
+                WorkItemsGroups                         = 14,
 
-    /// <summary>
-    /// Summary description for STPPerformanceCounter.
-    /// </summary>
-    internal class STPPerformanceCounter
-    {
-        // Fields
-        private PerformanceCounterType _pcType;
-        protected string _counterHelp;
-        protected string _counterName;
-
-        // Methods
-        public STPPerformanceCounter(
-            string counterName, 
-            string counterHelp, 
-            PerformanceCounterType pcType)
-        {
-            this._counterName = counterName;
-            this._counterHelp = counterHelp;
-            this._pcType = pcType;
-        }
-
-        public void AddCounterToCollection(CounterCreationDataCollection counterData)
-        {
-            CounterCreationData counterCreationData = new CounterCreationData(
-                _counterName, 
-                _counterHelp, 
-                _pcType);
+                LastCounter                                     = 14,
+        }
+ 
 
-            counterData.Add(counterCreationData);
-        }
+        /// <summary>
+        /// Summary description for STPPerformanceCounter.
+        /// </summary>
+        internal class STPPerformanceCounter
+        {
+                // Fields
+                private readonly PerformanceCounterType _pcType;
+                protected string _counterHelp;
+                protected string _counterName;
+
+                // Methods
+                public STPPerformanceCounter(
+                        string counterName, 
+                        string counterHelp, 
+                        PerformanceCounterType pcType)
+                {
+                        _counterName = counterName;
+                        _counterHelp = counterHelp;
+                        _pcType = pcType;
+                }
+
+                public void AddCounterToCollection(CounterCreationDataCollection counterData)
+                {
+                        CounterCreationData counterCreationData = new CounterCreationData(
+                                _counterName, 
+                                _counterHelp, 
+                                _pcType);
+
+                        counterData.Add(counterCreationData);
+                }
+ 
+                // Properties
+                public string Name
+                {
+                        get
+                        {
+                                return _counterName;
+                        }
+                }
+        }
+
+        internal class STPPerformanceCounters
+        {
+                // Fields
+                internal STPPerformanceCounter[] _stpPerformanceCounters;
+                private static readonly STPPerformanceCounters _instance;
+                internal const string _stpCategoryHelp = "SmartThreadPool performance counters";
+                internal const string _stpCategoryName = "SmartThreadPool";
+
+                // Methods
+                static STPPerformanceCounters()
+                {
+                        _instance = new STPPerformanceCounters();
+                }
+ 
+                private STPPerformanceCounters()
+                {
+                        STPPerformanceCounter[] stpPerformanceCounters = new STPPerformanceCounter[] 
+                                { 
+                                        new STPPerformanceCounter("Active threads", "The current number of available in the thread pool.", PerformanceCounterType.NumberOfItems32), 
+                                        new STPPerformanceCounter("In use threads", "The current number of threads that execute a work item.", PerformanceCounterType.NumberOfItems32), 
+                                        new STPPerformanceCounter("Overhead threads", "The current number of threads that are active, but are not in use.", PerformanceCounterType.NumberOfItems32), 
+                                        new STPPerformanceCounter("% overhead threads", "The current number of threads that are active, but are not in use in percents.", PerformanceCounterType.RawFraction), 
+                                        new STPPerformanceCounter("% overhead threads base", "The current number of threads that are active, but are not in use in percents.", PerformanceCounterType.RawBase), 
+
+                                        new STPPerformanceCounter("Work Items", "The number of work items in the Smart Thread Pool. Both queued and processed.", PerformanceCounterType.NumberOfItems32), 
+                                        new STPPerformanceCounter("Work Items in queue", "The current number of work items in the queue", PerformanceCounterType.NumberOfItems32), 
+                                        new STPPerformanceCounter("Work Items processed", "The number of work items already processed", PerformanceCounterType.NumberOfItems32), 
+
+                                        new STPPerformanceCounter("Work Items queued/sec", "The number of work items queued per second", PerformanceCounterType.RateOfCountsPerSecond32), 
+                                        new STPPerformanceCounter("Work Items processed/sec", "The number of work items processed per second", PerformanceCounterType.RateOfCountsPerSecond32), 
+
+                                        new STPPerformanceCounter("Avg. Work Item wait time/sec", "The average time a work item supends in the queue waiting for its turn to execute.", PerformanceCounterType.AverageCount64), 
+                                        new STPPerformanceCounter("Avg. Work Item wait time base", "The average time a work item supends in the queue waiting for its turn to execute.", PerformanceCounterType.AverageBase), 
+
+                                        new STPPerformanceCounter("Avg. Work Item process time/sec", "The average time it takes to process a work item.", PerformanceCounterType.AverageCount64), 
+                                        new STPPerformanceCounter("Avg. Work Item process time base", "The average time it takes to process a work item.", PerformanceCounterType.AverageBase), 
+
+                                        new STPPerformanceCounter("Work Items Groups", "The current number of work item groups associated with the Smart Thread Pool.", PerformanceCounterType.NumberOfItems32), 
+                                };
+
+                        _stpPerformanceCounters = stpPerformanceCounters;
+                        SetupCategory();
+                }
+ 
+                private void SetupCategory()
+                {
+                        if (!PerformanceCounterCategory.Exists(_stpCategoryName))
+                        {
+                                CounterCreationDataCollection counters = new CounterCreationDataCollection();
+
+                                for (int i = 0; i < _stpPerformanceCounters.Length; i++)
+                                {
+                                        _stpPerformanceCounters[i].AddCounterToCollection(counters);
+                                }
+
+                                PerformanceCounterCategory.Create(
+                                        _stpCategoryName, 
+                                        _stpCategoryHelp, 
+                    PerformanceCounterCategoryType.MultiInstance,
+                                        counters);
+                                        
+                        }
+                }
  
-        // Properties
-        public string Name
+                // Properties
+                public static STPPerformanceCounters Instance
+                {
+                        get
+                        {
+                                return _instance;
+                        }
+                }
+        }
+
+        internal class STPInstancePerformanceCounter : IDisposable
+        {
+                // Fields
+        private bool _isDisposed;
+                private PerformanceCounter _pcs;
+
+                // Methods
+                protected STPInstancePerformanceCounter()
+                {
+            _isDisposed = false;
+                }
+
+                public STPInstancePerformanceCounter(
+                        string instance, 
+                        STPPerformanceCounterType spcType) : this()
+                {
+                        STPPerformanceCounters counters = STPPerformanceCounters.Instance;
+                        _pcs = new PerformanceCounter(
+                                STPPerformanceCounters._stpCategoryName, 
+                                counters._stpPerformanceCounters[(int) spcType].Name, 
+                                instance, 
+                                false);
+                        _pcs.RawValue = _pcs.RawValue;
+                }
+
+
+                public void Close()
+                {
+                        if (_pcs != null)
+                        {
+                                _pcs.RemoveInstance();
+                                _pcs.Close();
+                                _pcs = null;
+                        }
+                }
+ 
+                public void Dispose()
+                {
+            Dispose(true);
+                }
+
+        public virtual void Dispose(bool disposing)
         {
-            get
+            if (!_isDisposed)
             {
-                return _counterName;
+                if (disposing)
+                {
+                    Close();
+                }
             }
-        }
-    }
-
-    internal class STPPerformanceCounters
-    {
-        // Fields
-        internal STPPerformanceCounter[] _stpPerformanceCounters;
-        private static STPPerformanceCounters _instance;
-        internal const string _stpCategoryHelp = "SmartThreadPool performance counters";
-        internal const string _stpCategoryName = "SmartThreadPool";
-
-        // Methods
-        static STPPerformanceCounters()
-        {
-            _instance = new STPPerformanceCounters();
+            _isDisposed = true;
         }
  
-        private STPPerformanceCounters()
-        {
-            STPPerformanceCounter[] stpPerformanceCounters = new STPPerformanceCounter[] 
-                { 
-                    new STPPerformanceCounter("Active threads", "The current number of available in the thread pool.", PerformanceCounterType.NumberOfItems32), 
-                    new STPPerformanceCounter("In use threads", "The current number of threads that execute a work item.", PerformanceCounterType.NumberOfItems32), 
-                    new STPPerformanceCounter("Overhead threads", "The current number of threads that are active, but are not in use.", PerformanceCounterType.NumberOfItems32), 
-                    new STPPerformanceCounter("% overhead threads", "The current number of threads that are active, but are not in use in percents.", PerformanceCounterType.RawFraction), 
-                    new STPPerformanceCounter("% overhead threads base", "The current number of threads that are active, but are not in use in percents.", PerformanceCounterType.RawBase), 
-
-                    new STPPerformanceCounter("Work Items", "The number of work items in the Smart Thread Pool. Both queued and processed.", PerformanceCounterType.NumberOfItems32), 
-                    new STPPerformanceCounter("Work Items in queue", "The current number of work items in the queue", PerformanceCounterType.NumberOfItems32), 
-                    new STPPerformanceCounter("Work Items processed", "The number of work items already processed", PerformanceCounterType.NumberOfItems32), 
-
-                    new STPPerformanceCounter("Work Items queued/sec", "The number of work items queued per second", PerformanceCounterType.RateOfCountsPerSecond32), 
-                    new STPPerformanceCounter("Work Items processed/sec", "The number of work items processed per second", PerformanceCounterType.RateOfCountsPerSecond32), 
-
-                    new STPPerformanceCounter("Avg. Work Item wait time/sec", "The average time a work item supends in the queue waiting for its turn to execute.", PerformanceCounterType.AverageCount64), 
-                    new STPPerformanceCounter("Avg. Work Item wait time base", "The average time a work item supends in the queue waiting for its turn to execute.", PerformanceCounterType.AverageBase), 
+                public virtual void Increment()
+                {
+                        _pcs.Increment();
+                }
+ 
+                public virtual void IncrementBy(long val)
+                {
+                        _pcs.IncrementBy(val);
+                }
+
+                public virtual void Set(long val)
+                {
+                        _pcs.RawValue = val;
+                }
+        }
+
+        internal class STPInstanceNullPerformanceCounter : STPInstancePerformanceCounter
+        {
+                // Methods
+                public override void Increment() {}
+                public override void IncrementBy(long value) {}
+                public override void Set(long val) {}
+        }
+
+
+
+        internal class STPInstancePerformanceCounters : ISTPInstancePerformanceCounters
+        {
+        private bool _isDisposed;
+                // Fields
+                private STPInstancePerformanceCounter[] _pcs;
+                private static readonly STPInstancePerformanceCounter _stpInstanceNullPerformanceCounter;
+
+                // Methods
+                static STPInstancePerformanceCounters()
+                {
+                        _stpInstanceNullPerformanceCounter = new STPInstanceNullPerformanceCounter();
+                }
+ 
+                public STPInstancePerformanceCounters(string instance)
+                {
+            _isDisposed = false;
+                        _pcs = new STPInstancePerformanceCounter[(int)STPPerformanceCounterType.LastCounter];
+
+            // Call the STPPerformanceCounters.Instance so the static constructor will
+            // intialize the STPPerformanceCounters singleton.
+                        STPPerformanceCounters.Instance.GetHashCode();
+
+                        for (int i = 0; i < _pcs.Length; i++)
+                        {
+                                if (instance != null)
+                                {
+                                        _pcs[i] = new STPInstancePerformanceCounter(
+                                                instance, 
+                                                (STPPerformanceCounterType) i);
+                                }
+                                else
+                                {
+                                        _pcs[i] = _stpInstanceNullPerformanceCounter;
+                                }
+                        }
+                }
+ 
 
-                    new STPPerformanceCounter("Avg. Work Item process time/sec", "The average time it takes to process a work item.", PerformanceCounterType.AverageCount64), 
-                    new STPPerformanceCounter("Avg. Work Item process time base", "The average time it takes to process a work item.", PerformanceCounterType.AverageBase), 
+                public void Close()
+                {
+                        if (null != _pcs)
+                        {
+                                for (int i = 0; i < _pcs.Length; i++)
+                                {
+                    if (null != _pcs[i])
+                    {
+                        _pcs[i].Dispose();
+                    }
+                                }
+                                _pcs = null;
+                        }
+                }
 
-                    new STPPerformanceCounter("Work Items Groups", "The current number of work item groups associated with the Smart Thread Pool.", PerformanceCounterType.NumberOfItems32), 
-                };
+                public void Dispose()
+                {
+            Dispose(true);
+                }
 
-            _stpPerformanceCounters = stpPerformanceCounters;
-            SetupCategory();
-        }
- 
-        private void SetupCategory()
+        public virtual void Dispose(bool disposing)
         {
-            if (!PerformanceCounterCategory.Exists(_stpCategoryName))
+            if (!_isDisposed)
             {
-                CounterCreationDataCollection counters = new CounterCreationDataCollection();
-
-                for (int i = 0; i < _stpPerformanceCounters.Length; i++)
+                if (disposing)
                 {
-                    _stpPerformanceCounters[i].AddCounterToCollection(counters);
+                    Close();
                 }
-
-
-                // *********** Remark for .NET 2.0 ***********
-                // If you are here, it means you got the warning that this overload
-                // of the method is deprecated in .NET 2.0. To use the correct 
-                // method overload, uncomment the third argument of
-                // the method.
-                #pragma warning disable 0618
-                PerformanceCounterCategory.Create(
-                    _stpCategoryName, 
-                    _stpCategoryHelp, 
-                    //PerformanceCounterCategoryType.MultiInstance,
-                    counters);
-                #pragma warning restore 0618
             }
+            _isDisposed = true;
         }
  
-        // Properties
-        public static STPPerformanceCounters Instance
-        {
-            get
-            {
-                return _instance;
-            }
-        }
-     }
+                private STPInstancePerformanceCounter GetCounter(STPPerformanceCounterType spcType)
+                {
+                        return _pcs[(int) spcType];
+                }
+
+                public void SampleThreads(long activeThreads, long inUseThreads)
+                {
+                        GetCounter(STPPerformanceCounterType.ActiveThreads).Set(activeThreads);
+                        GetCounter(STPPerformanceCounterType.InUseThreads).Set(inUseThreads);
+                        GetCounter(STPPerformanceCounterType.OverheadThreads).Set(activeThreads-inUseThreads);
+
+                        GetCounter(STPPerformanceCounterType.OverheadThreadsPercentBase).Set(activeThreads-inUseThreads);
+                        GetCounter(STPPerformanceCounterType.OverheadThreadsPercent).Set(inUseThreads);
+                }
+
+                public void SampleWorkItems(long workItemsQueued, long workItemsProcessed)
+                {
+                        GetCounter(STPPerformanceCounterType.WorkItems).Set(workItemsQueued+workItemsProcessed);
+                        GetCounter(STPPerformanceCounterType.WorkItemsInQueue).Set(workItemsQueued);
+                        GetCounter(STPPerformanceCounterType.WorkItemsProcessed).Set(workItemsProcessed);
+
+                        GetCounter(STPPerformanceCounterType.WorkItemsQueuedPerSecond).Set(workItemsQueued);
+                        GetCounter(STPPerformanceCounterType.WorkItemsProcessedPerSecond).Set(workItemsProcessed);
+                }
+
+                public void SampleWorkItemsWaitTime(TimeSpan workItemWaitTime)
+                {
+                        GetCounter(STPPerformanceCounterType.AvgWorkItemWaitTime).IncrementBy((long)workItemWaitTime.TotalMilliseconds);
+                        GetCounter(STPPerformanceCounterType.AvgWorkItemWaitTimeBase).Increment();
+                }
+
+                public void SampleWorkItemsProcessTime(TimeSpan workItemProcessTime)
+                {
+                        GetCounter(STPPerformanceCounterType.AvgWorkItemProcessTime).IncrementBy((long)workItemProcessTime.TotalMilliseconds);
+                        GetCounter(STPPerformanceCounterType.AvgWorkItemProcessTimeBase).Increment();
+                }
+    }
+#endif
 
-    internal class STPInstancePerformanceCounter : IDisposable
-    {
-        // Fields
-        private PerformanceCounter _pcs;
+    internal class NullSTPInstancePerformanceCounters : ISTPInstancePerformanceCounters, ISTPPerformanceCountersReader
+        {
+                private static readonly NullSTPInstancePerformanceCounters _instance = new NullSTPInstancePerformanceCounters();
 
-        // Methods
-        protected STPInstancePerformanceCounter()
-        {
-        }
+                public static NullSTPInstancePerformanceCounters Instance
+                {
+                        get { return _instance; }
+                }
 
-        public STPInstancePerformanceCounter(
-            string instance, 
-            STPPerformanceCounterType spcType)
+                public void Close() {}
+                public void Dispose() {}
+ 
+                public void SampleThreads(long activeThreads, long inUseThreads) {}
+                public void SampleWorkItems(long workItemsQueued, long workItemsProcessed) {}
+                public void SampleWorkItemsWaitTime(TimeSpan workItemWaitTime) {}
+                public void SampleWorkItemsProcessTime(TimeSpan workItemProcessTime) {}
+        public long InUseThreads
         {
-            STPPerformanceCounters counters = STPPerformanceCounters.Instance;
-            _pcs = new PerformanceCounter(
-                STPPerformanceCounters._stpCategoryName, 
-                counters._stpPerformanceCounters[(int) spcType].Name, 
-                instance, 
-                false);
-            _pcs.RawValue = _pcs.RawValue;
+            get { return 0; }
         }
 
-        ~STPInstancePerformanceCounter()
+        public long ActiveThreads
         {
-            Close();
+            get { return 0; }
         }
 
-        public void Close()
-        {
-            if (_pcs != null)
-            {
-                _pcs.RemoveInstance();
-                _pcs.Close();
-                _pcs = null;
-            }
-        }
- 
-        public void Dispose()
+        public long WorkItemsQueued
         {
-            Close();
-            GC.SuppressFinalize(this);
-        }
- 
-        public virtual void Increment()
-        {
-            _pcs.Increment();
-        }
- 
-        public virtual void IncrementBy(long val)
-        {
-            _pcs.IncrementBy(val);
+            get { return 0; }
         }
 
-        public virtual void Set(long val)
+        public long WorkItemsProcessed
         {
-            _pcs.RawValue = val;
+            get { return 0; }
         }
-    }
+        }
 
-    internal class STPInstanceNullPerformanceCounter : STPInstancePerformanceCounter
+    internal class LocalSTPInstancePerformanceCounters : ISTPInstancePerformanceCounters, ISTPPerformanceCountersReader
     {
-        // Methods
-        public STPInstanceNullPerformanceCounter() {}
-        public override void Increment() {}
-        public override void IncrementBy(long value) {}
-        public override void Set(long val) {}
-    }
-        
-    internal interface ISTPInstancePerformanceCounters : IDisposable
-    {
-        void Close();
-        void SampleThreads(long activeThreads, long inUseThreads);
-        void SampleWorkItems(long workItemsQueued, long workItemsProcessed);
-        void SampleWorkItemsWaitTime(TimeSpan workItemWaitTime);
-        void SampleWorkItemsProcessTime(TimeSpan workItemProcessTime);
-    }
+        public void Close() { }
+        public void Dispose() { }
 
+        private long _activeThreads;
+        private long _inUseThreads;
+        private long _workItemsQueued;
+        private long _workItemsProcessed;
 
-    internal class STPInstancePerformanceCounters : ISTPInstancePerformanceCounters, IDisposable
-    {
-        // Fields
-        private STPInstancePerformanceCounter[] _pcs;
-        private static STPInstancePerformanceCounter _stpInstanceNullPerformanceCounter;
-
-        // Methods
-        static STPInstancePerformanceCounters()
+        public long InUseThreads
         {
-            _stpInstanceNullPerformanceCounter = new STPInstanceNullPerformanceCounter();
-        }
- 
-        public STPInstancePerformanceCounters(string instance)
-        {
-            _pcs = new STPInstancePerformanceCounter[(int)STPPerformanceCounterType.LastCounter];
-            // STPPerformanceCounters counters = STPPerformanceCounters.Instance;
-            for (int i = 0; i < _pcs.Length; i++)
-            {
-                if (instance != null)
-                {
-                    _pcs[i] = new STPInstancePerformanceCounter(
-                        instance, 
-                        (STPPerformanceCounterType) i);
-                }
-                else
-                {
-                    _pcs[i] = _stpInstanceNullPerformanceCounter;
-                }
-            }
+            get { return _inUseThreads; }
         }
- 
 
-        public void Close()
+        public long ActiveThreads
         {
-            if (null != _pcs)
-            {
-                for (int i = 0; i < _pcs.Length; i++)
-                {
-                    if (null != _pcs[i])
-                    {
-                        _pcs[i].Close();
-                    }
-                }
-                _pcs = null;
-            }
+            get { return _activeThreads; }
         }
 
-        ~STPInstancePerformanceCounters()
+        public long WorkItemsQueued
         {
-            Close();
+            get { return _workItemsQueued; }
         }
 
-        public void Dispose()
-        {
-            Close();
-            GC.SuppressFinalize(this);
-        }
- 
-        private STPInstancePerformanceCounter GetCounter(STPPerformanceCounterType spcType)
+        public long WorkItemsProcessed
         {
-            return _pcs[(int) spcType];
+            get { return _workItemsProcessed; }
         }
 
         public void SampleThreads(long activeThreads, long inUseThreads)
         {
-            GetCounter(STPPerformanceCounterType.ActiveThreads).Set(activeThreads);
-            GetCounter(STPPerformanceCounterType.InUseThreads).Set(inUseThreads);
-            GetCounter(STPPerformanceCounterType.OverheadThreads).Set(activeThreads-inUseThreads);
-
-            GetCounter(STPPerformanceCounterType.OverheadThreadsPercentBase).Set(activeThreads-inUseThreads);
-            GetCounter(STPPerformanceCounterType.OverheadThreadsPercent).Set(inUseThreads);
+            _activeThreads = activeThreads;
+            _inUseThreads = inUseThreads;
         }
 
         public void SampleWorkItems(long workItemsQueued, long workItemsProcessed)
         {
-            GetCounter(STPPerformanceCounterType.WorkItems).Set(workItemsQueued+workItemsProcessed);
-            GetCounter(STPPerformanceCounterType.WorkItemsInQueue).Set(workItemsQueued);
-            GetCounter(STPPerformanceCounterType.WorkItemsProcessed).Set(workItemsProcessed);
-
-            GetCounter(STPPerformanceCounterType.WorkItemsQueuedPerSecond).Set(workItemsQueued);
-            GetCounter(STPPerformanceCounterType.WorkItemsProcessedPerSecond).Set(workItemsProcessed);
+            _workItemsQueued = workItemsQueued;
+            _workItemsProcessed = workItemsProcessed;
         }
 
         public void SampleWorkItemsWaitTime(TimeSpan workItemWaitTime)
         {
-            GetCounter(STPPerformanceCounterType.AvgWorkItemWaitTime).IncrementBy((long)workItemWaitTime.TotalMilliseconds);
-            GetCounter(STPPerformanceCounterType.AvgWorkItemWaitTimeBase).Increment();
+            // Not supported
         }
 
         public void SampleWorkItemsProcessTime(TimeSpan workItemProcessTime)
         {
-            GetCounter(STPPerformanceCounterType.AvgWorkItemProcessTime).IncrementBy((long)workItemProcessTime.TotalMilliseconds);
-            GetCounter(STPPerformanceCounterType.AvgWorkItemProcessTimeBase).Increment();
-        }
-    }
-
-    internal class NullSTPInstancePerformanceCounters : ISTPInstancePerformanceCounters, IDisposable
-    {
-        static NullSTPInstancePerformanceCounters()
-        {
+            // Not supported
         }
-
-        private static NullSTPInstancePerformanceCounters _instance = new NullSTPInstancePerformanceCounters(null);
-
-        public static NullSTPInstancePerformanceCounters Instance
-        {
-            get { return _instance; }
-        }
-
-        public NullSTPInstancePerformanceCounters(string instance) {}
-         public void Close() {}
-        public void Dispose() {}
- 
-        public void SampleThreads(long activeThreads, long inUseThreads) {}
-        public void SampleWorkItems(long workItemsQueued, long workItemsProcessed) {}
-        public void SampleWorkItemsWaitTime(TimeSpan workItemWaitTime) {}
-        public void SampleWorkItemsProcessTime(TimeSpan workItemProcessTime) {}
     }
-
 }
diff --git a/ThirdParty/SmartThreadPool/STPStartInfo.cs b/ThirdParty/SmartThreadPool/STPStartInfo.cs
index fa9ceb4..96fa094 100644
--- a/ThirdParty/SmartThreadPool/STPStartInfo.cs
+++ b/ThirdParty/SmartThreadPool/STPStartInfo.cs
@@ -1,113 +1,212 @@
-// Ami Bar
-// amibar@gmail.com
-
+using System;
 using System.Threading;
 
 namespace Amib.Threading
 {
-    /// <summary>
-    /// Summary description for STPStartInfo.
-    /// </summary>
+        /// <summary>
+        /// Summary description for STPStartInfo.
+        /// </summary>
     public class STPStartInfo : WIGStartInfo
     {
-        /// <summary>
-        /// Idle timeout in milliseconds.
-        /// If a thread is idle for _idleTimeout milliseconds then 
-        /// it may quit.
-        /// </summary>
-        private int _idleTimeout;
-
-        /// <summary>
-        /// The lower limit of threads in the pool.
-        /// </summary>
-        private int _minWorkerThreads;
-
-        /// <summary>
-        /// The upper limit of threads in the pool.
-        /// </summary>
-        private int _maxWorkerThreads;
-
-        /// <summary>
-        /// The priority of the threads in the pool
-        /// </summary>
-        private ThreadPriority _threadPriority;
-
-        /// <summary>
-        /// The thread pool name. Threads will get names depending on this.
-        /// </summary>
-        private string _threadPoolName;
-
-        /// <summary>
-        /// If this field is not null then the performance counters are enabled
-        /// and use the string as the name of the instance.
-        /// </summary>
-        private string _pcInstanceName;
-
-        private int _stackSize;
-
-        public STPStartInfo() : base()
+        private int _idleTimeout = SmartThreadPool.DefaultIdleTimeout;
+        private int _minWorkerThreads = SmartThreadPool.DefaultMinWorkerThreads;
+        private int _maxWorkerThreads = SmartThreadPool.DefaultMaxWorkerThreads;
+#if !(WINDOWS_PHONE)
+        private ThreadPriority _threadPriority = SmartThreadPool.DefaultThreadPriority;
+#endif
+        private string _performanceCounterInstanceName = SmartThreadPool.DefaultPerformanceCounterInstanceName;
+        private bool _areThreadsBackground = SmartThreadPool.DefaultAreThreadsBackground;
+        private bool _enableLocalPerformanceCounters;
+        private string _threadPoolName = SmartThreadPool.DefaultThreadPoolName;
+        private int? _maxStackSize = SmartThreadPool.DefaultMaxStackSize;
+
+        public STPStartInfo()
         {
+            _performanceCounterInstanceName = SmartThreadPool.DefaultPerformanceCounterInstanceName;
+#if !(WINDOWS_PHONE)
+            _threadPriority = SmartThreadPool.DefaultThreadPriority;
+#endif
+            _maxWorkerThreads = SmartThreadPool.DefaultMaxWorkerThreads;
             _idleTimeout = SmartThreadPool.DefaultIdleTimeout;
             _minWorkerThreads = SmartThreadPool.DefaultMinWorkerThreads;
-            _maxWorkerThreads = SmartThreadPool.DefaultMaxWorkerThreads;
-            _threadPriority = SmartThreadPool.DefaultThreadPriority;
-            _threadPoolName = SmartThreadPool.DefaultThreadPoolName;
-            _pcInstanceName = SmartThreadPool.DefaultPerformanceCounterInstanceName;
-            _stackSize = SmartThreadPool.DefaultStackSize;
         }
 
-        public STPStartInfo(STPStartInfo stpStartInfo) : base(stpStartInfo)
+            public STPStartInfo(STPStartInfo stpStartInfo)
+            : base(stpStartInfo)
         {
-            _idleTimeout = stpStartInfo._idleTimeout;
-            _minWorkerThreads = stpStartInfo._minWorkerThreads;
-            _maxWorkerThreads = stpStartInfo._maxWorkerThreads;
-            _threadPriority = stpStartInfo._threadPriority;
+            _idleTimeout = stpStartInfo.IdleTimeout;
+            _minWorkerThreads = stpStartInfo.MinWorkerThreads;
+            _maxWorkerThreads = stpStartInfo.MaxWorkerThreads;
+#if !(WINDOWS_PHONE)
+            _threadPriority = stpStartInfo.ThreadPriority;
+#endif
+            _performanceCounterInstanceName = stpStartInfo.PerformanceCounterInstanceName;
+            _enableLocalPerformanceCounters = stpStartInfo._enableLocalPerformanceCounters;
             _threadPoolName = stpStartInfo._threadPoolName;
-            _pcInstanceName = stpStartInfo._pcInstanceName;
-            _stackSize = stpStartInfo._stackSize;
+            _areThreadsBackground = stpStartInfo.AreThreadsBackground;
+#if !(_SILVERLIGHT) && !(WINDOWS_PHONE)
+            _apartmentState = stpStartInfo._apartmentState;
+#endif
         }
-
-        public int IdleTimeout
-        {
-            get { return _idleTimeout; }
-            set { _idleTimeout = value; }
+          
+            /// <summary>
+            /// Get/Set the idle timeout in milliseconds.
+            /// If a thread is idle (starved) longer than IdleTimeout then it may quit.
+            /// </summary>
+            public virtual int IdleTimeout
+            {
+                get { return _idleTimeout; }
+                set 
+            {
+                ThrowIfReadOnly();
+                _idleTimeout = value; 
+            }
+            }
+
+
+            /// <summary>
+            /// Get/Set the lower limit of threads in the pool.
+            /// </summary>
+            public virtual int MinWorkerThreads
+            {
+                get { return _minWorkerThreads; }
+                set 
+            {
+                ThrowIfReadOnly();
+                _minWorkerThreads = value; 
+            }
+            }
+
+
+            /// <summary>
+            /// Get/Set the upper limit of threads in the pool.
+            /// </summary>
+            public virtual int MaxWorkerThreads
+            {
+                get { return _maxWorkerThreads; }
+                set 
+            {
+                ThrowIfReadOnly();
+                _maxWorkerThreads = value; 
+            }
+            }
+
+#if !(WINDOWS_PHONE)
+            /// <summary>
+            /// Get/Set the scheduling priority of the threads in the pool.
+            /// The Os handles the scheduling.
+            /// </summary>
+            public virtual ThreadPriority ThreadPriority
+            {
+                get { return _threadPriority; }
+                set 
+            {
+                ThrowIfReadOnly();
+                _threadPriority = value; 
+            }
+            }
+#endif
+        /// <summary>
+        /// Get/Set the thread pool name. Threads will get names depending on this.
+        /// </summary>
+        public virtual string ThreadPoolName {
+            get { return _threadPoolName; }
+            set
+            {
+                ThrowIfReadOnly ();
+                _threadPoolName = value;
+            }
         }
 
-        public int MinWorkerThreads
-        {
-            get { return _minWorkerThreads; }
-            set { _minWorkerThreads = value; }
-        }
+            /// <summary>
+            /// Get/Set the performance counter instance name of this SmartThreadPool
+            /// The default is null which indicate not to use performance counters at all.
+            /// </summary>
+            public virtual string PerformanceCounterInstanceName
+            {
+                get { return _performanceCounterInstanceName; }
+                set 
+            {
+                ThrowIfReadOnly();
+                _performanceCounterInstanceName = value; 
+            }
+            }
 
-        public int MaxWorkerThreads
-        {
-            get { return _maxWorkerThreads; }
-            set { _maxWorkerThreads = value; }
-        }
+        /// <summary>
+        /// Enable/Disable the local performance counter.
+        /// This enables the user to get some performance information about the SmartThreadPool 
+        /// without using Windows performance counters. (Useful on WindowsCE, Silverlight, etc.)
+        /// The default is false.
+        /// </summary>
+        public virtual bool EnableLocalPerformanceCounters
+            {
+                get { return _enableLocalPerformanceCounters; }
+                set 
+                        { 
+                                ThrowIfReadOnly(); 
+                                _enableLocalPerformanceCounters = value; 
+                        }
+            }
 
-        public ThreadPriority ThreadPriority
+        /// <summary>
+        /// Get/Set backgroundness of thread in thread pool.
+        /// </summary>
+            public virtual bool AreThreadsBackground
+            {
+                get { return _areThreadsBackground; }
+                set
+                {
+                    ThrowIfReadOnly ();
+                    _areThreadsBackground = value;
+                }
+            }
+
+            /// <summary>
+        /// Get a readonly version of this STPStartInfo.
+        /// </summary>
+        /// <returns>Returns a readonly reference to this STPStartInfo</returns>
+        public new STPStartInfo AsReadOnly()
         {
-            get { return _threadPriority; }
-            set { _threadPriority = value; }
+            return new STPStartInfo(this) { _readOnly = true };
         }
 
-        public virtual string ThreadPoolName
-        {
-            get { return _threadPoolName; }
-            set { _threadPoolName = value; }
-        }
+#if !(_SILVERLIGHT) && !(WINDOWS_PHONE)
 
+        private ApartmentState _apartmentState = SmartThreadPool.DefaultApartmentState;
 
-        public string PerformanceCounterInstanceName
+        /// <summary>
+        /// Get/Set the apartment state of threads in the thread pool
+        /// </summary>
+        public ApartmentState ApartmentState
         {
-            get { return _pcInstanceName; }
-            set { _pcInstanceName = value; }
-        }
-
-        public int StackSize
+            get { return _apartmentState; }
+            set
+            {
+                ThrowIfReadOnly();
+                _apartmentState = value;
+            }
+        } 
+
+#if !(_SILVERLIGHT) && !(WINDOWS_PHONE)
+        
+        /// <summary>
+        /// Get/Set the max stack size of threads in the thread pool
+        /// </summary>
+        public int? MaxStackSize
         {
-            get { return _stackSize; }
-            set { _stackSize = value; }
+            get { return _maxStackSize; }
+            set
+            {
+                ThrowIfReadOnly();
+                if (value.HasValue && value.Value < 0)
+                {
+                    throw new ArgumentOutOfRangeException("value", "Value must be greater than 0.");
+                }
+                _maxStackSize = value;
+            }
         }
+#endif
+
+#endif
     }
 }
diff --git a/ThirdParty/SmartThreadPool/SmartThreadPool.ThreadEntry.cs b/ThirdParty/SmartThreadPool/SmartThreadPool.ThreadEntry.cs
new file mode 100644
index 0000000..d9502bb
--- /dev/null
+++ b/ThirdParty/SmartThreadPool/SmartThreadPool.ThreadEntry.cs
@@ -0,0 +1,60 @@
+
+using System;
+using Amib.Threading.Internal;
+
+namespace Amib.Threading
+{
+    public partial class SmartThreadPool
+    {
+        #region ThreadEntry class
+
+        internal class ThreadEntry
+        {
+            /// <summary>
+            /// The thread creation time
+            /// The value is stored as UTC value.
+            /// </summary>
+            private readonly DateTime _creationTime;
+
+            /// <summary>
+            /// The last time this thread has been running
+            /// It is updated by IAmAlive() method
+            /// The value is stored as UTC value.
+            /// </summary>
+            private DateTime _lastAliveTime;
+
+            /// <summary>
+            /// A reference from each thread in the thread pool to its SmartThreadPool
+            /// object container.
+            /// With this variable a thread can know whatever it belongs to a 
+            /// SmartThreadPool.
+            /// </summary>
+            private readonly SmartThreadPool _associatedSmartThreadPool;
+
+            /// <summary>
+            /// A reference to the current work item a thread from the thread pool 
+            /// is executing.
+            /// </summary>            
+            public WorkItem CurrentWorkItem { get; set; }
+
+            public ThreadEntry(SmartThreadPool stp)
+            {
+                _associatedSmartThreadPool = stp;
+                _creationTime = DateTime.UtcNow;
+                _lastAliveTime = DateTime.MinValue;
+            }
+
+            public SmartThreadPool AssociatedSmartThreadPool
+            {
+                get { return _associatedSmartThreadPool; }
+            }
+
+            public void IAmAlive()
+            {
+                _lastAliveTime = DateTime.UtcNow;
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/ThirdParty/SmartThreadPool/SmartThreadPool.cs b/ThirdParty/SmartThreadPool/SmartThreadPool.cs
index 2c061d7..a4f4ce5 100644
--- a/ThirdParty/SmartThreadPool/SmartThreadPool.cs
+++ b/ThirdParty/SmartThreadPool/SmartThreadPool.cs
@@ -1,61 +1,106 @@
-// Ami Bar
-// amibar@gmail.com
-//
-// Smart thread pool in C#.
+#region Release History
+
+// Smart Thread Pool
 // 7 Aug 2004 - Initial release
+//
 // 14 Sep 2004 - Bug fixes 
+//
 // 15 Oct 2004 - Added new features
-//        - Work items return result.
-//        - Support waiting synchronization for multiple work items.
-//        - Work items can be cancelled.
-//        - Passage of the caller thread’s context to the thread in the pool.
-//        - Minimal usage of WIN32 handles.
-//        - Minor bug fixes.
+//              - Work items return result.
+//              - Support waiting synchronization for multiple work items.
+//              - Work items can be cancelled.
+//              - Passage of the caller thread’s context to the thread in the pool.
+//              - Minimal usage of WIN32 handles.
+//              - Minor bug fixes.
+//
 // 26 Dec 2004 - Changes:
-//        - Removed static constructors.
+//              - Removed static constructors.
 //      - Added finalizers.
-//        - Changed Exceptions so they are serializable.
-//        - Fixed the bug in one of the SmartThreadPool constructors.
-//        - Changed the SmartThreadPool.WaitAll() so it will support any number of waiters. 
+//              - Changed Exceptions so they are serializable.
+//              - Fixed the bug in one of the SmartThreadPool constructors.
+//              - Changed the SmartThreadPool.WaitAll() so it will support any number of waiters. 
 //        The SmartThreadPool.WaitAny() is still limited by the .NET Framework.
-//        - Added PostExecute with options on which cases to call it.
+//              - Added PostExecute with options on which cases to call it.
 //      - Added option to dispose of the state objects.
 //      - Added a WaitForIdle() method that waits until the work items queue is empty.
 //      - Added an STPStartInfo class for the initialization of the thread pool.
 //      - Changed exception handling so if a work item throws an exception it 
 //        is rethrown at GetResult(), rather then firing an UnhandledException event.
 //        Note that PostExecute exception are always ignored.
+//
 // 25 Mar 2005 - Changes:
-//        - Fixed lost of work items bug
+//              - Fixed lost of work items bug
+//
 // 3 Jul 2005: Changes.
 //      - Fixed bug where Enqueue() throws an exception because PopWaiter() returned null, hardly reconstructed. 
+//
 // 16 Aug 2005: Changes.
-//        - Fixed bug where the InUseThreads becomes negative when canceling work items. 
+//              - Fixed bug where the InUseThreads becomes negative when canceling work items. 
 //
 // 31 Jan 2006 - Changes:
-//        - Added work items priority
-//        - Removed support of chained delegates in callbacks and post executes (nobody really use this)
-//        - Added work items groups
-//        - Added work items groups idle event
-//        - Changed SmartThreadPool.WaitAll() behavior so when it gets empty array
-//          it returns true rather then throwing an exception.
-//        - Added option to start the STP and the WIG as suspended
-//        - Exception behavior changed, the real exception is returned by an 
-//          inner exception
-//        - Added option to keep the Http context of the caller thread. (Thanks to Steven T.)
-//        - Added performance counters
-//        - Added priority to the threads in the pool
+//              - Added work items priority
+//              - Removed support of chained delegates in callbacks and post executes (nobody really use this)
+//              - Added work items groups
+//              - Added work items groups idle event
+//              - Changed SmartThreadPool.WaitAll() behavior so when it gets empty array
+//                it returns true rather then throwing an exception.
+//              - Added option to start the STP and the WIG as suspended
+//              - Exception behavior changed, the real exception is returned by an 
+//                inner exception
+//              - Added option to keep the Http context of the caller thread. (Thanks to Steven T.)
+//              - Added performance counters
+//              - Added priority to the threads in the pool
 //
 // 13 Feb 2006 - Changes:
-//        - Added a call to the dispose of the Performance Counter so
-//          their won't be a Performance Counter leak.
-//        - Added exception catch in case the Performance Counters cannot 
-//          be created.
+//              - Added a call to the dispose of the Performance Counter so
+//                their won't be a Performance Counter leak.
+//              - Added exception catch in case the Performance Counters cannot 
+//                be created.
+//
+// 17 May 2008 - Changes:
+//      - Changed the dispose behavior and removed the Finalizers.
+//      - Enabled the change of the MaxThreads and MinThreads at run time.
+//      - Enabled the change of the Concurrency of a IWorkItemsGroup at run 
+//        time If the IWorkItemsGroup is a SmartThreadPool then the Concurrency 
+//        refers to the MaxThreads. 
+//      - Improved the cancel behavior.
+//      - Added events for thread creation and termination. 
+//      - Fixed the HttpContext context capture.
+//      - Changed internal collections so they use generic collections
+//      - Added IsIdle flag to the SmartThreadPool and IWorkItemsGroup
+//      - Added support for WinCE
+//      - Added support for Action<T> and Func<T>
+//
+// 07 April 2009 - Changes:
+//      - Added support for Silverlight and Mono
+//      - Added Join, Choice, and Pipe to SmartThreadPool.
+//      - Added local performance counters (for Mono, Silverlight, and WindowsCE)
+//      - Changed duration measures from DateTime.Now to Stopwatch.
+//      - Queues changed from System.Collections.Queue to System.Collections.Generic.LinkedList<T>.
+//
+// 21 December 2009 - Changes:
+//      - Added work item timeout (passive)
+//
+// 20 August 2012 - Changes:
+//      - Added set name to threads
+//      - Fixed the WorkItemsQueue.Dequeue. 
+//        Replaced while (!Monitor.TryEnter(this)); with lock(this) { ... }
+//      - Fixed SmartThreadPool.Pipe
+//      - Added IsBackground option to threads
+//      - Added ApartmentState to threads
+//      - Fixed thread creation when queuing many work items at the same time.
+//
+// 24 August 2012 - Changes:
+//      - Enabled cancel abort after cancel. See: http://smartthreadpool.codeplex.com/discussions/345937 by alecswan
+//      - Added option to set MaxStackSize of threads 
+
+#endregion
 
 using System;
 using System.Security;
 using System.Threading;
 using System.Collections;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
 
@@ -63,1210 +108,1503 @@ using Amib.Threading.Internal;
 
 namespace Amib.Threading
 {
-    #region SmartThreadPool class
-    /// <summary>
-    /// Smart thread pool class.
-    /// </summary>
-    public class SmartThreadPool : IWorkItemsGroup, IDisposable
-    {
-        #region Default Constants
-
-        /// <summary>
-        /// Default minimum number of threads the thread pool contains. (0)
-        /// </summary>
-        public const int DefaultMinWorkerThreads = 0;
-
-        /// <summary>
-        /// Default maximum number of threads the thread pool contains. (25)
-        /// </summary>
-        public const int DefaultMaxWorkerThreads = 25;
-
-        /// <summary>
-        /// Default idle timeout in milliseconds. (One minute)
+        #region SmartThreadPool class
+        /// <summary>
+        /// Smart thread pool class.
+        /// </summary>
+        public partial class SmartThreadPool : WorkItemsGroupBase, IDisposable
+        {
+                #region Public Default Constants
+
+                /// <summary>
+                /// Default minimum number of threads the thread pool contains. (0)
+                /// </summary>
+                public const int DefaultMinWorkerThreads = 0;
+
+                /// <summary>
+                /// Default maximum number of threads the thread pool contains. (25)
+                /// </summary>
+                public const int DefaultMaxWorkerThreads = 25;
+
+                /// <summary>
+                /// Default idle timeout in milliseconds. (One minute)
+                /// </summary>
+                public const int DefaultIdleTimeout = 60*1000; // One minute
+
+                /// <summary>
+                /// Indicate to copy the security context of the caller and then use it in the call. (false)
+                /// </summary>
+                public const bool DefaultUseCallerCallContext = false; 
+
+                /// <summary>
+                /// Indicate to copy the HTTP context of the caller and then use it in the call. (false)
+                /// </summary>
+                public const bool DefaultUseCallerHttpContext = false;
+
+                /// <summary>
+                /// Indicate to dispose of the state objects if they support the IDispose interface. (false)
+                /// </summary>
+                public const bool DefaultDisposeOfStateObjects = false; 
+
+                /// <summary>
+        /// The default option to run the post execute (CallToPostExecute.Always)
+                /// </summary>
+                public const CallToPostExecute DefaultCallToPostExecute = CallToPostExecute.Always;
+
+                /// <summary>
+                /// The default post execute method to run. (None)
+                /// When null it means not to call it.
+                /// </summary>
+                public static readonly PostExecuteWorkItemCallback DefaultPostExecuteWorkItemCallback;
+
+                /// <summary>
+        /// The default work item priority (WorkItemPriority.Normal)
+                /// </summary>
+                public const WorkItemPriority DefaultWorkItemPriority = WorkItemPriority.Normal;
+
+                /// <summary>
+                /// The default is to work on work items as soon as they arrive
+                /// and not to wait for the start. (false)
+                /// </summary>
+                public const bool DefaultStartSuspended = false;
+
+                /// <summary>
+        /// The default name to use for the performance counters instance. (null)
+                /// </summary>
+                public static readonly string DefaultPerformanceCounterInstanceName;
+
+#if !(WINDOWS_PHONE)
+
+                /// <summary>
+        /// The default thread priority (ThreadPriority.Normal)
+                /// </summary>
+                public const ThreadPriority DefaultThreadPriority = ThreadPriority.Normal;
+#endif
+        /// <summary>
+        /// The default thread pool name. (SmartThreadPool)
         /// </summary>
-        public const int DefaultIdleTimeout = 60*1000; // One minute
+        public const string DefaultThreadPoolName = "SmartThreadPool";
 
         /// <summary>
-        /// Indicate to copy the security context of the caller and then use it in the call. (false)
+        /// The default Max Stack Size. (SmartThreadPool)
         /// </summary>
-        public const bool DefaultUseCallerCallContext = false; 
+        public static readonly int? DefaultMaxStackSize = null;
 
         /// <summary>
-        /// Indicate to copy the HTTP context of the caller and then use it in the call. (false)
+        /// The default fill state with params. (false)
+        /// It is relevant only to QueueWorkItem of Action&lt;...&gt;/Func&lt;...&gt;
         /// </summary>
-        public const bool DefaultUseCallerHttpContext = false;
+        public const bool DefaultFillStateWithArgs = false;
 
         /// <summary>
-        /// Indicate to dispose of the state objects if they support the IDispose interface. (false)
+        /// The default thread backgroundness. (true)
         /// </summary>
-        public const bool DefaultDisposeOfStateObjects = false; 
+        public const bool DefaultAreThreadsBackground = true;
 
+#if !(_SILVERLIGHT) && !(WINDOWS_PHONE)
         /// <summary>
-        /// The default option to run the post execute
+        /// The default apartment state of a thread in the thread pool. 
+        /// The default is ApartmentState.Unknown which means the STP will not 
+        /// set the apartment of the thread. It will use the .NET default.
         /// </summary>
-        public const CallToPostExecute DefaultCallToPostExecute = CallToPostExecute.Always;
+        public const ApartmentState DefaultApartmentState = ApartmentState.Unknown;
+#endif
 
-        /// <summary>
-        /// The default post execute method to run. 
-        /// When null it means not to call it.
-        /// </summary>
-        public static readonly PostExecuteWorkItemCallback DefaultPostExecuteWorkItemCallback = null;
+                #endregion
 
-        /// <summary>
-        /// The default work item priority
-        /// </summary>
-        public const WorkItemPriority DefaultWorkItemPriority = WorkItemPriority.Normal;
+        #region Member Variables
 
-        /// <summary>
-        /// The default is to work on work items as soon as they arrive
-        /// and not to wait for the start.
-        /// </summary>
-        public const bool DefaultStartSuspended = false;
+                /// <summary>
+                /// Dictionary of all the threads in the thread pool.
+                /// </summary>
+        private readonly SynchronizedDictionary<Thread, ThreadEntry> _workerThreads = new SynchronizedDictionary<Thread, ThreadEntry>();
 
-        /// <summary>
-        /// The default is not to use the performance counters
-        /// </summary>
-        public static readonly string DefaultPerformanceCounterInstanceName = null;
+                /// <summary>
+                /// Queue of work items.
+                /// </summary>
+                private readonly WorkItemsQueue _workItemsQueue = new WorkItemsQueue();
 
-        public static readonly int DefaultStackSize = 0;
+                /// <summary>
+                /// Count the work items handled.
+                /// Used by the performance counter.
+                /// </summary>
+                private int _workItemsProcessed;
 
-        /// <summary>
-        /// The default thread priority
-        /// </summary>
-        public const ThreadPriority DefaultThreadPriority = ThreadPriority.Normal;
+                /// <summary>
+                /// Number of threads that currently work (not idle).
+                /// </summary>
+                private int _inUseWorkerThreads;
 
         /// <summary>
-        /// The default thread pool name
+        /// Stores a copy of the original STPStartInfo.
+        /// It is used to change the MinThread and MaxThreads
         /// </summary>
-        public const string DefaultThreadPoolName = "SmartThreadPool";
+        private STPStartInfo _stpStartInfo;
 
-        #endregion
+                /// <summary>
+                /// Total number of work items that are stored in the work items queue 
+                /// plus the work items that the threads in the pool are working on.
+                /// </summary>
+                private int _currentWorkItemsCount;
 
-        #region Member Variables
+                /// <summary>
+                /// Signaled when the thread pool is idle, i.e. no thread is busy
+                /// and the work items queue is empty
+                /// </summary>
+                //private ManualResetEvent _isIdleWaitHandle = new ManualResetEvent(true);
+                private ManualResetEvent _isIdleWaitHandle = EventWaitHandleFactory.CreateManualResetEvent(true);
 
-        /// <summary>
-        /// Contains the name of this instance of SmartThreadPool.
-        /// Can be changed by the user.
-        /// </summary>
-        private string _name = DefaultThreadPoolName;
+                /// <summary>
+                /// An event to signal all the threads to quit immediately.
+                /// </summary>
+                //private ManualResetEvent _shuttingDownEvent = new ManualResetEvent(false);
+                private ManualResetEvent _shuttingDownEvent = EventWaitHandleFactory.CreateManualResetEvent(false);
 
         /// <summary>
-        /// Hashtable of all the threads in the thread pool.
+        /// A flag to indicate if the Smart Thread Pool is now suspended.
         /// </summary>
-        private Hashtable _workerThreads = Hashtable.Synchronized(new Hashtable());
+        private bool _isSuspended;
 
-        /// <summary>
-        /// Queue of work items.
-        /// </summary>
-        private WorkItemsQueue _workItemsQueue = new WorkItemsQueue();
+                /// <summary>
+                /// A flag to indicate the threads to quit.
+                /// </summary>
+                private bool _shutdown;
 
-        /// <summary>
-        /// Count the work items handled.
-        /// Used by the performance counter.
-        /// </summary>
-        private long _workItemsProcessed = 0;
+                /// <summary>
+                /// Counts the threads created in the pool.
+                /// It is used to name the threads.
+                /// </summary>
+                private int _threadCounter;
 
-        /// <summary>
-        /// Number of threads that currently work (not idle).
-        /// </summary>
-        private int _inUseWorkerThreads = 0;
+                /// <summary>
+                /// Indicate that the SmartThreadPool has been disposed
+                /// </summary>
+                private bool _isDisposed;
 
-        /// <summary>
-        /// Start information to use. 
-        /// It is simpler than providing many constructors.
-        /// </summary>
-        private STPStartInfo _stpStartInfo = new STPStartInfo();
+                /// <summary>
+                /// Holds all the WorkItemsGroup instaces that have at least one 
+                /// work item int the SmartThreadPool
+                /// This variable is used in case of Shutdown
+                /// </summary>
+        private readonly SynchronizedDictionary<IWorkItemsGroup, IWorkItemsGroup> _workItemsGroups = new SynchronizedDictionary<IWorkItemsGroup, IWorkItemsGroup>();
 
         /// <summary>
-        /// Total number of work items that are stored in the work items queue 
-        /// plus the work items that the threads in the pool are working on.
+        /// A common object for all the work items int the STP
+        /// so we can mark them to cancel in O(1)
         /// </summary>
-        private int _currentWorkItemsCount = 0;
+        private CanceledWorkItemsGroup _canceledSmartThreadPool = new CanceledWorkItemsGroup();
 
         /// <summary>
-        /// Signaled when the thread pool is idle, i.e. no thread is busy
-        /// and the work items queue is empty
+        /// Windows STP performance counters
         /// </summary>
-        private ManualResetEvent _isIdleWaitHandle = new ManualResetEvent(true);
+        private ISTPInstancePerformanceCounters _windowsPCs = NullSTPInstancePerformanceCounters.Instance;
 
         /// <summary>
-        /// An event to signal all the threads to quit immediately.
+        /// Local STP performance counters
         /// </summary>
-        private ManualResetEvent _shuttingDownEvent = new ManualResetEvent(false);
+        private ISTPInstancePerformanceCounters _localPCs = NullSTPInstancePerformanceCounters.Instance;
 
-        /// <summary>
-        /// A flag to indicate the threads to quit.
-        /// </summary>
-        private bool _shutdown = false;
 
-        /// <summary>
-        /// Counts the threads created in the pool.
-        /// It is used to name the threads.
-        /// </summary>
-        private int _threadCounter = 0;
+#if (WINDOWS_PHONE) 
+        private static readonly Dictionary<int, ThreadEntry> _threadEntries = new Dictionary<int, ThreadEntry>();
+#elif (_WINDOWS_CE)
+        private static LocalDataStoreSlot _threadEntrySlot = Thread.AllocateDataSlot();
+#else
+        [ThreadStatic]
+        private static ThreadEntry _threadEntry;
 
-        /// <summary>
-        /// Indicate that the SmartThreadPool has been disposed
-        /// </summary>
-        private bool _isDisposed = false;
+#endif
 
         /// <summary>
-        /// Event to send that the thread pool is idle
+        /// An event to call after a thread is created, but before 
+        /// it's first use.
         /// </summary>
-        private event EventHandler _stpIdle;
+        private event ThreadInitializationHandler _onThreadInitialization;
 
         /// <summary>
-        /// On idle event
+        /// An event to call when a thread is about to exit, after 
+        /// it is no longer belong to the pool.
         /// </summary>
-        //private event WorkItemsGroupIdleHandler _onIdle;
+        private event ThreadTerminationHandler _onThreadTermination;
 
-        /// <summary>
-        /// Holds all the WorkItemsGroup instaces that have at least one 
-        /// work item int the SmartThreadPool
-        /// This variable is used in case of Shutdown
-        /// </summary>
-        private Hashtable _workItemsGroups = Hashtable.Synchronized(new Hashtable());
+        #endregion
 
-        /// <summary>
-        /// A reference from each thread in the thread pool to its SmartThreadPool
-        /// object container.
-        /// With this variable a thread can know whatever it belongs to a 
-        /// SmartThreadPool.
-        /// </summary>
-        [ThreadStatic]
-        private static SmartThreadPool _smartThreadPool;
+        #region Per thread properties
 
         /// <summary>
         /// A reference to the current work item a thread from the thread pool 
         /// is executing.
         /// </summary>
-        [ThreadStatic]
-        private static WorkItem _currentWorkItem;
-
-        /// <summary>
-        /// STP performance counters
-        /// </summary>
-        private ISTPInstancePerformanceCounters _pcs = NullSTPInstancePerformanceCounters.Instance;
-
+        internal static ThreadEntry CurrentThreadEntry
+        {
+#if (WINDOWS_PHONE)
+            get
+            {
+                lock(_threadEntries)
+                {
+                    ThreadEntry threadEntry;
+                    if (_threadEntries.TryGetValue(Thread.CurrentThread.ManagedThreadId, out threadEntry))
+                    {
+                        return threadEntry;
+                    }
+                }
+                return null;
+            }
+            set
+            {
+                lock(_threadEntries)
+                {
+                    _threadEntries[Thread.CurrentThread.ManagedThreadId] = value;
+                }
+            }
+#elif (_WINDOWS_CE)
+            get
+            {
+                //Thread.CurrentThread.ManagedThreadId
+                return Thread.GetData(_threadEntrySlot) as ThreadEntry;
+            }
+            set
+            {
+                Thread.SetData(_threadEntrySlot, value);
+            }
+#else
+            get
+            {
+                return _threadEntry;
+            }
+            set
+            {
+                _threadEntry = value;
+            }
+#endif
+        }
         #endregion
 
         #region Construction and Finalization
 
         /// <summary>
-        /// Constructor
-        /// </summary>
-        public SmartThreadPool()
-        {
+                /// Constructor
+                /// </summary>
+                public SmartThreadPool()
+                {
+            _stpStartInfo = new STPStartInfo();
             Initialize();
-        }
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="idleTimeout">Idle timeout in milliseconds</param>
-        public SmartThreadPool(int idleTimeout)
-        {
-            _stpStartInfo.IdleTimeout = idleTimeout;
-            Initialize();
-        }
+                }
+
+                /// <summary>
+                /// Constructor
+                /// </summary>
+                /// <param name="idleTimeout">Idle timeout in milliseconds</param>
+                public SmartThreadPool(int idleTimeout)
+                {
+            _stpStartInfo = new STPStartInfo
+            {
+                IdleTimeout = idleTimeout,
+            };
+                        Initialize();
+                }
+
+                /// <summary>
+                /// Constructor
+                /// </summary>
+                /// <param name="idleTimeout">Idle timeout in milliseconds</param>
+                /// <param name="maxWorkerThreads">Upper limit of threads in the pool</param>
+                public SmartThreadPool(
+                        int idleTimeout,
+                        int maxWorkerThreads)
+                {
+            _stpStartInfo = new STPStartInfo
+            {
+                IdleTimeout = idleTimeout,
+                MaxWorkerThreads = maxWorkerThreads,
+            };
+                        Initialize();
+                }
+
+                /// <summary>
+                /// Constructor
+                /// </summary>
+                /// <param name="idleTimeout">Idle timeout in milliseconds</param>
+                /// <param name="maxWorkerThreads">Upper limit of threads in the pool</param>
+                /// <param name="minWorkerThreads">Lower limit of threads in the pool</param>
+                public SmartThreadPool(
+                        int idleTimeout,
+                        int maxWorkerThreads,
+                        int minWorkerThreads)
+                {
+            _stpStartInfo = new STPStartInfo
+            {
+                IdleTimeout = idleTimeout,
+                MaxWorkerThreads = maxWorkerThreads,
+                MinWorkerThreads = minWorkerThreads,
+            };
+                        Initialize();
+                }
 
         /// <summary>
         /// Constructor
         /// </summary>
-        /// <param name="idleTimeout">Idle timeout in milliseconds</param>
-        /// <param name="maxWorkerThreads">Upper limit of threads in the pool</param>
-        public SmartThreadPool(
-            int idleTimeout,
-            int maxWorkerThreads)
-        {
-            _stpStartInfo.IdleTimeout = idleTimeout;
-            _stpStartInfo.MaxWorkerThreads = maxWorkerThreads;
-            Initialize();
-        }
+        /// <param name="stpStartInfo">A SmartThreadPool configuration that overrides the default behavior</param>
+                public SmartThreadPool(STPStartInfo stpStartInfo)
+                {
+                        _stpStartInfo = new STPStartInfo(stpStartInfo);
+                        Initialize();
+                }
 
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="idleTimeout">Idle timeout in milliseconds</param>
-        /// <param name="maxWorkerThreads">Upper limit of threads in the pool</param>
-        /// <param name="minWorkerThreads">Lower limit of threads in the pool</param>
-        public SmartThreadPool(
-            int idleTimeout,
-            int maxWorkerThreads,
-            int minWorkerThreads)
-        {
-            _stpStartInfo.IdleTimeout = idleTimeout;
-            _stpStartInfo.MaxWorkerThreads = maxWorkerThreads;
-            _stpStartInfo.MinWorkerThreads = minWorkerThreads;
-            Initialize();
-        }
+                private void Initialize()
+                {
+            Name = _stpStartInfo.ThreadPoolName;
+                        ValidateSTPStartInfo();
 
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        public SmartThreadPool(STPStartInfo stpStartInfo)
-        {
-            _stpStartInfo = new STPStartInfo(stpStartInfo);
-            Initialize();
-        }
+            // _stpStartInfoRW stores a read/write copy of the STPStartInfo.
+            // Actually only MaxWorkerThreads and MinWorkerThreads are overwritten
 
-        private void Initialize()
-        {
-            Name = _stpStartInfo.ThreadPoolName;
-            ValidateSTPStartInfo();
+            _isSuspended = _stpStartInfo.StartSuspended;
 
+#if (_WINDOWS_CE) || (_SILVERLIGHT) || (_MONO) || (WINDOWS_PHONE)
+                        if (null != _stpStartInfo.PerformanceCounterInstanceName)
+                        {
+                throw new NotSupportedException("Performance counters are not implemented for Compact Framework/Silverlight/Mono, instead use StpStartInfo.EnableLocalPerformanceCounters");
+            }
+#else
             if (null != _stpStartInfo.PerformanceCounterInstanceName)
             {
                 try
                 {
-                    _pcs = new STPInstancePerformanceCounters(_stpStartInfo.PerformanceCounterInstanceName);
+                    _windowsPCs = new STPInstancePerformanceCounters(_stpStartInfo.PerformanceCounterInstanceName);
                 }
-                catch(Exception e)
+                catch (Exception e)
                 {
-                    Debug.WriteLine("Unable to create Performance Counters: " + e.ToString());
-                    _pcs = NullSTPInstancePerformanceCounters.Instance;
+                    Debug.WriteLine("Unable to create Performance Counters: " + e);
+                    _windowsPCs = NullSTPInstancePerformanceCounters.Instance;
                 }
             }
+#endif
 
-            StartOptimalNumberOfThreads();
-        }
-
-        private void StartOptimalNumberOfThreads()
-        {
-            int threadsCount = Math.Max(_workItemsQueue.Count, _stpStartInfo.MinWorkerThreads);
-            threadsCount = Math.Min(threadsCount, _stpStartInfo.MaxWorkerThreads);
-            StartThreads(threadsCount);
-        }
-
-        private void ValidateSTPStartInfo()
-        {
-            if (_stpStartInfo.MinWorkerThreads < 0)
-            {
-                throw new ArgumentOutOfRangeException(
-                    "MinWorkerThreads", "MinWorkerThreads cannot be negative");
-            }
-
-            if (_stpStartInfo.MaxWorkerThreads <= 0)
+            if (_stpStartInfo.EnableLocalPerformanceCounters)
             {
-                throw new ArgumentOutOfRangeException(
-                    "MaxWorkerThreads", "MaxWorkerThreads must be greater than zero");
+                _localPCs = new LocalSTPInstancePerformanceCounters();
             }
 
-            if (_stpStartInfo.MinWorkerThreads > _stpStartInfo.MaxWorkerThreads)
+                    // If the STP is not started suspended then start the threads.
+            if (!_isSuspended)
             {
-                throw new ArgumentOutOfRangeException(
-                    "MinWorkerThreads, maxWorkerThreads", 
-                    "MaxWorkerThreads must be greater or equal to MinWorkerThreads");
+                StartOptimalNumberOfThreads();
             }
-        }
+                }
 
-        private void ValidateCallback(Delegate callback)
-        {
-            if(callback.GetInvocationList().Length > 1)
+                private void StartOptimalNumberOfThreads()
+                {
+                        int threadsCount = Math.Max(_workItemsQueue.Count, _stpStartInfo.MinWorkerThreads);
+            threadsCount = Math.Min(threadsCount, _stpStartInfo.MaxWorkerThreads);
+            threadsCount -= _workerThreads.Count;
+            if (threadsCount > 0)
             {
-                throw new NotSupportedException("SmartThreadPool doesn't support delegates chains");
+                StartThreads(threadsCount);
             }
-        }
+                }
 
-        #endregion
+                private void ValidateSTPStartInfo()
+                {
+            if (_stpStartInfo.MinWorkerThreads < 0)
+                        {
+                                throw new ArgumentOutOfRangeException(
+                                        "MinWorkerThreads", "MinWorkerThreads cannot be negative");
+                        }
 
-        #region Thread Processing
+            if (_stpStartInfo.MaxWorkerThreads <= 0)
+                        {
+                                throw new ArgumentOutOfRangeException(
+                                        "MaxWorkerThreads", "MaxWorkerThreads must be greater than zero");
+                        }
 
-        /// <summary>
-        /// Waits on the queue for a work item, shutdown, or timeout.
-        /// </summary>
-        /// <returns>
-        /// Returns the WaitingCallback or null in case of timeout or shutdown.
-        /// </returns>
-        private WorkItem Dequeue()
-        {
-            WorkItem workItem = 
+            if (_stpStartInfo.MinWorkerThreads > _stpStartInfo.MaxWorkerThreads)
+                        {
+                                throw new ArgumentOutOfRangeException(
+                                        "MinWorkerThreads, maxWorkerThreads", 
+                                        "MaxWorkerThreads must be greater or equal to MinWorkerThreads");
+                        }
+                }
+
+                private static void ValidateCallback(Delegate callback)
+                {
+                        if(callback.GetInvocationList().Length > 1)
+                        {
+                                throw new NotSupportedException("SmartThreadPool doesn't support delegates chains");
+                        }
+                }
+
+                #endregion
+
+                #region Thread Processing
+
+                /// <summary>
+                /// Waits on the queue for a work item, shutdown, or timeout.
+                /// </summary>
+                /// <returns>
+                /// Returns the WaitingCallback or null in case of timeout or shutdown.
+                /// </returns>
+                private WorkItem Dequeue()
+                {
+                        WorkItem workItem =
                 _workItemsQueue.DequeueWorkItem(_stpStartInfo.IdleTimeout, _shuttingDownEvent);
 
-            return workItem;
-        }
-
-        /// <summary>
-        /// Put a new work item in the queue
-        /// </summary>
-        /// <param name="workItem">A work item to queue</param>
-        private void Enqueue(WorkItem workItem)
-        {
-            Enqueue(workItem, true);
-        }
-
-        /// <summary>
-        /// Put a new work item in the queue
-        /// </summary>
-        /// <param name="workItem">A work item to queue</param>
-        internal void Enqueue(WorkItem workItem, bool incrementWorkItems)
-        {
-            // Make sure the workItem is not null
-            Debug.Assert(null != workItem);
-
-            if (incrementWorkItems)
-            {
-                IncrementWorkItemsCount();
-            }
-
-            _workItemsQueue.EnqueueWorkItem(workItem);
-            workItem.WorkItemIsQueued();
-
-            // If all the threads are busy then try to create a new one
-            if ((InUseThreads + WaitingCallbacks) > _workerThreads.Count) 
-            {
-                StartThreads(1);
-            }
-        }
-
-        private void IncrementWorkItemsCount()
-        {
-            _pcs.SampleWorkItems(_workItemsQueue.Count, _workItemsProcessed);
-
-            int count = Interlocked.Increment(ref _currentWorkItemsCount);
-            //Trace.WriteLine("WorkItemsCount = " + _currentWorkItemsCount.ToString());
-            if (count == 1) 
-            {
-                //Trace.WriteLine("STP is NOT idle");
+                        return workItem;
+                }
+
+                /// <summary>
+                /// Put a new work item in the queue
+                /// </summary>
+                /// <param name="workItem">A work item to queue</param>
+                internal override void Enqueue(WorkItem workItem)
+                {
+                        // Make sure the workItem is not null
+                        Debug.Assert(null != workItem);
+
+                        IncrementWorkItemsCount();
+
+            workItem.CanceledSmartThreadPool = _canceledSmartThreadPool;
+                        _workItemsQueue.EnqueueWorkItem(workItem);
+                        workItem.WorkItemIsQueued();
+
+                        // If all the threads are busy then try to create a new one
+                        if (_currentWorkItemsCount > _workerThreads.Count) 
+                        {
+                                StartThreads(1);
+                        }
+                }
+
+                private void IncrementWorkItemsCount()
+                {
+                        _windowsPCs.SampleWorkItems(_workItemsQueue.Count, _workItemsProcessed);
+            _localPCs.SampleWorkItems(_workItemsQueue.Count, _workItemsProcessed);
+
+                        int count = Interlocked.Increment(ref _currentWorkItemsCount);
+                        //Trace.WriteLine("WorkItemsCount = " + _currentWorkItemsCount.ToString());
+                        if (count == 1) 
+                        {
+                IsIdle = false;
                 _isIdleWaitHandle.Reset();
-            }
-        }
-
-        private void DecrementWorkItemsCount()
-        {
-            ++_workItemsProcessed;
-
-            // The counter counts even if the work item was cancelled
-            _pcs.SampleWorkItems(_workItemsQueue.Count, _workItemsProcessed);
+                        }
+                }
 
+                private void DecrementWorkItemsCount()
+                {
             int count = Interlocked.Decrement(ref _currentWorkItemsCount);
             //Trace.WriteLine("WorkItemsCount = " + _currentWorkItemsCount.ToString());
-            if (count == 0) 
+            if (count == 0)
             {
-                //Trace.WriteLine("STP is idle");
+                IsIdle = true;
                 _isIdleWaitHandle.Set();
             }
-        }
 
-        internal void RegisterWorkItemsGroup(IWorkItemsGroup workItemsGroup)
-        {
-            _workItemsGroups[workItemsGroup] = workItemsGroup;
-        }
-
-        internal void UnregisterWorkItemsGroup(IWorkItemsGroup workItemsGroup)
-        {
-            if (_workItemsGroups.Contains(workItemsGroup))
-            {
-                _workItemsGroups.Remove(workItemsGroup);
-            }
-        }
+            Interlocked.Increment(ref _workItemsProcessed);
 
-        /// <summary>
-        /// Inform that the current thread is about to quit or quiting.
-        /// The same thread may call this method more than once.
-        /// </summary>
-        private void InformCompleted()
-        {
-            // There is no need to lock the two methods together 
-            // since only the current thread removes itself
-            // and the _workerThreads is a synchronized hashtable
-            if (_workerThreads.Contains(Thread.CurrentThread))
+            if (!_shutdown)
             {
-                _workerThreads.Remove(Thread.CurrentThread);
-                _pcs.SampleThreads(_workerThreads.Count, _inUseWorkerThreads);
+                            // The counter counts even if the work item was cancelled
+                            _windowsPCs.SampleWorkItems(_workItemsQueue.Count, _workItemsProcessed);
+                _localPCs.SampleWorkItems(_workItemsQueue.Count, _workItemsProcessed);
             }
-        }
 
-        /// <summary>
-        /// Starts new threads
-        /// </summary>
-        /// <param name="threadsCount">The number of threads to start</param>
-        private void StartThreads(int threadsCount)
-        {
-            if (_stpStartInfo.StartSuspended)
-            {
-                return;
-            }
+                }
+
+                internal void RegisterWorkItemsGroup(IWorkItemsGroup workItemsGroup)
+                {
+                        _workItemsGroups[workItemsGroup] = workItemsGroup;
+                }
+
+                internal void UnregisterWorkItemsGroup(IWorkItemsGroup workItemsGroup)
+                {
+                        if (_workItemsGroups.Contains(workItemsGroup))
+                        {
+                                _workItemsGroups.Remove(workItemsGroup);
+                        }
+                }
+
+                /// <summary>
+                /// Inform that the current thread is about to quit or quiting.
+                /// The same thread may call this method more than once.
+                /// </summary>
+                private void InformCompleted()
+                {
+                        // There is no need to lock the two methods together 
+                        // since only the current thread removes itself
+                        // and the _workerThreads is a synchronized dictionary
+                        if (_workerThreads.Contains(Thread.CurrentThread))
+                        {
+                                _workerThreads.Remove(Thread.CurrentThread);
+                                _windowsPCs.SampleThreads(_workerThreads.Count, _inUseWorkerThreads);
+                _localPCs.SampleThreads(_workerThreads.Count, _inUseWorkerThreads);
+                        }
+                }
+
+                /// <summary>
+                /// Starts new threads
+                /// </summary>
+                /// <param name="threadsCount">The number of threads to start</param>
+                private void StartThreads(int threadsCount)
+                {
+            if (_isSuspended)
+                        {
+                                return;
+                        }
+
+                        lock(_workerThreads.SyncRoot)
+                        {
+                                // Don't start threads on shut down
+                                if (_shutdown)
+                                {
+                                        return;
+                                }
+
+                                for(int i = 0; i < threadsCount; ++i)
+                                {
+                                        // Don't create more threads then the upper limit
+                    if (_workerThreads.Count >= _stpStartInfo.MaxWorkerThreads)
+                                        {
+                                                return;
+                                        }
 
-            lock(_workerThreads.SyncRoot)
-            {
-                // Don't start threads on shut down
-                if (_shutdown)
-                {
-                    return;
-                }
+                    // Create a new thread
 
-                for(int i = 0; i < threadsCount; ++i)
-                {
-                    // Don't create more threads then the upper limit
-                    if (_workerThreads.Count >= _stpStartInfo.MaxWorkerThreads)
+#if (_SILVERLIGHT) || (WINDOWS_PHONE)
+                                        Thread workerThread = new Thread(ProcessQueuedItems);
+#else
+                    Thread workerThread =
+                        _stpStartInfo.MaxStackSize.HasValue
+                        ? new Thread(ProcessQueuedItems, _stpStartInfo.MaxStackSize.Value)
+                        : new Thread(ProcessQueuedItems);
+#endif
+                                        // Configure the new thread and start it
+                                        workerThread.Name = "STP " + Name + " Thread #" + _threadCounter;
+                    workerThread.IsBackground = _stpStartInfo.AreThreadsBackground;
+
+#if !(_SILVERLIGHT) && !(_WINDOWS_CE) && !(WINDOWS_PHONE)
+                    if (_stpStartInfo.ApartmentState != ApartmentState.Unknown)
                     {
-                        return;
+                        workerThread.SetApartmentState(_stpStartInfo.ApartmentState);
                     }
+#endif
 
-                    // Create a new thread
-                    Thread workerThread;
-                    if (_stpStartInfo.StackSize > 0)
-                        workerThread = new Thread(ProcessQueuedItems, _stpStartInfo.StackSize);
-                    else
-                        workerThread = new Thread(ProcessQueuedItems);
-
-                    // Configure the new thread and start it
-                    workerThread.Name = "STP " + Name + " Thread #" + _threadCounter;
-                    workerThread.IsBackground = true;
+#if !(_SILVERLIGHT) && !(WINDOWS_PHONE)
                     workerThread.Priority = _stpStartInfo.ThreadPriority;
+#endif
                     workerThread.Start();
-                    ++_threadCounter;
-
-                    // Add the new thread to the hashtable and update its creation
-                    // time.
-                    _workerThreads[workerThread] = DateTime.Now;
-                    _pcs.SampleThreads(_workerThreads.Count, _inUseWorkerThreads);
-                }
-            }
-        }
-
-        /// <summary>
-        /// A worker thread method that processes work items from the work items queue.
-        /// </summary>
-        private void ProcessQueuedItems()
-        {
-            // Initialize the _smartThreadPool variable
-            _smartThreadPool = this;
-
-            try
-            {
-                bool bInUseWorkerThreadsWasIncremented = false;
-
-                // Process until shutdown.
-                while(!_shutdown)
-                {
-                    
-                    // Wait for a work item, shutdown, or timeout
-                    WorkItem workItem = Dequeue();
-
-                    // On timeout or shut down.
-                    if (null == workItem)
+                                        ++_threadCounter;
+
+                    // Add it to the dictionary and update its creation time.
+                    _workerThreads[workerThread] = new ThreadEntry(this);
+
+                                        _windowsPCs.SampleThreads(_workerThreads.Count, _inUseWorkerThreads);
+                    _localPCs.SampleThreads(_workerThreads.Count, _inUseWorkerThreads);
+                                }
+                        }
+                }
+
+                /// <summary>
+                /// A worker thread method that processes work items from the work items queue.
+                /// </summary>
+                private void ProcessQueuedItems()
+                {
+            // Keep the entry of the dictionary as thread's variable to avoid the synchronization locks
+            // of the dictionary.
+            CurrentThreadEntry = _workerThreads[Thread.CurrentThread];
+
+            FireOnThreadInitialization();
+
+                        try
+                        {
+                                bool bInUseWorkerThreadsWasIncremented = false;
+
+                                // Process until shutdown.
+                                while(!_shutdown)
+                                {
+                                        // Update the last time this thread was seen alive.
+                                        // It's good for debugging.
+                    CurrentThreadEntry.IAmAlive();
+
+                    // The following block handles the when the MaxWorkerThreads has been
+                    // incremented by the user at run-time.
+                    // Double lock for quit.
+                    if (_workerThreads.Count > _stpStartInfo.MaxWorkerThreads)
                     {
-                        // Double lock for quit.
-                        if (_workerThreads.Count > _stpStartInfo.MinWorkerThreads)
+                        lock (_workerThreads.SyncRoot)
                         {
-                            lock(_workerThreads.SyncRoot)
+                            if (_workerThreads.Count > _stpStartInfo.MaxWorkerThreads)
                             {
-                                // 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.
-                                    // This method must be called within this lock or else
-                                    // more threads will quit and the thread pool will go
-                                    // below the lower limit.
-                                    InformCompleted();
-                                    break;
-                                }
+                                // Inform that the thread is quiting and then quit.
+                                // This method must be called within this lock or else
+                                // more threads will quit and the thread pool will go
+                                // below the lower limit.
+                                InformCompleted();
+                                break;
                             }
                         }
                     }
 
-                    // If we didn't quit then skip to the next iteration.
-                    if (null == workItem)
-                    {
-                        continue;
-                    }
-
-                    try 
-                    {
-                        // Initialize the value to false
-                        bInUseWorkerThreadsWasIncremented = false;
-
-                        // Change the state of the work item to 'in progress' if possible.
-                        // We do it here so if the work item has been canceled we won't 
-                        // increment the _inUseWorkerThreads.
-                        // The cancel mechanism doesn't delete items from the queue,  
-                        // it marks the work item as canceled, and when the work item
-                        // is dequeued, we just skip it.
-                        // If the post execute of work item is set to always or to
-                        // call when the work item is canceled then the StartingWorkItem()
-                        // will return true, so the post execute can run.
-                        if (!workItem.StartingWorkItem())
-                        {
-                            continue;
-                        }
+                                        // Wait for a work item, shutdown, or timeout
+                                        WorkItem workItem = Dequeue();
 
-                        // Execute the callback.  Make sure to accurately
-                        // record how many callbacks are currently executing.
-                        int inUseWorkerThreads = Interlocked.Increment(ref _inUseWorkerThreads);
-                        _pcs.SampleThreads(_workerThreads.Count, inUseWorkerThreads);
+                                        // Update the last time this thread was seen alive.
+                                        // It's good for debugging.
+                    CurrentThreadEntry.IAmAlive();
 
-                        // Mark that the _inUseWorkerThreads incremented, so in the finally{}
-                        // statement we will decrement it correctly.
-                        bInUseWorkerThreadsWasIncremented = true;
-
-                        // Set the _currentWorkItem to the current work item
-                        _currentWorkItem = workItem;
-
-                        lock(workItem)
-                        {
-                            workItem.currentThread = Thread.CurrentThread;
-                        }
-
-                        ExecuteWorkItem(workItem);
-
-                        lock(workItem)
-                        {
-                            workItem.currentThread = null;
-                        }
-
-                    }
-                    catch(ThreadAbortException ex)
-                    {
-                        lock(workItem)
-                        {
-                            workItem.currentThread = null;
-                        }
-                        ex.GetHashCode();
-                        Thread.ResetAbort();
-                    }
-                    catch(Exception ex)
-                    {
+                                        // On timeout or shut down.
+                                        if (null == workItem)
+                                        {
+                                                // Double lock for quit.
+                        if (_workerThreads.Count > _stpStartInfo.MinWorkerThreads)
+                                                {
+                                                        lock(_workerThreads.SyncRoot)
+                                                        {
+                                if (_workerThreads.Count > _stpStartInfo.MinWorkerThreads)
+                                                                {
+                                                                        // Inform that the thread is quiting and then quit.
+                                                                        // This method must be called within this lock or else
+                                                                        // more threads will quit and the thread pool will go
+                                                                        // below the lower limit.
+                                                                        InformCompleted();
+                                                                        break;
+                                                                }
+                                                        }
+                                                }
+                                        }
+
+                                        // If we didn't quit then skip to the next iteration.
+                                        if (null == workItem)
+                                        {
+                                                continue;
+                                        }
+
+                                        try 
+                                        {
+                                                // Initialize the value to false
+                                                bInUseWorkerThreadsWasIncremented = false;
+
+                        // Set the Current Work Item of the thread.
+                        // Store the Current Work Item  before the workItem.StartingWorkItem() is called, 
+                        // so WorkItem.Cancel can work when the work item is between InQueue and InProgress 
+                        // states.
+                        // If the work item has been cancelled BEFORE the workItem.StartingWorkItem() 
+                        // (work item is in InQueue state) then workItem.StartingWorkItem() will return false.
+                        // If the work item has been cancelled AFTER the workItem.StartingWorkItem() then
+                        // (work item is in InProgress state) then the thread will be aborted
+                        CurrentThreadEntry.CurrentWorkItem = workItem;
+
+                                                // Change the state of the work item to 'in progress' if possible.
+                                                // We do it here so if the work item has been canceled we won't 
+                                                // increment the _inUseWorkerThreads.
+                                                // The cancel mechanism doesn't delete items from the queue,  
+                                                // it marks the work item as canceled, and when the work item
+                                                // is dequeued, we just skip it.
+                                                // If the post execute of work item is set to always or to
+                                                // call when the work item is canceled then the StartingWorkItem()
+                                                // will return true, so the post execute can run.
+                                                if (!workItem.StartingWorkItem())
+                                                {
+                                                        continue;
+                                                }
+
+                                                // Execute the callback.  Make sure to accurately
+                                                // record how many callbacks are currently executing.
+                                                int inUseWorkerThreads = Interlocked.Increment(ref _inUseWorkerThreads);
+                                                _windowsPCs.SampleThreads(_workerThreads.Count, inUseWorkerThreads);
+                        _localPCs.SampleThreads(_workerThreads.Count, inUseWorkerThreads);
+
+                                                // Mark that the _inUseWorkerThreads incremented, so in the finally{}
+                                                // statement we will decrement it correctly.
+                                                bInUseWorkerThreadsWasIncremented = true;
+
+                        workItem.FireWorkItemStarted();
+
+                                                ExecuteWorkItem(workItem);
+                                        }
+                                        catch(Exception ex)
+                                        {
                         ex.GetHashCode();
-                        // Do nothing
-                    }
-                    finally
-                    {
-                        lock(workItem)
-                        {
-                            workItem.currentThread = null;
-                        }
-
-                        if (null != workItem)
-                        {
-                            workItem.DisposeOfState();
-                        }
-
-                        // Set the _currentWorkItem to null, since we 
-                        // no longer run user's code.
-                        _currentWorkItem = null;
-
-                        // Decrement the _inUseWorkerThreads only if we had 
-                        // incremented it. Note the cancelled work items don't
-                        // increment _inUseWorkerThreads.
-                        if (bInUseWorkerThreadsWasIncremented)
-                        {
-                            int inUseWorkerThreads = Interlocked.Decrement(ref _inUseWorkerThreads);
-                            _pcs.SampleThreads(_workerThreads.Count, inUseWorkerThreads);
-                        }
-
-                        // Notify that the work item has been completed.
-                        // WorkItemsGroup may enqueue their next work item.
-                        workItem.FireWorkItemCompleted();
-
-                        // Decrement the number of work items here so the idle 
-                        // ManualResetEvent won't fluctuate.
-                        DecrementWorkItemsCount();
-                    }
-                }
-            } 
-            catch(ThreadAbortException tae)
-            {
+                                                // Do nothing
+                                        }
+                                        finally
+                                        {
+                                                workItem.DisposeOfState();
+
+                                                // Set the CurrentWorkItem to null, since we 
+                                                // no longer run user's code.
+                        CurrentThreadEntry.CurrentWorkItem = null;
+
+                                                // Decrement the _inUseWorkerThreads only if we had 
+                                                // incremented it. Note the cancelled work items don't
+                                                // increment _inUseWorkerThreads.
+                                                if (bInUseWorkerThreadsWasIncremented)
+                                                {
+                                                        int inUseWorkerThreads = Interlocked.Decrement(ref _inUseWorkerThreads);
+                                                        _windowsPCs.SampleThreads(_workerThreads.Count, inUseWorkerThreads);
+                            _localPCs.SampleThreads(_workerThreads.Count, inUseWorkerThreads);
+                                                }
+
+                                                // Notify that the work item has been completed.
+                                                // WorkItemsGroup may enqueue their next work item.
+                                                workItem.FireWorkItemCompleted();
+
+                                                // Decrement the number of work items here so the idle 
+                                                // ManualResetEvent won't fluctuate.
+                                                DecrementWorkItemsCount();
+                                        }
+                                }
+                        } 
+                        catch(ThreadAbortException tae)
+                        {
                 tae.GetHashCode();
                 // Handle the abort exception gracfully.
-                Thread.ResetAbort();
-            }
-            catch(Exception e)
-            {
-                Debug.Assert(null != e);
-            }
-            finally
-            {
-                InformCompleted();
-            }
-        }
-
-        private void ExecuteWorkItem(WorkItem workItem)
-        {
-            _pcs.SampleWorkItemsWaitTime(workItem.WaitingTime);
-            try
-            {
-                workItem.Execute();
-            }
-            catch
-            {
-                throw;
+#if !(_WINDOWS_CE) && !(_SILVERLIGHT) && !(WINDOWS_PHONE)
+                                Thread.ResetAbort();
+#endif
             }
-            finally
+                        catch(Exception e)
+                        {
+                                Debug.Assert(null != e);
+                        }
+                        finally
+                        {
+                                InformCompleted();
+                FireOnThreadTermination();
+                        }
+                }
+
+                private void ExecuteWorkItem(WorkItem workItem)
+                {
+                        _windowsPCs.SampleWorkItemsWaitTime(workItem.WaitingTime);
+            _localPCs.SampleWorkItemsWaitTime(workItem.WaitingTime);
+                        try
+                        {
+                                workItem.Execute();
+                        }
+                        finally
+                        {
+                                _windowsPCs.SampleWorkItemsProcessTime(workItem.ProcessTime);
+                _localPCs.SampleWorkItemsProcessTime(workItem.ProcessTime);
+                        }
+                }
+
+
+                #endregion
+
+                #region Public Methods
+
+                private void ValidateWaitForIdle()
+                {
+            if (null != CurrentThreadEntry && CurrentThreadEntry.AssociatedSmartThreadPool == this)
+                        {
+                                throw new NotSupportedException(
+                                        "WaitForIdle cannot be called from a thread on its SmartThreadPool, it causes a deadlock");
+                        }
+                }
+
+                internal static void ValidateWorkItemsGroupWaitForIdle(IWorkItemsGroup workItemsGroup)
+                {
+            if (null == CurrentThreadEntry)
             {
-                _pcs.SampleWorkItemsProcessTime(workItem.ProcessTime);
+                return;
             }
-        }
-
-
-        #endregion
 
-        #region Public Methods
-
-        /// <summary>
-        /// Queue a work item
+            WorkItem workItem = CurrentThreadEntry.CurrentWorkItem;
+            ValidateWorkItemsGroupWaitForIdleImpl(workItemsGroup, workItem);
+                        if ((null != workItemsGroup) &&
+                (null != workItem) &&
+                CurrentThreadEntry.CurrentWorkItem.WasQueuedBy(workItemsGroup))
+                        {
+                                throw new NotSupportedException("WaitForIdle cannot be called from a thread on its SmartThreadPool, it causes a deadlock");
+                        }
+                }
+
+                [MethodImpl(MethodImplOptions.NoInlining)]
+                private static void ValidateWorkItemsGroupWaitForIdleImpl(IWorkItemsGroup workItemsGroup, WorkItem workItem)
+                {
+                        if ((null != workItemsGroup) && 
+                                (null != workItem) &&
+                                workItem.WasQueuedBy(workItemsGroup))
+                        {
+                                throw new NotSupportedException("WaitForIdle cannot be called from a thread on its SmartThreadPool, it causes a deadlock");
+                        }
+                }
+
+                /// <summary>
+                /// Force the SmartThreadPool to shutdown
+                /// </summary>
+                public void Shutdown()
+                {
+                        Shutdown(true, 0);
+                }
+
+        /// <summary>
+        /// Force the SmartThreadPool to shutdown with timeout
         /// </summary>
-        /// <param name="callback">A callback to execute</param>
-        /// <returns>Returns a work item result</returns>
-        public IWorkItemResult QueueWorkItem(WorkItemCallback callback)
-        {
-            ValidateNotDisposed();
-            ValidateCallback(callback);
-            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, _stpStartInfo, callback);
-            Enqueue(workItem);
-            return workItem.GetWorkItemResult();
-        }
+        public void Shutdown(bool forceAbort, TimeSpan timeout)
+                {
+                        Shutdown(forceAbort, (int)timeout.TotalMilliseconds);
+                }
+
+                /// <summary>
+                /// Empties the queue of work items and abort the threads in the pool.
+                /// </summary>
+                public void Shutdown(bool forceAbort, int millisecondsTimeout)
+                {
+                        ValidateNotDisposed();
+
+                        ISTPInstancePerformanceCounters pcs = _windowsPCs;
+
+                        if (NullSTPInstancePerformanceCounters.Instance != _windowsPCs)
+                        {
+                                // Set the _pcs to "null" to stop updating the performance
+                                // counters
+                                _windowsPCs = NullSTPInstancePerformanceCounters.Instance;
+
+                pcs.Dispose();
+                        }
+
+                        Thread [] threads;
+                        lock(_workerThreads.SyncRoot)
+                        {
+                                // Shutdown the work items queue
+                                _workItemsQueue.Dispose();
+
+                                // Signal the threads to exit
+                                _shutdown = true;
+                                _shuttingDownEvent.Set();
+
+                                // Make a copy of the threads' references in the pool
+                                threads = new Thread [_workerThreads.Count];
+                                _workerThreads.Keys.CopyTo(threads, 0);
+                        }
+
+                        int millisecondsLeft = millisecondsTimeout;
+            Stopwatch stopwatch = Stopwatch.StartNew();
+            //DateTime start = DateTime.UtcNow;
+                        bool waitInfinitely = (Timeout.Infinite == millisecondsTimeout);
+                        bool timeout = false;
+
+                        // Each iteration we update the time left for the timeout.
+                        foreach(Thread thread in threads)
+                        {
+                                // Join don't work with negative numbers
+                                if (!waitInfinitely && (millisecondsLeft < 0))
+                                {
+                                        timeout = true;
+                                        break;
+                                }
+
+                                // Wait for the thread to terminate
+                                bool success = thread.Join(millisecondsLeft);
+                                if(!success)
+                                {
+                                        timeout = true;
+                                        break;
+                                }
+
+                                if(!waitInfinitely)
+                                {
+                                        // Update the time left to wait
+                    //TimeSpan ts = DateTime.UtcNow - start;
+                    millisecondsLeft = millisecondsTimeout - (int)stopwatch.ElapsedMilliseconds;
+                                }
+                        }
+
+                        if (timeout && forceAbort)
+                        {
+                                // Abort the threads in the pool
+                                foreach(Thread thread in threads)
+                                {
+                    
+                                        if ((thread != null)
+#if !(_WINDOWS_CE)
+                        && thread.IsAlive
+#endif                        
+                        )
+                                        {
+                                                try 
+                                                {
+                            thread.Abort(); // Shutdown
+                                                }
+                                                catch(SecurityException e)
+                                                {
+                            e.GetHashCode();
+                                                }
+                                                catch(ThreadStateException ex)
+                                                {
+                            ex.GetHashCode();
+                                                        // In case the thread has been terminated 
+                                                        // after the check if it is alive.
+                                                }
+                                        }
+                                }
+                        }
+                }
+
+                /// <summary>
+                /// Wait for all work items to complete
+                /// </summary>
+        /// <param name="waitableResults">Array of work item result objects</param>
+                /// <returns>
+                /// true when every work item in workItemResults has completed; otherwise false.
+                /// </returns>
+                public static bool WaitAll(
+                        IWaitableResult [] waitableResults)
+                {
+            return WaitAll(waitableResults, Timeout.Infinite, true);
+                }
+
+                /// <summary>
+                /// Wait for all work items to complete
+                /// </summary>
+        /// <param name="waitableResults">Array of work item result objects</param>
+                /// <param name="timeout">The number of milliseconds to wait, or a TimeSpan that represents -1 milliseconds to wait indefinitely. </param>
+                /// <param name="exitContext">
+                /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
+                /// </param>
+                /// <returns>
+                /// true when every work item in workItemResults has completed; otherwise false.
+                /// </returns>
+                public static bool WaitAll(
+                        IWaitableResult [] waitableResults,
+                        TimeSpan timeout,
+                        bool exitContext)
+                {
+            return WaitAll(waitableResults, (int)timeout.TotalMilliseconds, exitContext);
+                }
+
+                /// <summary>
+                /// Wait for all work items to complete
+                /// </summary>
+        /// <param name="waitableResults">Array of work item result objects</param>
+                /// <param name="timeout">The number of milliseconds to wait, or a TimeSpan that represents -1 milliseconds to wait indefinitely. </param>
+                /// <param name="exitContext">
+                /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
+                /// </param>
+                /// <param name="cancelWaitHandle">A cancel wait handle to interrupt the wait if needed</param>
+                /// <returns>
+                /// true when every work item in workItemResults has completed; otherwise false.
+                /// </returns>
+                public static bool WaitAll(
+            IWaitableResult[] waitableResults,  
+                        TimeSpan timeout,
+                        bool exitContext,
+                        WaitHandle cancelWaitHandle)
+                {
+            return WaitAll(waitableResults, (int)timeout.TotalMilliseconds, exitContext, cancelWaitHandle);
+                }
+
+                /// <summary>
+                /// Wait for all work items to complete
+                /// </summary>
+        /// <param name="waitableResults">Array of work item result objects</param>
+                /// <param name="millisecondsTimeout">The number of milliseconds to wait, or Timeout.Infinite (-1) to wait indefinitely.</param>
+                /// <param name="exitContext">
+                /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
+                /// </param>
+                /// <returns>
+                /// true when every work item in workItemResults has completed; otherwise false.
+                /// </returns>
+                public static bool WaitAll(
+                        IWaitableResult [] waitableResults,  
+                        int millisecondsTimeout,
+                        bool exitContext)
+                {
+            return WorkItem.WaitAll(waitableResults, millisecondsTimeout, exitContext, null);
+                }
+
+                /// <summary>
+                /// Wait for all work items to complete
+                /// </summary>
+        /// <param name="waitableResults">Array of work item result objects</param>
+                /// <param name="millisecondsTimeout">The number of milliseconds to wait, or Timeout.Infinite (-1) to wait indefinitely.</param>
+                /// <param name="exitContext">
+                /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
+                /// </param>
+                /// <param name="cancelWaitHandle">A cancel wait handle to interrupt the wait if needed</param>
+                /// <returns>
+                /// true when every work item in workItemResults has completed; otherwise false.
+                /// </returns>
+                public static bool WaitAll(
+            IWaitableResult[] waitableResults,  
+                        int millisecondsTimeout,
+                        bool exitContext,
+                        WaitHandle cancelWaitHandle)
+                {
+            return WorkItem.WaitAll(waitableResults, millisecondsTimeout, exitContext, cancelWaitHandle);
+                }
+
+
+                /// <summary>
+                /// Waits for any of the work items in the specified array to complete, cancel, or timeout
+                /// </summary>
+        /// <param name="waitableResults">Array of work item result objects</param>
+                /// <returns>
+                /// The array index of the work item result that satisfied the wait, or WaitTimeout if any of the work items has been canceled.
+                /// </returns>
+                public static int WaitAny(
+                        IWaitableResult [] waitableResults)
+                {
+            return WaitAny(waitableResults, Timeout.Infinite, true);
+                }
+
+                /// <summary>
+                /// Waits for any of the work items in the specified array to complete, cancel, or timeout
+                /// </summary>
+        /// <param name="waitableResults">Array of work item result objects</param>
+                /// <param name="timeout">The number of milliseconds to wait, or a TimeSpan that represents -1 milliseconds to wait indefinitely. </param>
+                /// <param name="exitContext">
+                /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
+                /// </param>
+                /// <returns>
+                /// The array index of the work item result that satisfied the wait, or WaitTimeout if no work item result satisfied the wait and a time interval equivalent to millisecondsTimeout has passed or the work item has been canceled.
+                /// </returns>
+                public static int WaitAny(
+            IWaitableResult[] waitableResults,
+                        TimeSpan timeout,
+                        bool exitContext)
+                {
+            return WaitAny(waitableResults, (int)timeout.TotalMilliseconds, exitContext);
+                }
+
+                /// <summary>
+                /// Waits for any of the work items in the specified array to complete, cancel, or timeout
+                /// </summary>
+        /// <param name="waitableResults">Array of work item result objects</param>
+                /// <param name="timeout">The number of milliseconds to wait, or a TimeSpan that represents -1 milliseconds to wait indefinitely. </param>
+                /// <param name="exitContext">
+                /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
+                /// </param>
+                /// <param name="cancelWaitHandle">A cancel wait handle to interrupt the wait if needed</param>
+                /// <returns>
+                /// The array index of the work item result that satisfied the wait, or WaitTimeout if no work item result satisfied the wait and a time interval equivalent to millisecondsTimeout has passed or the work item has been canceled.
+                /// </returns>
+                public static int WaitAny(
+                        IWaitableResult [] waitableResults,
+                        TimeSpan timeout,
+                        bool exitContext,
+                        WaitHandle cancelWaitHandle)
+                {
+            return WaitAny(waitableResults, (int)timeout.TotalMilliseconds, exitContext, cancelWaitHandle);
+                }
+
+                /// <summary>
+                /// Waits for any of the work items in the specified array to complete, cancel, or timeout
+                /// </summary>
+        /// <param name="waitableResults">Array of work item result objects</param>
+                /// <param name="millisecondsTimeout">The number of milliseconds to wait, or Timeout.Infinite (-1) to wait indefinitely.</param>
+                /// <param name="exitContext">
+                /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
+                /// </param>
+                /// <returns>
+                /// The array index of the work item result that satisfied the wait, or WaitTimeout if no work item result satisfied the wait and a time interval equivalent to millisecondsTimeout has passed or the work item has been canceled.
+                /// </returns>
+                public static int WaitAny(
+                        IWaitableResult [] waitableResults,  
+                        int millisecondsTimeout,
+                        bool exitContext)
+                {
+            return WorkItem.WaitAny(waitableResults, millisecondsTimeout, exitContext, null);
+                }
+
+                /// <summary>
+                /// Waits for any of the work items in the specified array to complete, cancel, or timeout
+                /// </summary>
+        /// <param name="waitableResults">Array of work item result objects</param>
+                /// <param name="millisecondsTimeout">The number of milliseconds to wait, or Timeout.Infinite (-1) to wait indefinitely.</param>
+                /// <param name="exitContext">
+                /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
+                /// </param>
+                /// <param name="cancelWaitHandle">A cancel wait handle to interrupt the wait if needed</param>
+                /// <returns>
+                /// The array index of the work item result that satisfied the wait, or WaitTimeout if no work item result satisfied the wait and a time interval equivalent to millisecondsTimeout has passed or the work item has been canceled.
+                /// </returns>
+                public static int WaitAny(
+                        IWaitableResult [] waitableResults,  
+                        int millisecondsTimeout,
+                        bool exitContext,
+                        WaitHandle cancelWaitHandle)
+                {
+            return WorkItem.WaitAny(waitableResults, millisecondsTimeout, exitContext, cancelWaitHandle);
+                }
+
+        /// <summary>
+        /// Creates a new WorkItemsGroup.
+        /// </summary>
+        /// <param name="concurrency">The number of work items that can be run concurrently</param>
+        /// <returns>A reference to the WorkItemsGroup</returns>
+                public IWorkItemsGroup CreateWorkItemsGroup(int concurrency)
+                {
+            IWorkItemsGroup workItemsGroup = new WorkItemsGroup(this, concurrency, _stpStartInfo);
+                        return workItemsGroup;
+                }
 
         /// <summary>
-        /// Queue a work item
+        /// Creates a new WorkItemsGroup.
         /// </summary>
-        /// <param name="callback">A callback to execute</param>
-        /// <param name="workItemPriority">The priority of the work item</param>
-        /// <returns>Returns a work item result</returns>
-        public IWorkItemResult QueueWorkItem(WorkItemCallback callback, WorkItemPriority workItemPriority)
-        {
-            ValidateNotDisposed();
-            ValidateCallback(callback);
-            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, _stpStartInfo, callback, workItemPriority);
-            Enqueue(workItem);
-            return workItem.GetWorkItemResult();
-        }
+        /// <param name="concurrency">The number of work items that can be run concurrently</param>
+        /// <param name="wigStartInfo">A WorkItemsGroup configuration that overrides the default behavior</param>
+        /// <returns>A reference to the WorkItemsGroup</returns>
+                public IWorkItemsGroup CreateWorkItemsGroup(int concurrency, WIGStartInfo wigStartInfo)
+                {
+                        IWorkItemsGroup workItemsGroup = new WorkItemsGroup(this, concurrency, wigStartInfo);
+                        return workItemsGroup;
+                }
 
-        /// <summary>
-        /// Queue a work item
-        /// </summary>
-        /// <param name="workItemInfo">Work item info</param>
-        /// <param name="callback">A callback to execute</param>
-        /// <returns>Returns a work item result</returns>
-        public IWorkItemResult QueueWorkItem(WorkItemInfo workItemInfo, WorkItemCallback callback)
-        {
-            ValidateNotDisposed();
-            ValidateCallback(callback);
-            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, _stpStartInfo, workItemInfo, callback);
-            Enqueue(workItem);
-            return workItem.GetWorkItemResult();
-        }
+        #region Fire Thread's Events
 
-        /// <summary>
-        /// Queue a work item
-        /// </summary>
-        /// <param name="callback">A callback to execute</param>
-        /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
-        /// </param>
-        /// <returns>Returns a work item result</returns>
-        public IWorkItemResult QueueWorkItem(WorkItemCallback callback, object state)
+        private void FireOnThreadInitialization()
         {
-            ValidateNotDisposed();
-            ValidateCallback(callback);
-            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, _stpStartInfo, callback, state);
-            Enqueue(workItem);
-            return workItem.GetWorkItemResult();
+            if (null != _onThreadInitialization)
+            {
+                foreach (ThreadInitializationHandler tih in _onThreadInitialization.GetInvocationList())
+                {
+                    try
+                    {
+                        tih();
+                    }
+                    catch (Exception e)
+                    {
+                        e.GetHashCode();
+                        Debug.Assert(false);
+                        throw;
+                    }
+                }
+            }
         }
 
-        /// <summary>
-        /// Queue a work item
-        /// </summary>
-        /// <param name="callback">A callback to execute</param>
-        /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
-        /// </param>
-        /// <param name="workItemPriority">The work item priority</param>
-        /// <returns>Returns a work item result</returns>
-        public IWorkItemResult QueueWorkItem(WorkItemCallback callback, object state, WorkItemPriority workItemPriority)
+        private void FireOnThreadTermination()
         {
-            ValidateNotDisposed();
-            ValidateCallback(callback);
-            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, _stpStartInfo, callback, state, workItemPriority);
-            Enqueue(workItem);
-            return workItem.GetWorkItemResult();
+            if (null != _onThreadTermination)
+            {
+                foreach (ThreadTerminationHandler tth in _onThreadTermination.GetInvocationList())
+                {
+                    try
+                    {
+                        tth();
+                    }
+                    catch (Exception e)
+                    {
+                        e.GetHashCode();
+                        Debug.Assert(false);
+                        throw;
+                    }
+                }
+            }
         }
 
-        /// <summary>
-        /// Queue a work item
-        /// </summary>
-        /// <param name="workItemInfo">Work item information</param>
-        /// <param name="callback">A callback to execute</param>
-        /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
-        /// </param>
-        /// <returns>Returns a work item result</returns>
-        public IWorkItemResult QueueWorkItem(WorkItemInfo workItemInfo, WorkItemCallback callback, object state)
-        {
-            ValidateNotDisposed();
-            ValidateCallback(callback);
-            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, _stpStartInfo, workItemInfo, callback, state);
-            Enqueue(workItem);
-            return workItem.GetWorkItemResult();
-        }
+        #endregion
 
         /// <summary>
-        /// Queue a work item
+        /// This event is fired when a thread is created.
+        /// Use it to initialize a thread before the work items use it.
         /// </summary>
-        /// <param name="callback">A callback to execute</param>
-        /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
-        /// </param>
-        /// <param name="postExecuteWorkItemCallback">
-        /// A delegate to call after the callback completion
-        /// </param>
-        /// <returns>Returns a work item result</returns>
-        public IWorkItemResult QueueWorkItem(
-            WorkItemCallback callback, 
-            object state,
-            PostExecuteWorkItemCallback postExecuteWorkItemCallback)
+        public event ThreadInitializationHandler OnThreadInitialization
         {
-            ValidateNotDisposed();
-            ValidateCallback(callback);
-            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, _stpStartInfo, callback, state, postExecuteWorkItemCallback);
-            Enqueue(workItem);
-            return workItem.GetWorkItemResult();
+            add { _onThreadInitialization += value; }
+            remove { _onThreadInitialization -= value; }
         }
 
         /// <summary>
-        /// Queue a work item
+        /// This event is fired when a thread is terminating.
+        /// Use it for cleanup.
         /// </summary>
-        /// <param name="callback">A callback to execute</param>
-        /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
-        /// </param>
-        /// <param name="postExecuteWorkItemCallback">
-        /// A delegate to call after the callback completion
-        /// </param>
-        /// <param name="workItemPriority">The work item priority</param>
-        /// <returns>Returns a work item result</returns>
-        public IWorkItemResult QueueWorkItem(
-            WorkItemCallback callback, 
-            object state,
-            PostExecuteWorkItemCallback postExecuteWorkItemCallback,
-            WorkItemPriority workItemPriority)
+        public event ThreadTerminationHandler OnThreadTermination
         {
-            ValidateNotDisposed();
-            ValidateCallback(callback);
-            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, _stpStartInfo, callback, state, postExecuteWorkItemCallback, workItemPriority);
-            Enqueue(workItem);
-            return workItem.GetWorkItemResult();
+            add { _onThreadTermination += value; }
+            remove { _onThreadTermination -= value; }
         }
 
-        /// <summary>
-        /// Queue a work item
-        /// </summary>
-        /// <param name="callback">A callback to execute</param>
-        /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
-        /// </param>
-        /// <param name="postExecuteWorkItemCallback">
-        /// A delegate to call after the callback completion
-        /// </param>
-        /// <param name="callToPostExecute">Indicates on which cases to call to the post execute callback</param>
-        /// <returns>Returns a work item result</returns>
-        public IWorkItemResult QueueWorkItem(
-            WorkItemCallback callback, 
-            object state,
-            PostExecuteWorkItemCallback postExecuteWorkItemCallback,
-            CallToPostExecute callToPostExecute)
-        {
-            ValidateNotDisposed();
-            ValidateCallback(callback);
-            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, _stpStartInfo, callback, state, postExecuteWorkItemCallback, callToPostExecute);
-            Enqueue(workItem);
-            return workItem.GetWorkItemResult();
-        }
 
-        /// <summary>
-        /// Queue a work item
-        /// </summary>
-        /// <param name="callback">A callback to execute</param>
-        /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
-        /// </param>
-        /// <param name="postExecuteWorkItemCallback">
-        /// A delegate to call after the callback completion
-        /// </param>
-        /// <param name="callToPostExecute">Indicates on which cases to call to the post execute callback</param>
-        /// <param name="workItemPriority">The work item priority</param>
-        /// <returns>Returns a work item result</returns>
-        public IWorkItemResult QueueWorkItem(
-            WorkItemCallback callback, 
-            object state,
-            PostExecuteWorkItemCallback postExecuteWorkItemCallback,
-            CallToPostExecute callToPostExecute,
-            WorkItemPriority workItemPriority)
+        internal void CancelAbortWorkItemsGroup(WorkItemsGroup wig)
         {
-            ValidateNotDisposed();
-            ValidateCallback(callback);
-            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, _stpStartInfo, callback, state, postExecuteWorkItemCallback, callToPostExecute, workItemPriority);
-            Enqueue(workItem);
-            return workItem.GetWorkItemResult();
+            foreach (ThreadEntry threadEntry in _workerThreads.Values)
+            {
+                WorkItem workItem = threadEntry.CurrentWorkItem;
+                if (null != workItem &&
+                    workItem.WasQueuedBy(wig) &&
+                    !workItem.IsCanceled)
+                {
+                    threadEntry.CurrentWorkItem.GetWorkItemResult().Cancel(true);
+                }
+            }
         }
 
-        /// <summary>
-        /// Wait for the thread pool to be idle
-        /// </summary>
-        public void WaitForIdle()
-        {
-            WaitForIdle(Timeout.Infinite);
-        }
+        
 
-        /// <summary>
-        /// Wait for the thread pool to be idle
-        /// </summary>
-        public bool WaitForIdle(TimeSpan timeout)
-        {
-            return WaitForIdle((int)timeout.TotalMilliseconds);
-        }
+                #endregion
 
-        /// <summary>
-        /// Wait for the thread pool to be idle
-        /// </summary>
-        public bool WaitForIdle(int millisecondsTimeout)
-        {
-            ValidateWaitForIdle();
-            return _isIdleWaitHandle.WaitOne(millisecondsTimeout, false);
-        }
+                #region Properties
 
-        private void ValidateWaitForIdle()
-        {
-            if(_smartThreadPool == this)
+                /// <summary>
+                /// Get/Set the lower limit of threads in the pool.
+                /// </summary>
+                public int MinThreads 
+                { 
+                        get 
+                        {
+                                ValidateNotDisposed();
+                return _stpStartInfo.MinWorkerThreads; 
+                        }
+            set
             {
-                throw new NotSupportedException(
-                    "WaitForIdle cannot be called from a thread on its SmartThreadPool, it will cause may cause a deadlock");
+                Debug.Assert(value >= 0);
+                Debug.Assert(value <= _stpStartInfo.MaxWorkerThreads);
+                if (_stpStartInfo.MaxWorkerThreads < value)
+                {
+                    _stpStartInfo.MaxWorkerThreads = value;
+                }
+                _stpStartInfo.MinWorkerThreads = value;
+                StartOptimalNumberOfThreads();
             }
-        }
+                }
+
+            /// <summary>
+                /// Get/Set the upper limit of threads in the pool.
+                /// </summary>
+                public int MaxThreads 
+                { 
+                        get 
+                        {
+                                ValidateNotDisposed();
+                return _stpStartInfo.MaxWorkerThreads; 
+                        } 
 
-        internal void ValidateWorkItemsGroupWaitForIdle(IWorkItemsGroup workItemsGroup)
+                        set 
+                        {
+                Debug.Assert(value > 0);
+                Debug.Assert(value >= _stpStartInfo.MinWorkerThreads);
+                if (_stpStartInfo.MinWorkerThreads > value)
+                {
+                    _stpStartInfo.MinWorkerThreads = value;
+                }
+                _stpStartInfo.MaxWorkerThreads = value;
+                StartOptimalNumberOfThreads();
+            } 
+                }
+                /// <summary>
+                /// Get the number of threads in the thread pool.
+                /// Should be between the lower and the upper limits.
+                /// </summary>
+                public int ActiveThreads 
+                { 
+                        get 
+                        {
+                                ValidateNotDisposed();
+                                return _workerThreads.Count; 
+                        } 
+                }
+
+                /// <summary>
+                /// Get the number of busy (not idle) threads in the thread pool.
+                /// </summary>
+                public int InUseThreads 
+                { 
+                        get 
+                        { 
+                                ValidateNotDisposed();
+                                return _inUseWorkerThreads; 
+                        } 
+                }
+
+        /// <summary>
+        /// Returns true if the current running work item has been cancelled.
+        /// Must be used within the work item's callback method.
+        /// The work item should sample this value in order to know if it
+        /// needs to quit before its completion.
+        /// </summary>
+        public static bool IsWorkItemCanceled
         {
-            ValidateWorkItemsGroupWaitForIdleImpl(workItemsGroup, SmartThreadPool._currentWorkItem);
-            if ((null != workItemsGroup) && 
-                (null != SmartThreadPool._currentWorkItem) &&
-                SmartThreadPool._currentWorkItem.WasQueuedBy(workItemsGroup))
+            get
             {
-                throw new NotSupportedException("WaitForIdle cannot be called from a thread on its SmartThreadPool, it will cause may cause a deadlock");
+                return CurrentThreadEntry.CurrentWorkItem.IsCanceled;
             }
-        }
-
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        private void ValidateWorkItemsGroupWaitForIdleImpl(IWorkItemsGroup workItemsGroup, WorkItem workItem)
+        } 
+        
+        /// <summary>
+        /// Checks if the work item has been cancelled, and if yes then abort the thread.
+        /// Can be used with Cancel and timeout
+        /// </summary>
+        public static void AbortOnWorkItemCancel()
         {
-            if ((null != workItemsGroup) && 
-                (null != workItem) &&
-                workItem.WasQueuedBy(workItemsGroup))
+            if (IsWorkItemCanceled)
             {
-                throw new NotSupportedException("WaitForIdle cannot be called from a thread on its SmartThreadPool, it will cause may cause a deadlock");
+                Thread.CurrentThread.Abort();
             }
         }
 
-
-
         /// <summary>
-        /// Force the SmartThreadPool to shutdown
+        /// Thread Pool start information (readonly)
         /// </summary>
-        public void Shutdown()
+        public STPStartInfo STPStartInfo
         {
-            Shutdown(true, 0);
+            get 
+            {
+                return _stpStartInfo.AsReadOnly(); 
+            }
         }
 
-        public void Shutdown(bool forceAbort, TimeSpan timeout)
-        {
-            Shutdown(forceAbort, (int)timeout.TotalMilliseconds);
-        }
+            public bool IsShuttingdown
+            {
+            get { return _shutdown;  }
+            }
 
         /// <summary>
-        /// Empties the queue of work items and abort the threads in the pool.
+        /// Return the local calculated performance counters
+        /// Available only if STPStartInfo.EnableLocalPerformanceCounters is true.
         /// </summary>
-        public void Shutdown(bool forceAbort, int millisecondsTimeout)
+        public ISTPPerformanceCountersReader PerformanceCountersReader
         {
-            ValidateNotDisposed();
-
-            ISTPInstancePerformanceCounters pcs = _pcs;
-
-            if (NullSTPInstancePerformanceCounters.Instance != _pcs)
-            {
-                _pcs.Dispose();
-                // Set the _pcs to "null" to stop updating the performance
-                // counters
-                _pcs = NullSTPInstancePerformanceCounters.Instance;
-            }
-
-            Thread [] threads = null;
-            lock(_workerThreads.SyncRoot)
-            {
-                // Shutdown the work items queue
-                _workItemsQueue.Dispose();
-
-                // Signal the threads to exit
-                _shutdown = true;
-                _shuttingDownEvent.Set();
+            get { return (ISTPPerformanceCountersReader)_localPCs; }
+        }
 
-                // Make a copy of the threads' references in the pool
-                threads = new Thread [_workerThreads.Count];
-                _workerThreads.Keys.CopyTo(threads, 0);
-            }
+        #endregion
 
-            int millisecondsLeft = millisecondsTimeout;
-            DateTime start = DateTime.Now;
-            bool waitInfinitely = (Timeout.Infinite == millisecondsTimeout);
-            bool timeout = false;
+        #region IDisposable Members
 
-            // Each iteration we update the time left for the timeout.
-            foreach(Thread thread in threads)
+        public void Dispose()
+        {
+            if (!_isDisposed)
             {
-                // Join don't work with negative numbers
-                if (!waitInfinitely && (millisecondsLeft < 0))
+                if (!_shutdown)
                 {
-                    timeout = true;
-                    break;
+                    Shutdown();
                 }
 
-                // Wait for the thread to terminate
-                bool success = thread.Join(millisecondsLeft);
-                if(!success)
+                if (null != _shuttingDownEvent)
                 {
-                    timeout = true;
-                    break;
+                    _shuttingDownEvent.Close();
+                    _shuttingDownEvent = null;
                 }
-
-                if(!waitInfinitely)
+                _workerThreads.Clear();
+                
+                if (null != _isIdleWaitHandle)
                 {
-                    // Update the time left to wait
-                    TimeSpan ts = DateTime.Now - start;
-                    millisecondsLeft = millisecondsTimeout - (int)ts.TotalMilliseconds;
+                    _isIdleWaitHandle.Close();
+                    _isIdleWaitHandle = null;
                 }
-            }
 
-            if (timeout && forceAbort)
-            {
-                // Abort the threads in the pool
-                foreach(Thread thread in threads)
-                {
-                    if ((thread != null) && thread.IsAlive) 
-                    {
-                        try 
-                        {
-                            thread.Abort("Shutdown");
-                        }
-                        catch(SecurityException e)
-                        {
-                            e.GetHashCode();
-                        }
-                        catch(ThreadStateException ex)
-                        {
-                            ex.GetHashCode();
-                            // In case the thread has been terminated 
-                            // after the check if it is alive.
-                        }
-                    }
-                }
+                _isDisposed = true;
             }
-
-            // Dispose of the performance counters
-            pcs.Dispose();
         }
 
-        /// <summary>
-        /// Wait for all work items to complete
-        /// </summary>
-        /// <param name="workItemResults">Array of work item result objects</param>
-        /// <returns>
-        /// true when every work item in workItemResults has completed; otherwise false.
-        /// </returns>
-        public static bool WaitAll(
-            IWorkItemResult [] workItemResults)
+        private void ValidateNotDisposed()
         {
-            return WaitAll(workItemResults, Timeout.Infinite, true);
+            if(_isDisposed)
+            {
+                throw new ObjectDisposedException(GetType().ToString(), "The SmartThreadPool has been shutdown");
+            }
         }
+        #endregion
+
+        #region WorkItemsGroupBase Overrides
 
         /// <summary>
-        /// Wait for all work items to complete
+        /// Get/Set the maximum number of work items that execute cocurrency on the thread pool
         /// </summary>
-        /// <param name="workItemResults">Array of work item result objects</param>
-        /// <param name="timeout">The number of milliseconds to wait, or a TimeSpan that represents -1 milliseconds to wait indefinitely. </param>
-        /// <param name="exitContext">
-        /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
-        /// </param>
-        /// <returns>
-        /// true when every work item in workItemResults has completed; otherwise false.
-        /// </returns>
-        public static bool WaitAll(
-            IWorkItemResult [] workItemResults,
-            TimeSpan timeout,
-            bool exitContext)
-        {
-            return WaitAll(workItemResults, (int)timeout.TotalMilliseconds, exitContext);
-        }
+        public override int Concurrency
+            {
+                get { return MaxThreads; }
+                set { MaxThreads = value; }
+            }
+
+            /// <summary>
+            /// Get the number of work items in the queue.
+            /// </summary>
+            public override int WaitingCallbacks
+            {
+                get
+                {
+                    ValidateNotDisposed();
+                    return _workItemsQueue.Count;
+                }
+            }
 
         /// <summary>
-        /// Wait for all work items to complete
+        /// Get an array with all the state objects of the currently running items.
+        /// The array represents a snap shot and impact performance.
         /// </summary>
-        /// <param name="workItemResults">Array of work item result objects</param>
-        /// <param name="timeout">The number of milliseconds to wait, or a TimeSpan that represents -1 milliseconds to wait indefinitely. </param>
-        /// <param name="exitContext">
-        /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
-        /// </param>
-        /// <param name="cancelWaitHandle">A cancel wait handle to interrupt the wait if needed</param>
-        /// <returns>
-        /// true when every work item in workItemResults has completed; otherwise false.
-        /// </returns>
-        public static bool WaitAll(
-            IWorkItemResult [] workItemResults,  
-            TimeSpan timeout,
-            bool exitContext,
-            WaitHandle cancelWaitHandle)
+        public override object[] GetStates()
         {
-            return WaitAll(workItemResults, (int)timeout.TotalMilliseconds, exitContext, cancelWaitHandle);
+            object[] states = _workItemsQueue.GetStates();
+            return states;
         }
 
         /// <summary>
-        /// Wait for all work items to complete
+        /// WorkItemsGroup start information (readonly)
         /// </summary>
-        /// <param name="workItemResults">Array of work item result objects</param>
-        /// <param name="millisecondsTimeout">The number of milliseconds to wait, or Timeout.Infinite (-1) to wait indefinitely.</param>
-        /// <param name="exitContext">
-        /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
-        /// </param>
-        /// <returns>
-        /// true when every work item in workItemResults has completed; otherwise false.
-        /// </returns>
-        public static bool WaitAll(
-            IWorkItemResult [] workItemResults,  
-            int millisecondsTimeout,
-            bool exitContext)
+        public override WIGStartInfo WIGStartInfo
         {
-            return WorkItem.WaitAll(workItemResults, millisecondsTimeout, exitContext, null);
+            get { return _stpStartInfo.AsReadOnly(); }
         }
 
-        /// <summary>
-        /// Wait for all work items to complete
+            /// <summary>
+        /// Start the thread pool if it was started suspended.
+        /// If it is already running, this method is ignored.
         /// </summary>
-        /// <param name="workItemResults">Array of work item result objects</param>
-        /// <param name="millisecondsTimeout">The number of milliseconds to wait, or Timeout.Infinite (-1) to wait indefinitely.</param>
-        /// <param name="exitContext">
-        /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
-        /// </param>
-        /// <param name="cancelWaitHandle">A cancel wait handle to interrupt the wait if needed</param>
-        /// <returns>
-        /// true when every work item in workItemResults has completed; otherwise false.
-        /// </returns>
-        public static bool WaitAll(
-            IWorkItemResult [] workItemResults,  
-            int millisecondsTimeout,
-            bool exitContext,
-            WaitHandle cancelWaitHandle)
+        public override void Start()
         {
-            return WorkItem.WaitAll(workItemResults, millisecondsTimeout, exitContext, cancelWaitHandle);
-        }
+            if (!_isSuspended)
+            {
+                return;
+            }
+            _isSuspended = false;
 
+            ICollection workItemsGroups = _workItemsGroups.Values;
+            foreach (WorkItemsGroup workItemsGroup in workItemsGroups)
+            {
+                workItemsGroup.OnSTPIsStarting();
+            }
 
-        /// <summary>
-        /// Waits for any of the work items in the specified array to complete, cancel, or timeout
-        /// </summary>
-        /// <param name="workItemResults">Array of work item result objects</param>
-        /// <returns>
-        /// The array index of the work item result that satisfied the wait, or WaitTimeout if any of the work items has been canceled.
-        /// </returns>
-        public static int WaitAny(
-            IWorkItemResult [] workItemResults)
-        {
-            return WaitAny(workItemResults, Timeout.Infinite, true);
+            StartOptimalNumberOfThreads();
         }
 
         /// <summary>
-        /// Waits for any of the work items in the specified array to complete, cancel, or timeout
+        /// Cancel all work items using thread abortion
         /// </summary>
-        /// <param name="workItemResults">Array of work item result objects</param>
-        /// <param name="timeout">The number of milliseconds to wait, or a TimeSpan that represents -1 milliseconds to wait indefinitely. </param>
-        /// <param name="exitContext">
-        /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
-        /// </param>
-        /// <returns>
-        /// The array index of the work item result that satisfied the wait, or WaitTimeout if no work item result satisfied the wait and a time interval equivalent to millisecondsTimeout has passed or the work item has been canceled.
-        /// </returns>
-        public static int WaitAny(
-            IWorkItemResult [] workItemResults,
-            TimeSpan timeout,
-            bool exitContext)
+        /// <param name="abortExecution">True to stop work items by raising ThreadAbortException</param>
+        public override void Cancel(bool abortExecution)
         {
-            return WaitAny(workItemResults, (int)timeout.TotalMilliseconds, exitContext);
-        }
+            _canceledSmartThreadPool.IsCanceled = true;
+            _canceledSmartThreadPool = new CanceledWorkItemsGroup();
 
-        /// <summary>
-        /// Waits for any of the work items in the specified array to complete, cancel, or timeout
-        /// </summary>
-        /// <param name="workItemResults">Array of work item result objects</param>
-        /// <param name="timeout">The number of milliseconds to wait, or a TimeSpan that represents -1 milliseconds to wait indefinitely. </param>
-        /// <param name="exitContext">
-        /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
-        /// </param>
-        /// <param name="cancelWaitHandle">A cancel wait handle to interrupt the wait if needed</param>
-        /// <returns>
-        /// The array index of the work item result that satisfied the wait, or WaitTimeout if no work item result satisfied the wait and a time interval equivalent to millisecondsTimeout has passed or the work item has been canceled.
-        /// </returns>
-        public static int WaitAny(
-            IWorkItemResult [] workItemResults,
-            TimeSpan timeout,
-            bool exitContext,
-            WaitHandle cancelWaitHandle)
-        {
-            return WaitAny(workItemResults, (int)timeout.TotalMilliseconds, exitContext, cancelWaitHandle);
+            ICollection workItemsGroups = _workItemsGroups.Values;
+            foreach (WorkItemsGroup workItemsGroup in workItemsGroups)
+            {
+                workItemsGroup.Cancel(abortExecution);
+            }
+
+            if (abortExecution)
+            {
+                foreach (ThreadEntry threadEntry in _workerThreads.Values)
+                {
+                    WorkItem workItem = threadEntry.CurrentWorkItem;
+                    if (null != workItem &&
+                        threadEntry.AssociatedSmartThreadPool == this &&
+                        !workItem.IsCanceled)
+                    {
+                        threadEntry.CurrentWorkItem.GetWorkItemResult().Cancel(true);
+                    }
+                }
+            }
         }
 
-        /// <summary>
-        /// Waits for any of the work items in the specified array to complete, cancel, or timeout
+            /// <summary>
+        /// Wait for the thread pool to be idle
         /// </summary>
-        /// <param name="workItemResults">Array of work item result objects</param>
-        /// <param name="millisecondsTimeout">The number of milliseconds to wait, or Timeout.Infinite (-1) to wait indefinitely.</param>
-        /// <param name="exitContext">
-        /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
-        /// </param>
-        /// <returns>
-        /// The array index of the work item result that satisfied the wait, or WaitTimeout if no work item result satisfied the wait and a time interval equivalent to millisecondsTimeout has passed or the work item has been canceled.
-        /// </returns>
-        public static int WaitAny(
-            IWorkItemResult [] workItemResults,  
-            int millisecondsTimeout,
-            bool exitContext)
+        public override bool WaitForIdle(int millisecondsTimeout)
         {
-            return WorkItem.WaitAny(workItemResults, millisecondsTimeout, exitContext, null);
+            ValidateWaitForIdle();
+            return STPEventWaitHandle.WaitOne(_isIdleWaitHandle, millisecondsTimeout, false);
         }
 
         /// <summary>
-        /// Waits for any of the work items in the specified array to complete, cancel, or timeout
+        /// This event is fired when all work items are completed.
+        /// (When IsIdle changes to true)
+        /// This event only work on WorkItemsGroup. On SmartThreadPool
+        /// it throws the NotImplementedException.
         /// </summary>
-        /// <param name="workItemResults">Array of work item result objects</param>
-        /// <param name="millisecondsTimeout">The number of milliseconds to wait, or Timeout.Infinite (-1) to wait indefinitely.</param>
-        /// <param name="exitContext">
-        /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
-        /// </param>
-        /// <param name="cancelWaitHandle">A cancel wait handle to interrupt the wait if needed</param>
-        /// <returns>
-        /// The array index of the work item result that satisfied the wait, or WaitTimeout if no work item result satisfied the wait and a time interval equivalent to millisecondsTimeout has passed or the work item has been canceled.
-        /// </returns>
-        public static int WaitAny(
-            IWorkItemResult [] workItemResults,  
-            int millisecondsTimeout,
-            bool exitContext,
-            WaitHandle cancelWaitHandle)
-        {
-            return WorkItem.WaitAny(workItemResults, millisecondsTimeout, exitContext, cancelWaitHandle);
-        }
-
-        public IWorkItemsGroup CreateWorkItemsGroup(int concurrency)
-        {
-            IWorkItemsGroup workItemsGroup = new WorkItemsGroup(this, concurrency, _stpStartInfo);
-            return workItemsGroup;
-        }
-
-        public IWorkItemsGroup CreateWorkItemsGroup(int concurrency, WIGStartInfo wigStartInfo)
-        {
-            IWorkItemsGroup workItemsGroup = new WorkItemsGroup(this, concurrency, wigStartInfo);
-            return workItemsGroup;
-        }
-
-        public event WorkItemsGroupIdleHandler OnIdle
+        public override event WorkItemsGroupIdleHandler OnIdle
         {
             add
             {
@@ -1280,166 +1618,115 @@ namespace Amib.Threading
             }
         }
 
-        public void Cancel()
-        {
-            ICollection workItemsGroups = _workItemsGroups.Values;
-            foreach(WorkItemsGroup workItemsGroup in workItemsGroups)
-            {
-                workItemsGroup.Cancel();
-            }
-        }
-
-        public void Start()
+            internal override void PreQueueWorkItem()
         {
-            lock (this)
-            {
-                if (!this._stpStartInfo.StartSuspended)
-                {
-                    return;
-                }
-                _stpStartInfo.StartSuspended = false;
-            }
-            
-            ICollection workItemsGroups = _workItemsGroups.Values;
-            foreach(WorkItemsGroup workItemsGroup in workItemsGroups)
-            {
-                workItemsGroup.OnSTPIsStarting();
-            }
-
-            StartOptimalNumberOfThreads();
+            ValidateNotDisposed();   
         }
 
         #endregion
 
-        #region Properties
-
-        /// <summary>
-        /// Get/Set the name of the SmartThreadPool instance
-        /// </summary>
-        public string Name 
-        { 
-            get
-            {
-                return _name;
-            }
-
-            set
-            {
-                _name = value;
-            }
-        }
+        #region Join, Choice, Pipe, etc.
 
         /// <summary>
-        /// Get the lower limit of threads in the pool.
+        /// Executes all actions in parallel.
+        /// Returns when they all finish.
         /// </summary>
-        public int MinThreads 
-        { 
-            get 
+        /// <param name="actions">Actions to execute</param>
+        public void Join(IEnumerable<Action> actions)
+        {
+            WIGStartInfo wigStartInfo = new WIGStartInfo { StartSuspended = true };
+            IWorkItemsGroup workItemsGroup = CreateWorkItemsGroup(int.MaxValue, wigStartInfo);
+            foreach (Action action in actions)
             {
-                ValidateNotDisposed();
-                return _stpStartInfo.MinWorkerThreads; 
+                workItemsGroup.QueueWorkItem(action);
             }
+            workItemsGroup.Start();
+            workItemsGroup.WaitForIdle();
         }
 
         /// <summary>
-        /// Get the upper limit of threads in the pool.
-        /// </summary>
-        public int MaxThreads 
-        { 
-            get 
-            {
-                ValidateNotDisposed();
-                return _stpStartInfo.MaxWorkerThreads; 
-            } 
-        }
-        /// <summary>
-        /// Get the number of threads in the thread pool.
-        /// Should be between the lower and the upper limits.
+        /// Executes all actions in parallel.
+        /// Returns when they all finish.
         /// </summary>
-        public int ActiveThreads 
-        { 
-            get 
-            {
-                ValidateNotDisposed();
-                return _workerThreads.Count; 
-            } 
+        /// <param name="actions">Actions to execute</param>
+        public void Join(params Action[] actions)
+        {
+            Join((IEnumerable<Action>)actions);
         }
 
-        /// <summary>
-        /// Get the number of busy (not idle) threads in the thread pool.
-        /// </summary>
-        public int InUseThreads 
-        { 
-            get 
-            { 
-                ValidateNotDisposed();
-                return _inUseWorkerThreads; 
-            } 
+        private class ChoiceIndex
+        {
+            public int _index = -1;
         }
 
         /// <summary>
-        /// Get the number of work items in the queue.
+        /// Executes all actions in parallel
+        /// Returns when the first one completes
         /// </summary>
-        public int WaitingCallbacks 
-        { 
-            get 
-            { 
-                ValidateNotDisposed();
-                return _workItemsQueue.Count;
-            } 
-        }
+        /// <param name="actions">Actions to execute</param>
+        public int Choice(IEnumerable<Action> actions)
+        {
+            WIGStartInfo wigStartInfo = new WIGStartInfo { StartSuspended = true };
+            IWorkItemsGroup workItemsGroup = CreateWorkItemsGroup(int.MaxValue, wigStartInfo);
 
+            ManualResetEvent anActionCompleted = new ManualResetEvent(false);
 
-        public event EventHandler Idle
-        {
-            add
+            ChoiceIndex choiceIndex = new ChoiceIndex();
+            
+            int i = 0;
+            foreach (Action action in actions)
             {
-                _stpIdle += value;
+                Action act = action;
+                int value = i;
+                workItemsGroup.QueueWorkItem(() => { act(); Interlocked.CompareExchange(ref choiceIndex._index, value, -1); anActionCompleted.Set(); });
+                ++i;
             }
+                workItemsGroup.Start();
+            anActionCompleted.WaitOne();
 
-            remove
-            {
-                _stpIdle -= value;
-            }
+            return choiceIndex._index;
         }
 
-        #endregion
-
-        #region IDisposable Members
-
-//        ~SmartThreadPool()
-//        {
-//            Dispose();
-//        }
+        /// <summary>
+        /// Executes all actions in parallel
+        /// Returns when the first one completes
+        /// </summary>
+        /// <param name="actions">Actions to execute</param>
+        public int Choice(params Action[] actions)
+            {
+            return Choice((IEnumerable<Action>)actions);
+        }
 
-        public void Dispose()
+        /// <summary>
+        /// Executes actions in sequence asynchronously.
+        /// Returns immediately.
+        /// </summary>
+        /// <param name="pipeState">A state context that passes </param>
+        /// <param name="actions">Actions to execute in the order they should run</param>
+        public void Pipe<T>(T pipeState, IEnumerable<Action<T>> actions)
         {
-            if (!_isDisposed)
+            WIGStartInfo wigStartInfo = new WIGStartInfo { StartSuspended = true };
+            IWorkItemsGroup workItemsGroup = CreateWorkItemsGroup(1, wigStartInfo);
+            foreach (Action<T> action in actions)
             {
-                if (!_shutdown)
-                {
-                    Shutdown();
-                }
-
-                if (null != _shuttingDownEvent)
-                {
-                    _shuttingDownEvent.Close();
-                    _shuttingDownEvent = null;
-                }
-                _workerThreads.Clear();
-                _isDisposed = true;
-                GC.SuppressFinalize(this);
+                Action<T> act = action;
+                workItemsGroup.QueueWorkItem(() => act(pipeState));
             }
+            workItemsGroup.Start();
+            workItemsGroup.WaitForIdle();
         }
 
-        private void ValidateNotDisposed()
+        /// <summary>
+        /// Executes actions in sequence asynchronously.
+        /// Returns immediately.
+        /// </summary>
+        /// <param name="pipeState"></param>
+        /// <param name="actions">Actions to execute in the order they should run</param>
+        public void Pipe<T>(T pipeState, params Action<T>[] actions)
         {
-            if(_isDisposed)
-            {
-                throw new ObjectDisposedException(GetType().ToString(), "The SmartThreadPool has been shutdown");
-            }
+            Pipe(pipeState, (IEnumerable<Action<T>>)actions);
         }
         #endregion
-    }
-    #endregion
+        }
+        #endregion
 }
diff --git a/ThirdParty/SmartThreadPool/SynchronizedDictionary.cs b/ThirdParty/SmartThreadPool/SynchronizedDictionary.cs
new file mode 100644
index 0000000..0cce19f
--- /dev/null
+++ b/ThirdParty/SmartThreadPool/SynchronizedDictionary.cs
@@ -0,0 +1,89 @@
+using System.Collections.Generic;
+
+namespace Amib.Threading.Internal
+{
+    internal class SynchronizedDictionary<TKey, TValue>
+    {
+        private readonly Dictionary<TKey, TValue> _dictionary;
+        private readonly object _lock;
+
+        public SynchronizedDictionary()
+        {
+            _lock = new object();
+            _dictionary = new Dictionary<TKey, TValue>();
+        }
+
+        public int Count
+        {
+            get { return _dictionary.Count; }
+        }
+
+        public bool Contains(TKey key)
+        {
+            lock (_lock)
+            {
+                return _dictionary.ContainsKey(key);
+            }
+        }
+
+        public void Remove(TKey key)
+        {
+            lock (_lock)
+            {
+                _dictionary.Remove(key);
+            }
+        }
+
+        public object SyncRoot
+        {
+            get { return _lock; }
+        }
+
+        public TValue this[TKey key]
+        {
+            get
+            {
+                lock (_lock)
+                {
+                    return _dictionary[key];
+                }
+            }
+            set
+            {
+                lock (_lock)
+                {
+                    _dictionary[key] = value;
+                }
+            }
+        }
+
+        public Dictionary<TKey, TValue>.KeyCollection Keys
+        {
+            get
+            {
+                lock (_lock)
+                {
+                    return _dictionary.Keys;
+                }
+            }
+        }
+
+        public Dictionary<TKey, TValue>.ValueCollection Values
+        {
+            get
+            {
+                lock (_lock)
+                {
+                    return _dictionary.Values;
+                }
+            }
+        }
+        public void Clear()
+        {
+            lock (_lock)
+            {
+                _dictionary.Clear();
+            }
+        }
+    }
+}
diff --git a/ThirdParty/SmartThreadPool/WIGStartInfo.cs b/ThirdParty/SmartThreadPool/WIGStartInfo.cs
index 150317f..8af195b 100644
--- a/ThirdParty/SmartThreadPool/WIGStartInfo.cs
+++ b/ThirdParty/SmartThreadPool/WIGStartInfo.cs
@@ -1,99 +1,171 @@
-// Ami Bar
-// amibar@gmail.com
+using System;
 
 namespace Amib.Threading
 {
-    /// <summary>
-    /// Summary description for WIGStartInfo.
-    /// </summary>
-    public class WIGStartInfo
-    {
-        /// <summary>
-        /// Use the caller's security context
-        /// </summary>
+        /// <summary>
+        /// Summary description for WIGStartInfo.
+        /// </summary>
+        public class WIGStartInfo
+        {
         private bool _useCallerCallContext;
-
-        /// <summary>
-        /// Use the caller's HTTP context
-        /// </summary>
         private bool _useCallerHttpContext;
-
-        /// <summary>
-        /// Dispose of the state object of a work item
-        /// </summary>
         private bool _disposeOfStateObjects;
-
-        /// <summary>
-        /// The option to run the post execute
-        /// </summary>
         private CallToPostExecute _callToPostExecute;
-
-        /// <summary>
-        /// A post execute callback to call when none is provided in 
-        /// the QueueWorkItem method.
-        /// </summary>
         private PostExecuteWorkItemCallback _postExecuteWorkItemCallback;
-
-        /// <summary>
-        /// Indicate the WorkItemsGroup to suspend the handling of the work items
-        /// until the Start() method is called.
-        /// </summary>
         private bool _startSuspended;
+        private WorkItemPriority _workItemPriority;
+        private bool _fillStateWithArgs;
 
-        public WIGStartInfo()
+        protected bool _readOnly;
+
+            public WIGStartInfo()
         {
-            _useCallerCallContext = SmartThreadPool.DefaultUseCallerCallContext;
-            _useCallerHttpContext = SmartThreadPool.DefaultUseCallerHttpContext;
-            _disposeOfStateObjects = SmartThreadPool.DefaultDisposeOfStateObjects;
-            _callToPostExecute = SmartThreadPool.DefaultCallToPostExecute;
-            _postExecuteWorkItemCallback = SmartThreadPool.DefaultPostExecuteWorkItemCallback;
+                _fillStateWithArgs = SmartThreadPool.DefaultFillStateWithArgs;
+                _workItemPriority = SmartThreadPool.DefaultWorkItemPriority;
             _startSuspended = SmartThreadPool.DefaultStartSuspended;
+            _postExecuteWorkItemCallback = SmartThreadPool.DefaultPostExecuteWorkItemCallback;
+            _callToPostExecute = SmartThreadPool.DefaultCallToPostExecute;
+            _disposeOfStateObjects = SmartThreadPool.DefaultDisposeOfStateObjects;
+            _useCallerHttpContext = SmartThreadPool.DefaultUseCallerHttpContext;
+            _useCallerCallContext = SmartThreadPool.DefaultUseCallerCallContext;
         }
 
-        public WIGStartInfo(WIGStartInfo wigStartInfo)
+            public WIGStartInfo(WIGStartInfo wigStartInfo)
         {
-            _useCallerCallContext = wigStartInfo._useCallerCallContext;
-            _useCallerHttpContext = wigStartInfo._useCallerHttpContext;
-            _disposeOfStateObjects = wigStartInfo._disposeOfStateObjects;
-            _callToPostExecute = wigStartInfo._callToPostExecute;
-            _postExecuteWorkItemCallback = wigStartInfo._postExecuteWorkItemCallback;
-            _startSuspended = wigStartInfo._startSuspended;
+            _useCallerCallContext = wigStartInfo.UseCallerCallContext;
+            _useCallerHttpContext = wigStartInfo.UseCallerHttpContext;
+            _disposeOfStateObjects = wigStartInfo.DisposeOfStateObjects;
+            _callToPostExecute = wigStartInfo.CallToPostExecute;
+            _postExecuteWorkItemCallback = wigStartInfo.PostExecuteWorkItemCallback;
+            _workItemPriority = wigStartInfo.WorkItemPriority;
+            _startSuspended = wigStartInfo.StartSuspended;
+            _fillStateWithArgs = wigStartInfo.FillStateWithArgs;
         }
 
-        public bool UseCallerCallContext
+        protected void ThrowIfReadOnly()
         {
-            get { return _useCallerCallContext; }
-            set { _useCallerCallContext = value; }
+            if (_readOnly)
+            {
+                throw new NotSupportedException("This is a readonly instance and set is not supported");
+            }
         }
 
-        public bool UseCallerHttpContext
-        {
-            get { return _useCallerHttpContext; }
-            set { _useCallerHttpContext = value; }
-        }
+            /// <summary>
+            /// Get/Set if to use the caller's security context
+            /// </summary>
+            public virtual bool UseCallerCallContext
+            {
+                get { return _useCallerCallContext; }
+            set 
+            { 
+                ThrowIfReadOnly();  
+                _useCallerCallContext = value; 
+            }
+            }
 
-        public bool DisposeOfStateObjects
-        {
-            get { return _disposeOfStateObjects; }
-            set { _disposeOfStateObjects = value; }
-        }
 
-        public CallToPostExecute CallToPostExecute
-        {
-            get { return _callToPostExecute; }
-            set { _callToPostExecute = value; }
-        }
+            /// <summary>
+            /// Get/Set if to use the caller's HTTP context
+            /// </summary>
+            public virtual bool UseCallerHttpContext
+            {
+                get { return _useCallerHttpContext; }
+            set 
+            { 
+                ThrowIfReadOnly();  
+                _useCallerHttpContext = value; 
+            }
+            }
 
-        public PostExecuteWorkItemCallback PostExecuteWorkItemCallback
-        {
-            get { return _postExecuteWorkItemCallback; }
-            set { _postExecuteWorkItemCallback = value; }
-        }
 
-        public bool StartSuspended
-        {
-            get { return _startSuspended; }
-            set { _startSuspended = value; }
-        }
+            /// <summary>
+            /// Get/Set if to dispose of the state object of a work item
+            /// </summary>
+            public virtual bool DisposeOfStateObjects
+            {
+                get { return _disposeOfStateObjects; }
+            set 
+            { 
+                ThrowIfReadOnly();  
+                _disposeOfStateObjects = value; 
+            }
+            }
+
+
+            /// <summary>
+            /// Get/Set the run the post execute options
+            /// </summary>
+            public virtual CallToPostExecute CallToPostExecute
+            {
+                get { return _callToPostExecute; }
+            set 
+            { 
+                ThrowIfReadOnly();  
+                _callToPostExecute = value; 
+            }
+            }
+
+
+            /// <summary>
+            /// Get/Set the default post execute callback
+            /// </summary>
+            public virtual PostExecuteWorkItemCallback PostExecuteWorkItemCallback
+            {
+                get { return _postExecuteWorkItemCallback; }
+            set 
+            { 
+                ThrowIfReadOnly();  
+                _postExecuteWorkItemCallback = value; 
+            }
+            }
+
+
+            /// <summary>
+            /// Get/Set if the work items execution should be suspended until the Start()
+            /// method is called.
+            /// </summary>
+            public virtual bool StartSuspended
+            {
+                get { return _startSuspended; }
+            set 
+            { 
+                ThrowIfReadOnly();  
+                _startSuspended = value; 
+            }
+            }
+
+
+            /// <summary>
+            /// Get/Set the default priority that a work item gets when it is enqueued
+            /// </summary>
+            public virtual WorkItemPriority WorkItemPriority
+            {
+                get { return _workItemPriority; }
+                set { _workItemPriority = value; }
+            }
+
+            /// <summary>
+        /// Get/Set the if QueueWorkItem of Action&lt;...&gt;/Func&lt;...&gt; fill the
+            /// arguments as an object array into the state of the work item.
+            /// The arguments can be access later by IWorkItemResult.State.
+            /// </summary>
+            public virtual bool FillStateWithArgs
+            {
+                get { return _fillStateWithArgs; }
+            set 
+            { 
+                ThrowIfReadOnly();  
+                _fillStateWithArgs = value; 
+            }
+            }
+
+            /// <summary>
+        /// Get a readonly version of this WIGStartInfo
+        /// </summary>
+        /// <returns>Returns a readonly reference to this WIGStartInfoRO</returns>
+        public WIGStartInfo AsReadOnly()
+            {
+            return new WIGStartInfo(this) { _readOnly = true };
+            }
     }
 }
diff --git a/ThirdParty/SmartThreadPool/WorkItem.WorkItemResult.cs b/ThirdParty/SmartThreadPool/WorkItem.WorkItemResult.cs
new file mode 100644
index 0000000..435a14b
--- /dev/null
+++ b/ThirdParty/SmartThreadPool/WorkItem.WorkItemResult.cs
@@ -0,0 +1,190 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading;
+
+namespace Amib.Threading.Internal
+{
+    public partial class WorkItem
+    {
+        #region WorkItemResult class
+
+        private class WorkItemResult : IWorkItemResult, IInternalWorkItemResult, IInternalWaitableResult
+        {
+            /// <summary>
+            /// A back reference to the work item
+            /// </summary>
+            private readonly WorkItem _workItem;
+
+            public WorkItemResult(WorkItem workItem)
+            {
+                _workItem = workItem;
+            }
+
+            internal WorkItem GetWorkItem()
+            {
+                return _workItem;
+            }
+
+            #region IWorkItemResult Members
+
+            public bool IsCompleted
+            {
+                get
+                {
+                    return _workItem.IsCompleted;
+                }
+            }
+
+            public bool IsCanceled
+            {
+                get
+                {
+                    return _workItem.IsCanceled;
+                }
+            }
+
+            public object GetResult()
+            {
+                return _workItem.GetResult(Timeout.Infinite, true, null);
+            }
+
+            public object GetResult(int millisecondsTimeout, bool exitContext)
+            {
+                return _workItem.GetResult(millisecondsTimeout, exitContext, null);
+            }
+
+            public object GetResult(TimeSpan timeout, bool exitContext)
+            {
+                return _workItem.GetResult((int)timeout.TotalMilliseconds, exitContext, null);
+            }
+
+            public object GetResult(int millisecondsTimeout, bool exitContext, WaitHandle cancelWaitHandle)
+            {
+                return _workItem.GetResult(millisecondsTimeout, exitContext, cancelWaitHandle);
+            }
+
+            public object GetResult(TimeSpan timeout, bool exitContext, WaitHandle cancelWaitHandle)
+            {
+                return _workItem.GetResult((int)timeout.TotalMilliseconds, exitContext, cancelWaitHandle);
+            }
+
+            public object GetResult(out Exception e)
+            {
+                return _workItem.GetResult(Timeout.Infinite, true, null, out e);
+            }
+
+            public object GetResult(int millisecondsTimeout, bool exitContext, out Exception e)
+            {
+                return _workItem.GetResult(millisecondsTimeout, exitContext, null, out e);
+            }
+
+            public object GetResult(TimeSpan timeout, bool exitContext, out Exception e)
+            {
+                return _workItem.GetResult((int)timeout.TotalMilliseconds, exitContext, null, out e);
+            }
+
+            public object GetResult(int millisecondsTimeout, bool exitContext, WaitHandle cancelWaitHandle, out Exception e)
+            {
+                return _workItem.GetResult(millisecondsTimeout, exitContext, cancelWaitHandle, out e);
+            }
+
+            public object GetResult(TimeSpan timeout, bool exitContext, WaitHandle cancelWaitHandle, out Exception e)
+            {
+                return _workItem.GetResult((int)timeout.TotalMilliseconds, exitContext, cancelWaitHandle, out e);
+            }
+
+            public bool Cancel()
+            {
+                return Cancel(false);
+            }
+
+            public bool Cancel(bool abortExecution)
+            {
+                return _workItem.Cancel(abortExecution);
+            }
+
+            public object State
+            {
+                get
+                {
+                    return _workItem._state;
+                }
+            }
+
+            public WorkItemPriority WorkItemPriority
+            {
+                get
+                {
+                    return _workItem._workItemInfo.WorkItemPriority;
+                }
+            }
+
+            /// <summary>
+            /// Return the result, same as GetResult()
+            /// </summary>
+            public object Result
+            {
+                get { return GetResult(); }
+            }
+
+            /// <summary>
+            /// Returns the exception if occured otherwise returns null.
+            /// This value is valid only after the work item completed,
+            /// before that it is always null.
+            /// </summary>
+            public object Exception
+            {
+                get { return _workItem._exception; }
+            }
+
+            #endregion
+
+            #region IInternalWorkItemResult Members
+
+            public event WorkItemStateCallback OnWorkItemStarted
+            {
+                add
+                {
+                    _workItem.OnWorkItemStarted += value;
+                }
+                remove
+                {
+                    _workItem.OnWorkItemStarted -= value;
+                }
+            }
+
+
+            public event WorkItemStateCallback OnWorkItemCompleted
+            {
+                add
+                {
+                    _workItem.OnWorkItemCompleted += value;
+                }
+                remove
+                {
+                    _workItem.OnWorkItemCompleted -= value;
+                }
+            }
+
+            #endregion
+
+            #region IInternalWorkItemResult Members
+
+            public IWorkItemResult GetWorkItemResult()
+            {
+                return this;
+            }
+
+            public IWorkItemResult<TResult> GetWorkItemResultT<TResult>()
+            {
+                return new WorkItemResultTWrapper<TResult>(this);
+            }
+
+            #endregion
+        }
+
+        #endregion
+
+    }
+}
diff --git a/ThirdParty/SmartThreadPool/WorkItem.cs b/ThirdParty/SmartThreadPool/WorkItem.cs
index d0c0524..185f10c 100644
--- a/ThirdParty/SmartThreadPool/WorkItem.cs
+++ b/ThirdParty/SmartThreadPool/WorkItem.cs
@@ -1,58 +1,13 @@
-// Ami Bar
-// amibar@gmail.com
-
 using System;
 using System.Threading;
 using System.Diagnostics;
 
 namespace Amib.Threading.Internal
 {
-    #region WorkItem Delegate
-
-    /// <summary>
-    /// An internal delegate to call when the WorkItem starts or completes
-    /// </summary>
-    internal delegate void WorkItemStateCallback(WorkItem workItem);
-
-    #endregion
-
-    #region IInternalWorkItemResult interface 
-
-    public class CanceledWorkItemsGroup
-    {
-        public readonly static CanceledWorkItemsGroup NotCanceledWorkItemsGroup = new CanceledWorkItemsGroup();
-
-        private bool _isCanceled = false;
-        public bool IsCanceled 
-        { 
-            get { return _isCanceled; }
-            set { _isCanceled = value; }
-        }
-    }
-
-    internal interface IInternalWorkItemResult
-    {
-        event WorkItemStateCallback OnWorkItemStarted;
-        event WorkItemStateCallback OnWorkItemCompleted;
-    }
-
-    #endregion
-
-    #region IWorkItem interface
-
-    public interface IWorkItem
-    {
-
-    }
-
-    #endregion
-
-    #region WorkItem class
-
     /// <summary>
     /// Holds a callback delegate and the state for that delegate.
     /// </summary>
-    public class WorkItem : IHasWorkItemPriority, IWorkItem
+    public partial class WorkItem : IHasWorkItemPriority
     {
         #region WorkItemState enum
 
@@ -61,33 +16,57 @@ namespace Amib.Threading.Internal
         /// </summary>
         private enum WorkItemState
         {
-            InQueue,
-            InProgress,
-            Completed,
-            Canceled,
+            InQueue = 0,    // Nexts: InProgress, Canceled
+            InProgress = 1,    // Nexts: Completed, Canceled
+            Completed = 2,    // Stays Completed
+            Canceled = 3,    // Stays Canceled
         }
 
-        #endregion
+        private static bool IsValidStatesTransition(WorkItemState currentState, WorkItemState nextState)
+        {
+            bool valid = false;
+
+            switch (currentState)
+            {
+                case WorkItemState.InQueue:
+                    valid = (WorkItemState.InProgress == nextState) || (WorkItemState.Canceled == nextState);
+                    break;
+                case WorkItemState.InProgress:
+                    valid = (WorkItemState.Completed == nextState) || (WorkItemState.Canceled == nextState);
+                    break;
+                case WorkItemState.Completed:
+                case WorkItemState.Canceled:
+                    // Cannot be changed
+                    break;
+                default:
+                    // Unknown state
+                    Debug.Assert(false);
+                    break;
+            }
 
-        #region Member Variables
+            return valid;
+        }
 
-        public Thread currentThread;
+        #endregion
+
+        #region Fields
 
         /// <summary>
         /// Callback delegate for the callback.
         /// </summary>
-        private WorkItemCallback _callback;
+        private readonly WorkItemCallback _callback;
 
         /// <summary>
         /// State with which to call the callback delegate.
         /// </summary>
         private object _state;
 
+#if !(_WINDOWS_CE) && !(_SILVERLIGHT) && !(WINDOWS_PHONE)
         /// <summary>
         /// Stores the caller's context
         /// </summary>
-        private CallerThreadContext _callerContext;
-
+        private readonly CallerThreadContext _callerContext;
+#endif
         /// <summary>
         /// Holds the result of the mehtod
         /// </summary>
@@ -117,12 +96,12 @@ namespace Amib.Threading.Internal
         /// <summary>
         /// Represents the result state of the work item
         /// </summary>
-        private WorkItemResult _workItemResult;
+        private readonly WorkItemResult _workItemResult;
 
         /// <summary>
         /// Work item info
         /// </summary>
-        private WorkItemInfo _workItemInfo;
+        private readonly WorkItemInfo _workItemInfo;
 
         /// <summary>
         /// Called when the WorkItem starts
@@ -141,30 +120,41 @@ namespace Amib.Threading.Internal
         private CanceledWorkItemsGroup _canceledWorkItemsGroup = CanceledWorkItemsGroup.NotCanceledWorkItemsGroup;
 
         /// <summary>
+        /// A reference to an object that indicates whatever the 
+        /// SmartThreadPool has been canceled
+        /// </summary>
+        private CanceledWorkItemsGroup _canceledSmartThreadPool = CanceledWorkItemsGroup.NotCanceledWorkItemsGroup;
+
+        /// <summary>
         /// The work item group this work item belong to.
-        /// 
         /// </summary>
-        private IWorkItemsGroup _workItemsGroup;
+        private readonly IWorkItemsGroup _workItemsGroup;
 
-        #region Performance Counter fields
+        /// <summary>
+        /// The thread that executes this workitem.
+        /// This field is available for the period when the work item is executed, before and after it is null.
+        /// </summary>
+        private Thread _executingThread;
 
         /// <summary>
-        /// The time when the work items is queued.
-        /// Used with the performance counter.
+        /// The absulote time when the work item will be timeout
         /// </summary>
-        private DateTime _queuedTime;
+        private long _expirationTime;
+
+        #region Performance Counter fields
+
+
+
 
         /// <summary>
-        /// The time when the work items starts its execution.
-        /// Used with the performance counter.
+        /// Stores how long the work item waited on the stp queue
         /// </summary>
-        private DateTime _beginProcessTime;
+        private Stopwatch _waitingOnQueueStopwatch;
 
         /// <summary>
-        /// The time when the work items ends its execution.
-        /// Used with the performance counter.
+        /// Stores how much time it took the work item to execute after it went out of the queue
         /// </summary>
-        private DateTime _endProcessTime;
+        private Stopwatch _processingStopwatch;
 
         #endregion
 
@@ -174,17 +164,25 @@ namespace Amib.Threading.Internal
 
         public TimeSpan WaitingTime
         {
-            get 
+            get
             {
-                return (_beginProcessTime - _queuedTime);
+                return _waitingOnQueueStopwatch.Elapsed;
             }
         }
 
         public TimeSpan ProcessTime
         {
-            get 
+            get
+            {
+                return _processingStopwatch.Elapsed;
+            }
+        }
+
+        internal WorkItemInfo WorkItemInfo
+        {
+            get
             {
-                return (_endProcessTime - _beginProcessTime);
+                return _workItemInfo;
             }
         }
 
@@ -195,6 +193,8 @@ namespace Amib.Threading.Internal
         /// <summary>
         /// Initialize the callback holding object.
         /// </summary>
+        /// <param name="workItemsGroup">The workItemGroup of the workitem</param>
+        /// <param name="workItemInfo">The WorkItemInfo of te workitem</param>
         /// <param name="callback">Callback delegate for the callback.</param>
         /// <param name="state">State with which to call the callback delegate.</param>
         /// 
@@ -203,16 +203,18 @@ namespace Amib.Threading.Internal
         public WorkItem(
             IWorkItemsGroup workItemsGroup,
             WorkItemInfo workItemInfo,
-            WorkItemCallback callback, 
+            WorkItemCallback callback,
             object state)
         {
             _workItemsGroup = workItemsGroup;
             _workItemInfo = workItemInfo;
 
+#if !(_WINDOWS_CE) && !(_SILVERLIGHT) && !(WINDOWS_PHONE)
             if (_workItemInfo.UseCallerCallContext || _workItemInfo.UseCallerHttpContext)
             {
                 _callerContext = CallerThreadContext.Capture(_workItemInfo.UseCallerCallContext, _workItemInfo.UseCallerHttpContext);
             }
+#endif
 
             _callback = callback;
             _state = state;
@@ -222,9 +224,18 @@ namespace Amib.Threading.Internal
 
         internal void Initialize()
         {
+            // The _workItemState is changed directly instead of using the SetWorkItemState
+            // method since we don't want to go throught IsValidStateTransition.
             _workItemState = WorkItemState.InQueue;
+
             _workItemCompleted = null;
             _workItemCompletedRefCount = 0;
+            _waitingOnQueueStopwatch = new Stopwatch();
+            _processingStopwatch = new Stopwatch();
+            _expirationTime =
+                _workItemInfo.Timeout > 0 ?
+                DateTime.UtcNow.Ticks + _workItemInfo.Timeout * TimeSpan.TicksPerMillisecond :
+                long.MaxValue;
         }
 
         internal bool WasQueuedBy(IWorkItemsGroup workItemsGroup)
@@ -237,17 +248,16 @@ namespace Amib.Threading.Internal
 
         #region Methods
 
-        public CanceledWorkItemsGroup CanceledWorkItemsGroup
+        internal CanceledWorkItemsGroup CanceledWorkItemsGroup
         {
-            get
-            {
-                return _canceledWorkItemsGroup;
-            }
+            get { return _canceledWorkItemsGroup; }
+            set { _canceledWorkItemsGroup = value; }
+        }
 
-            set
-            {
-                _canceledWorkItemsGroup = value;
-            }
+        internal CanceledWorkItemsGroup CanceledSmartThreadPool
+        {
+            get { return _canceledSmartThreadPool; }
+            set { _canceledSmartThreadPool = value; }
         }
 
         /// <summary>
@@ -259,9 +269,10 @@ namespace Amib.Threading.Internal
         /// </returns>
         public bool StartingWorkItem()
         {
-            _beginProcessTime = DateTime.Now;
+            _waitingOnQueueStopwatch.Stop();
+            _processingStopwatch.Start();
 
-            lock(this)
+            lock (this)
             {
                 if (IsCanceled)
                 {
@@ -277,6 +288,9 @@ namespace Amib.Threading.Internal
 
                 Debug.Assert(WorkItemState.InQueue == GetWorkItemState());
 
+                // No need for a lock yet, only after the state has changed to InProgress
+                _executingThread = Thread.CurrentThread;
+
                 SetWorkItemState(WorkItemState.InProgress);
             }
 
@@ -291,7 +305,7 @@ namespace Amib.Threading.Internal
             CallToPostExecute currentCallToPostExecute = 0;
 
             // Execute the work item if we are in the correct state
-            switch(GetWorkItemState())
+            switch (GetWorkItemState())
             {
                 case WorkItemState.InProgress:
                     currentCallToPostExecute |= CallToPostExecute.WhenWorkItemNotCanceled;
@@ -311,7 +325,7 @@ namespace Amib.Threading.Internal
                 PostExecute();
             }
 
-            _endProcessTime = DateTime.Now;
+            _processingStopwatch.Stop();
         }
 
         internal void FireWorkItemCompleted()
@@ -323,8 +337,21 @@ namespace Amib.Threading.Internal
                     _workItemCompletedEvent(this);
                 }
             }
-            catch // Ignore exceptions
-            {}
+            catch // Suppress exceptions
+            { }
+        }
+
+        internal void FireWorkItemStarted()
+        {
+            try
+            {
+                if (null != _workItemStartedEvent)
+                {
+                    _workItemStartedEvent(this);
+                }
+            }
+            catch // Suppress exceptions
+            { }
         }
 
         /// <summary>
@@ -332,32 +359,70 @@ namespace Amib.Threading.Internal
         /// </summary>
         private void ExecuteWorkItem()
         {
+
+#if !(_WINDOWS_CE) && !(_SILVERLIGHT) && !(WINDOWS_PHONE)
             CallerThreadContext ctc = null;
             if (null != _callerContext)
             {
                 ctc = CallerThreadContext.Capture(_callerContext.CapturedCallContext, _callerContext.CapturedHttpContext);
                 CallerThreadContext.Apply(_callerContext);
             }
+#endif
 
             Exception exception = null;
             object result = null;
 
             try
             {
-                result = _callback(_state);
+                try
+                {
+                    result = _callback(_state);
+                }
+                catch (Exception e)
+                {
+                    // Save the exception so we can rethrow it later
+                    exception = e;
+                }
+
+                // Remove the value of the execution thread, so it will be impossible to cancel the work item,
+                // since it is already completed.
+                // Cancelling a work item that already completed may cause the abortion of the next work item!!!
+                Thread executionThread = Interlocked.CompareExchange(ref _executingThread, null, _executingThread);
+
+                if (null == executionThread)
+                {
+                    // Oops! we are going to be aborted..., Wait here so we can catch the ThreadAbortException
+                    Thread.Sleep(60 * 1000);
+
+                    // If after 1 minute this thread was not aborted then let it continue working.
+                }
             }
-            catch (Exception e) 
+            // We must treat the ThreadAbortException or else it will be stored in the exception variable
+            catch (ThreadAbortException tae)
             {
-                // Save the exception so we can rethrow it later
-                exception = e;
+                tae.GetHashCode();
+                // Check if the work item was cancelled
+                // If we got a ThreadAbortException and the STP is not shutting down, it means the 
+                // work items was cancelled.
+                if (!SmartThreadPool.CurrentThreadEntry.AssociatedSmartThreadPool.IsShuttingdown)
+                {
+#if !(_WINDOWS_CE) && !(_SILVERLIGHT) && !(WINDOWS_PHONE)
+                    Thread.ResetAbort();
+#endif
+                }
             }
-        
+
+#if !(_WINDOWS_CE) && !(_SILVERLIGHT) && !(WINDOWS_PHONE)
             if (null != _callerContext)
             {
                 CallerThreadContext.Apply(ctc);
             }
+#endif
 
-            SetResult(result, exception);
+            if (!SmartThreadPool.IsWorkItemCanceled)
+            {
+                SetResult(result, exception);
+            }
         }
 
         /// <summary>
@@ -369,9 +434,9 @@ namespace Amib.Threading.Internal
             {
                 try
                 {
-                    _workItemInfo.PostExecuteWorkItemCallback(this._workItemResult);
+                    _workItemInfo.PostExecuteWorkItemCallback(_workItemResult);
                 }
-                catch (Exception e) 
+                catch (Exception e)
                 {
                     Debug.Assert(null != e);
                 }
@@ -382,6 +447,8 @@ namespace Amib.Threading.Internal
         /// Set the result of the work item to return
         /// </summary>
         /// <param name="result">The result of the work item</param>
+        /// <param name="exception">The exception that was throw while the workitem executed, null
+        /// if there was no exception.</param>
         internal void SetResult(object result, Exception exception)
         {
             _result = result;
@@ -401,48 +468,48 @@ namespace Amib.Threading.Internal
         /// <summary>
         /// Wait for all work items to complete
         /// </summary>
-        /// <param name="workItemResults">Array of work item result objects</param>
+        /// <param name="waitableResults">Array of work item result objects</param>
         /// <param name="millisecondsTimeout">The number of milliseconds to wait, or Timeout.Infinite (-1) to wait indefinitely.</param>
         /// <param name="exitContext">
         /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
         /// </param>
         /// <param name="cancelWaitHandle">A cancel wait handle to interrupt the wait if needed</param>
         /// <returns>
-        /// true when every work item in workItemResults has completed; otherwise false.
+        /// true when every work item in waitableResults has completed; otherwise false.
         /// </returns>
         internal static bool WaitAll(
-            IWorkItemResult [] workItemResults,
+            IWaitableResult[] waitableResults,
             int millisecondsTimeout,
             bool exitContext,
             WaitHandle cancelWaitHandle)
         {
-            if (0 == workItemResults.Length)
+            if (0 == waitableResults.Length)
             {
                 return true;
             }
 
             bool success;
-            WaitHandle [] waitHandles = new WaitHandle[workItemResults.Length];;
-            GetWaitHandles(workItemResults, waitHandles);
+            WaitHandle[] waitHandles = new WaitHandle[waitableResults.Length];
+            GetWaitHandles(waitableResults, waitHandles);
 
             if ((null == cancelWaitHandle) && (waitHandles.Length <= 64))
             {
-                success = WaitHandle.WaitAll(waitHandles, millisecondsTimeout, exitContext);
+                success = STPEventWaitHandle.WaitAll(waitHandles, millisecondsTimeout, exitContext);
             }
             else
             {
                 success = true;
                 int millisecondsLeft = millisecondsTimeout;
-                DateTime start = DateTime.Now;
+                Stopwatch stopwatch = Stopwatch.StartNew();
 
-                WaitHandle [] whs;
+                WaitHandle[] whs;
                 if (null != cancelWaitHandle)
                 {
-                    whs = new WaitHandle [] { null, cancelWaitHandle };
+                    whs = new WaitHandle[] { null, cancelWaitHandle };
                 }
                 else
                 {
-                    whs = new WaitHandle [] { null };
+                    whs = new WaitHandle[] { null };
                 }
 
                 bool waitInfinitely = (Timeout.Infinite == millisecondsTimeout);
@@ -450,7 +517,7 @@ namespace Amib.Threading.Internal
                 // We cannot use WaitHandle.WaitAll directly, because the cancelWaitHandle
                 // won't affect it.
                 // Each iteration we update the time left for the timeout.
-                for(int i = 0; i < workItemResults.Length; ++i)
+                for (int i = 0; i < waitableResults.Length; ++i)
                 {
                     // WaitAny don't work with negative numbers
                     if (!waitInfinitely && (millisecondsLeft < 0))
@@ -460,23 +527,22 @@ namespace Amib.Threading.Internal
                     }
 
                     whs[0] = waitHandles[i];
-                    int result = WaitHandle.WaitAny(whs, millisecondsLeft, exitContext);
-                    if((result > 0) || (WaitHandle.WaitTimeout == result))
+                    int result = STPEventWaitHandle.WaitAny(whs, millisecondsLeft, exitContext);
+                    if ((result > 0) || (STPEventWaitHandle.WaitTimeout == result))
                     {
                         success = false;
                         break;
                     }
 
-                    if(!waitInfinitely)
+                    if (!waitInfinitely)
                     {
                         // Update the time left to wait
-                        TimeSpan ts = DateTime.Now - start;
-                        millisecondsLeft = millisecondsTimeout - (int)ts.TotalMilliseconds;
+                        millisecondsLeft = millisecondsTimeout - (int)stopwatch.ElapsedMilliseconds;
                     }
                 }
             }
             // Release the wait handles
-            ReleaseWaitHandles(workItemResults);
+            ReleaseWaitHandles(waitableResults);
 
             return success;
         }
@@ -484,7 +550,7 @@ namespace Amib.Threading.Internal
         /// <summary>
         /// Waits for any of the work items in the specified array to complete, cancel, or timeout
         /// </summary>
-        /// <param name="workItemResults">Array of work item result objects</param>
+        /// <param name="waitableResults">Array of work item result objects</param>
         /// <param name="millisecondsTimeout">The number of milliseconds to wait, or Timeout.Infinite (-1) to wait indefinitely.</param>
         /// <param name="exitContext">
         /// true to exit the synchronization domain for the context before the wait (if in a synchronized context), and reacquire it; otherwise, false. 
@@ -493,38 +559,38 @@ namespace Amib.Threading.Internal
         /// <returns>
         /// The array index of the work item result that satisfied the wait, or WaitTimeout if no work item result satisfied the wait and a time interval equivalent to millisecondsTimeout has passed or the work item has been canceled.
         /// </returns>
-        internal static int WaitAny(            
-            IWorkItemResult [] workItemResults,
+        internal static int WaitAny(
+            IWaitableResult[] waitableResults,
             int millisecondsTimeout,
             bool exitContext,
             WaitHandle cancelWaitHandle)
         {
-            WaitHandle [] waitHandles = null;
+            WaitHandle[] waitHandles;
 
             if (null != cancelWaitHandle)
             {
-                waitHandles = new WaitHandle[workItemResults.Length+1];
-                GetWaitHandles(workItemResults, waitHandles);
-                waitHandles[workItemResults.Length] = cancelWaitHandle;
+                waitHandles = new WaitHandle[waitableResults.Length + 1];
+                GetWaitHandles(waitableResults, waitHandles);
+                waitHandles[waitableResults.Length] = cancelWaitHandle;
             }
             else
             {
-                waitHandles = new WaitHandle[workItemResults.Length];
-                GetWaitHandles(workItemResults, waitHandles);
+                waitHandles = new WaitHandle[waitableResults.Length];
+                GetWaitHandles(waitableResults, waitHandles);
             }
 
-            int result = WaitHandle.WaitAny(waitHandles, millisecondsTimeout, exitContext);
+            int result = STPEventWaitHandle.WaitAny(waitHandles, millisecondsTimeout, exitContext);
 
             // Treat cancel as timeout
             if (null != cancelWaitHandle)
             {
-                if (result == workItemResults.Length)
+                if (result == waitableResults.Length)
                 {
-                    result = WaitHandle.WaitTimeout;
+                    result = STPEventWaitHandle.WaitTimeout;
                 }
             }
 
-            ReleaseWaitHandles(workItemResults);
+            ReleaseWaitHandles(waitableResults);
 
             return result;
         }
@@ -532,16 +598,16 @@ namespace Amib.Threading.Internal
         /// <summary>
         /// Fill an array of wait handles with the work items wait handles.
         /// </summary>
-        /// <param name="workItemResults">An array of work item results</param>
+        /// <param name="waitableResults">An array of work item results</param>
         /// <param name="waitHandles">An array of wait handles to fill</param>
         private static void GetWaitHandles(
-            IWorkItemResult [] workItemResults,
-            WaitHandle [] waitHandles)
+            IWaitableResult[] waitableResults,
+            WaitHandle[] waitHandles)
         {
-            for(int i = 0; i < workItemResults.Length; ++i)
+            for (int i = 0; i < waitableResults.Length; ++i)
             {
-                WorkItemResult wir = workItemResults[i] as WorkItemResult;
-                Debug.Assert(null != wir, "All workItemResults must be WorkItemResult objects");
+                WorkItemResult wir = waitableResults[i].GetWorkItemResult() as WorkItemResult;
+                Debug.Assert(null != wir, "All waitableResults must be WorkItemResult objects");
 
                 waitHandles[i] = wir.GetWorkItem().GetWaitHandle();
             }
@@ -550,40 +616,64 @@ namespace Amib.Threading.Internal
         /// <summary>
         /// Release the work items' wait handles
         /// </summary>
-        /// <param name="workItemResults">An array of work item results</param>
-        private static void ReleaseWaitHandles(IWorkItemResult [] workItemResults)
+        /// <param name="waitableResults">An array of work item results</param>
+        private static void ReleaseWaitHandles(IWaitableResult[] waitableResults)
         {
-            for(int i = 0; i < workItemResults.Length; ++i)
+            for (int i = 0; i < waitableResults.Length; ++i)
             {
-                WorkItemResult wir = workItemResults[i] as WorkItemResult;
+                WorkItemResult wir = (WorkItemResult)waitableResults[i].GetWorkItemResult();
 
                 wir.GetWorkItem().ReleaseWaitHandle();
             }
         }
 
-
         #endregion
-        
+
         #region Private Members
 
         private WorkItemState GetWorkItemState()
         {
-            if (_canceledWorkItemsGroup.IsCanceled)
+            lock (this)
             {
-                return WorkItemState.Canceled;
-            }
-            return _workItemState;
+                if (WorkItemState.Completed == _workItemState)
+                {
+                    return _workItemState;
+                }
+
+                long nowTicks = DateTime.UtcNow.Ticks;
 
+                if (WorkItemState.Canceled != _workItemState && nowTicks > _expirationTime)
+                {
+                    _workItemState = WorkItemState.Canceled;
+                }
+
+                if (WorkItemState.InProgress == _workItemState)
+                {
+                    return _workItemState;
+                }
+
+                if (CanceledSmartThreadPool.IsCanceled || CanceledWorkItemsGroup.IsCanceled)
+                {
+                    return WorkItemState.Canceled;
+                }
+
+                return _workItemState;
+            }
         }
+
+
         /// <summary>
         /// Sets the work item's state
         /// </summary>
         /// <param name="workItemState">The state to set the work item to</param>
         private void SetWorkItemState(WorkItemState workItemState)
         {
-            lock(this)
+            lock (this)
             {
-                _workItemState = workItemState;
+                if (IsValidStatesTransition(_workItemState, workItemState))
+                {
+                    _workItemState = workItemState;
+                }
             }
         }
 
@@ -594,7 +684,7 @@ namespace Amib.Threading.Internal
         private void SignalComplete(bool canceled)
         {
             SetWorkItemState(canceled ? WorkItemState.Canceled : WorkItemState.Completed);
-            lock(this)
+            lock (this)
             {
                 // If someone is waiting then signal.
                 if (null != _workItemCompleted)
@@ -606,40 +696,93 @@ namespace Amib.Threading.Internal
 
         internal void WorkItemIsQueued()
         {
-            _queuedTime = DateTime.Now;
+            _waitingOnQueueStopwatch.Start();
         }
 
         #endregion
-        
+
         #region Members exposed by WorkItemResult
 
         /// <summary>
         /// Cancel the work item if it didn't start running yet.
         /// </summary>
         /// <returns>Returns true on success or false if the work item is in progress or already completed</returns>
-        private bool Cancel()
+        private bool Cancel(bool abortExecution)
         {
-            lock(this)
+#if (_WINDOWS_CE)
+            if(abortExecution)
+            {
+                throw new ArgumentOutOfRangeException("abortExecution", "WindowsCE doesn't support this feature");
+            }
+#endif
+            bool success = false;
+            bool signalComplete = false;
+
+            lock (this)
             {
-                switch(GetWorkItemState())
+                switch (GetWorkItemState())
                 {
                     case WorkItemState.Canceled:
                         //Debug.WriteLine("Work item already canceled");
-                        return true;
+                        if (abortExecution)
+                        {
+                            Thread executionThread = Interlocked.CompareExchange(ref _executingThread, null, _executingThread);
+                            if (null != executionThread)
+                            {
+                                executionThread.Abort(); // "Cancel"
+                                // No need to signalComplete, because we already cancelled this work item
+                                // so it already signaled its completion.
+                                //signalComplete = true;
+                            }
+                        } 
+                        success = true;
+                        break;
                     case WorkItemState.Completed:
-                    case WorkItemState.InProgress:
                         //Debug.WriteLine("Work item cannot be canceled");
-                        return false;
+                        break;
+                    case WorkItemState.InProgress:
+                        if (abortExecution)
+                        {
+                            Thread executionThread = Interlocked.CompareExchange(ref _executingThread, null, _executingThread);
+                            if (null != executionThread)
+                            {
+                                executionThread.Abort(); // "Cancel"
+                                success = true;
+                                signalComplete = true;
+                            }
+                        }
+                        else
+                        {
+                            // **************************
+                            // Stock SmartThreadPool 2.2.3 sets these to true and relies on the thread to check the
+                            // WorkItem cancellation status.  However, OpenSimulator uses a different mechanism to notify
+                            // scripts of co-operative termination and the abort code also relies on this method
+                            // returning false in order to implement a small wait.
+                            //
+                            // Therefore, as was the case previously with STP, we will not signal successful cancellation
+                            // here.  It's possible that OpenSimulator code could be changed in the future to remove
+                            // the need for this change.
+                            // **************************
+                            success = false;
+                            signalComplete = false;
+                        }
+                        break;
                     case WorkItemState.InQueue:
                         // Signal to the wait for completion that the work
                         // item has been completed (canceled). There is no
                         // reason to wait for it to get out of the queue
-                        SignalComplete(true);
+                        signalComplete = true;
                         //Debug.WriteLine("Work item canceled");
-                        return true;
+                        success = true;
+                        break;
+                }
+
+                if (signalComplete)
+                {
+                    SignalComplete(true);
                 }
             }
-            return false;
+            return success;
         }
 
         /// <summary>
@@ -653,7 +796,7 @@ namespace Amib.Threading.Internal
             bool exitContext,
             WaitHandle cancelWaitHandle)
         {
-            Exception e = null;
+            Exception e;
             object result = GetResult(millisecondsTimeout, exitContext, cancelWaitHandle, out e);
             if (null != e)
             {
@@ -694,7 +837,7 @@ namespace Amib.Threading.Internal
             {
                 WaitHandle wh = GetWaitHandle();
 
-                bool timeout = !wh.WaitOne(millisecondsTimeout, exitContext);
+                bool timeout = !STPEventWaitHandle.WaitOne(wh, millisecondsTimeout, exitContext);
 
                 ReleaseWaitHandle();
 
@@ -706,10 +849,10 @@ namespace Amib.Threading.Internal
             else
             {
                 WaitHandle wh = GetWaitHandle();
-                int result = WaitHandle.WaitAny(new WaitHandle[] { wh, cancelWaitHandle });
+                int result = STPEventWaitHandle.WaitAny(new WaitHandle[] { wh, cancelWaitHandle });
                 ReleaseWaitHandle();
 
-                switch(result)
+                switch (result)
                 {
                     case 0:
                         // The work item signaled
@@ -717,7 +860,7 @@ namespace Amib.Threading.Internal
                         // work item (not the get result)
                         break;
                     case 1:
-                    case WaitHandle.WaitTimeout:
+                    case STPEventWaitHandle.WaitTimeout:
                         throw new WorkItemTimeoutException("Work item timeout");
                     default:
                         Debug.Assert(false);
@@ -745,11 +888,11 @@ namespace Amib.Threading.Internal
         /// </summary>
         private WaitHandle GetWaitHandle()
         {
-            lock(this)
+            lock (this)
             {
                 if (null == _workItemCompleted)
                 {
-                    _workItemCompleted = new ManualResetEvent(IsCompleted);
+                    _workItemCompleted = EventWaitHandleFactory.CreateManualResetEvent(IsCompleted);
                 }
                 ++_workItemCompletedRefCount;
             }
@@ -758,7 +901,7 @@ namespace Amib.Threading.Internal
 
         private void ReleaseWaitHandle()
         {
-            lock(this)
+            lock (this)
             {
                 if (null != _workItemCompleted)
                 {
@@ -779,10 +922,10 @@ namespace Amib.Threading.Internal
         {
             get
             {
-                lock(this)
+                lock (this)
                 {
                     WorkItemState workItemState = GetWorkItemState();
-                    return ((workItemState == WorkItemState.Completed) || 
+                    return ((workItemState == WorkItemState.Completed) ||
                             (workItemState == WorkItemState.Canceled));
                 }
             }
@@ -795,7 +938,7 @@ namespace Amib.Threading.Internal
         {
             get
             {
-                lock(this)
+                lock (this)
                 {
                     return (GetWorkItemState() == WorkItemState.Canceled);
                 }
@@ -843,172 +986,6 @@ namespace Amib.Threading.Internal
             }
         }
 
-
-        #region WorkItemResult class
-
-        private class WorkItemResult : IWorkItemResult, IInternalWorkItemResult
-        {
-            /// <summary>
-            /// A back reference to the work item
-            /// </summary>
-            private WorkItem _workItem;
-
-            public WorkItemResult(WorkItem workItem)
-            {
-                _workItem = workItem;
-            }
-
-            internal WorkItem GetWorkItem()
-            {
-                return _workItem;
-            }
-
-            #region IWorkItemResult Members
-
-            public bool IsCompleted
-            {
-                get
-                {
-                    return _workItem.IsCompleted;
-                }
-            }
-
-            public void Abort()
-            {
-                _workItem.Abort();
-            }
-
-            public bool IsCanceled
-            {
-                get
-                {
-                    return _workItem.IsCanceled;
-                }
-            }
-
-            public object GetResult()
-            {
-                return _workItem.GetResult(Timeout.Infinite, true, null);
-            }
-    
-            public object GetResult(int millisecondsTimeout, bool exitContext)
-            {
-                return _workItem.GetResult(millisecondsTimeout, exitContext, null);
-            }
-
-            public object GetResult(TimeSpan timeout, bool exitContext)
-            {
-                return _workItem.GetResult((int)timeout.TotalMilliseconds, exitContext, null);
-            }
-
-            public object GetResult(int millisecondsTimeout, bool exitContext, WaitHandle cancelWaitHandle)
-            {
-                return _workItem.GetResult(millisecondsTimeout, exitContext, cancelWaitHandle);
-            }
-
-            public object GetResult(TimeSpan timeout, bool exitContext, WaitHandle cancelWaitHandle)
-            {
-                return _workItem.GetResult((int)timeout.TotalMilliseconds, exitContext, cancelWaitHandle);
-            }
-
-            public object GetResult(out Exception e)
-            {
-                return _workItem.GetResult(Timeout.Infinite, true, null, out e);
-            }
-    
-            public object GetResult(int millisecondsTimeout, bool exitContext, out Exception e)
-            {
-                return _workItem.GetResult(millisecondsTimeout, exitContext, null, out e);
-            }
-
-            public object GetResult(TimeSpan timeout, bool exitContext, out Exception e)
-            {
-                return _workItem.GetResult((int)timeout.TotalMilliseconds, exitContext, null, out e);
-            }
-
-            public object GetResult(int millisecondsTimeout, bool exitContext, WaitHandle cancelWaitHandle, out Exception e)
-            {
-                return _workItem.GetResult(millisecondsTimeout, exitContext, cancelWaitHandle, out e);
-            }
-
-            public object GetResult(TimeSpan timeout, bool exitContext, WaitHandle cancelWaitHandle, out Exception e)
-            {
-                return _workItem.GetResult((int)timeout.TotalMilliseconds, exitContext, cancelWaitHandle, out e);
-            }
-
-            public bool Cancel()
-            {
-                return _workItem.Cancel();
-            }
-
-            public object State
-            {
-                get
-                {
-                    return _workItem._state;
-                }
-            }
-
-            public WorkItemPriority WorkItemPriority 
-            { 
-                get
-                {
-                    return _workItem._workItemInfo.WorkItemPriority;
-                }
-            }
-
-            /// <summary>
-            /// Return the result, same as GetResult()
-            /// </summary>
-            public object Result
-            {
-                get { return GetResult(); }
-            }
-
-            /// <summary>
-            /// Returns the exception if occured otherwise returns null.
-            /// This value is valid only after the work item completed,
-            /// before that it is always null.
-            /// </summary>
-            public object Exception
-            {
-                get { return _workItem._exception; }
-            }
-
-            #endregion
-
-            #region IInternalWorkItemResult Members
-
-            public event WorkItemStateCallback OnWorkItemStarted
-            {
-                add
-                {
-                    _workItem.OnWorkItemStarted += value;
-                }
-                remove
-                {
-                    _workItem.OnWorkItemStarted -= value;
-                }
-            }
-
-
-            public event WorkItemStateCallback OnWorkItemCompleted
-            {
-                add
-                {
-                    _workItem.OnWorkItemCompleted += value;
-                }
-                remove
-                {
-                    _workItem.OnWorkItemCompleted -= value;
-                }
-            }
-
-            #endregion
-        }
-
-        #endregion
-
         public void DisposeOfState()
         {
             if (_workItemInfo.DisposeOfStateObjects)
@@ -1021,15 +998,5 @@ namespace Amib.Threading.Internal
                 }
             }
         }
-
-        public void Abort()
-        {
-            lock (this)
-            {
-                if(currentThread != null)
-                    currentThread.Abort();
-            }
-        }
     }
-    #endregion
 }
diff --git a/ThirdParty/SmartThreadPool/WorkItemFactory.cs b/ThirdParty/SmartThreadPool/WorkItemFactory.cs
index dfcb54f..16ccd81 100644
--- a/ThirdParty/SmartThreadPool/WorkItemFactory.cs
+++ b/ThirdParty/SmartThreadPool/WorkItemFactory.cs
@@ -1,148 +1,152 @@
-// Ami Bar
-// amibar@gmail.com
-
 using System;
 
 namespace Amib.Threading.Internal
 {
-    #region WorkItemFactory class 
-
-    public class WorkItemFactory
-    {
-        /// <summary>
-        /// Create a new work item
-        /// </summary>
+        #region WorkItemFactory class 
+
+        public class WorkItemFactory
+        {
+                /// <summary>
+                /// Create a new work item
+                /// </summary>
+                /// <param name="workItemsGroup">The WorkItemsGroup of this workitem</param>
+                /// <param name="wigStartInfo">Work item group start information</param>
+                /// <param name="callback">A callback to execute</param>
+                /// <returns>Returns a work item</returns>
+                public static WorkItem CreateWorkItem(
+                        IWorkItemsGroup workItemsGroup,
+                        WIGStartInfo wigStartInfo,
+                        WorkItemCallback callback)
+                {
+                        return CreateWorkItem(workItemsGroup, wigStartInfo, callback, null);
+                }
+
+                /// <summary>
+                /// Create a new work item
+                /// </summary>
+        /// <param name="workItemsGroup">The WorkItemsGroup of this workitem</param>
         /// <param name="wigStartInfo">Work item group start information</param>
-        /// <param name="callback">A callback to execute</param>
-        /// <returns>Returns a work item</returns>
-        public static WorkItem CreateWorkItem(
-            IWorkItemsGroup workItemsGroup,
-            WIGStartInfo wigStartInfo,
-            WorkItemCallback callback)
-        {
-            return CreateWorkItem(workItemsGroup, wigStartInfo, callback, null);
-        }
-
-        /// <summary>
-        /// Create a new work item
-        /// </summary>
-        /// <param name="wigStartInfo">Work item group start information</param>
-        /// <param name="callback">A callback to execute</param>
-        /// <param name="workItemPriority">The priority of the work item</param>
-        /// <returns>Returns a work item</returns>
-        public static WorkItem CreateWorkItem(
-            IWorkItemsGroup workItemsGroup,
-            WIGStartInfo wigStartInfo,
-            WorkItemCallback callback, 
-            WorkItemPriority workItemPriority)
-        {
-            return CreateWorkItem(workItemsGroup, wigStartInfo, callback, null, workItemPriority);
-        }
-
-        /// <summary>
-        /// Create a new work item
-        /// </summary>
+                /// <param name="callback">A callback to execute</param>
+                /// <param name="workItemPriority">The priority of the work item</param>
+                /// <returns>Returns a work item</returns>
+                public static WorkItem CreateWorkItem(
+                        IWorkItemsGroup workItemsGroup,
+                        WIGStartInfo wigStartInfo,
+                        WorkItemCallback callback, 
+                        WorkItemPriority workItemPriority)
+                {
+                        return CreateWorkItem(workItemsGroup, wigStartInfo, callback, null, workItemPriority);
+                }
+
+                /// <summary>
+                /// Create a new work item
+                /// </summary>
+        /// <param name="workItemsGroup">The WorkItemsGroup of this workitem</param>
         /// <param name="wigStartInfo">Work item group start information</param>
-        /// <param name="workItemInfo">Work item info</param>
-        /// <param name="callback">A callback to execute</param>
-        /// <returns>Returns a work item</returns>
-        public static WorkItem CreateWorkItem(
-            IWorkItemsGroup workItemsGroup,
-            WIGStartInfo wigStartInfo,
-            WorkItemInfo workItemInfo, 
-            WorkItemCallback callback)
-        {
-            return CreateWorkItem(
-                workItemsGroup,
-                wigStartInfo,
-                workItemInfo, 
-                callback, 
-                null);
-        }
-
-        /// <summary>
-        /// Create a new work item
-        /// </summary>
+                /// <param name="workItemInfo">Work item info</param>
+                /// <param name="callback">A callback to execute</param>
+                /// <returns>Returns a work item</returns>
+                public static WorkItem CreateWorkItem(
+                        IWorkItemsGroup workItemsGroup,
+                        WIGStartInfo wigStartInfo,
+                        WorkItemInfo workItemInfo, 
+                        WorkItemCallback callback)
+                {
+                        return CreateWorkItem(
+                                workItemsGroup,
+                                wigStartInfo,
+                                workItemInfo, 
+                                callback, 
+                                null);
+                }
+
+                /// <summary>
+                /// Create a new work item
+                /// </summary>
+        /// <param name="workItemsGroup">The WorkItemsGroup of this workitem</param>
         /// <param name="wigStartInfo">Work item group start information</param>
-        /// <param name="callback">A callback to execute</param>
-        /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
-        /// </param>
-        /// <returns>Returns a work item</returns>
-        public static WorkItem CreateWorkItem(
-            IWorkItemsGroup workItemsGroup,
-            WIGStartInfo wigStartInfo,
-            WorkItemCallback callback, 
-            object state)
-        {
-            ValidateCallback(callback);
-
-            WorkItemInfo workItemInfo = new WorkItemInfo();
-            workItemInfo.UseCallerCallContext = wigStartInfo.UseCallerCallContext;
-            workItemInfo.UseCallerHttpContext = wigStartInfo.UseCallerHttpContext;
-            workItemInfo.PostExecuteWorkItemCallback = wigStartInfo.PostExecuteWorkItemCallback;
-            workItemInfo.CallToPostExecute = wigStartInfo.CallToPostExecute;
-            workItemInfo.DisposeOfStateObjects = wigStartInfo.DisposeOfStateObjects;
-
-            WorkItem workItem = new WorkItem(
-                workItemsGroup,
-                workItemInfo,
-                callback, 
-                state);
-            return workItem;
-        }
-
-        /// <summary>
-        /// Create a new work item
-        /// </summary>
-        /// <param name="wigStartInfo">Work item group start information</param>
-        /// <param name="callback">A callback to execute</param>
-        /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
-        /// </param>
-        /// <param name="workItemPriority">The work item priority</param>
-        /// <returns>Returns a work item</returns>
-        public static WorkItem CreateWorkItem(
-            IWorkItemsGroup workItemsGroup,
-            WIGStartInfo wigStartInfo,
-            WorkItemCallback callback, 
-            object state, 
-            WorkItemPriority workItemPriority)
-        {
-            ValidateCallback(callback);
-
-            WorkItemInfo workItemInfo = new WorkItemInfo();
-            workItemInfo.UseCallerCallContext = wigStartInfo.UseCallerCallContext;
-            workItemInfo.UseCallerHttpContext = wigStartInfo.UseCallerHttpContext;
-            workItemInfo.PostExecuteWorkItemCallback = wigStartInfo.PostExecuteWorkItemCallback;
-            workItemInfo.CallToPostExecute = wigStartInfo.CallToPostExecute;
-            workItemInfo.DisposeOfStateObjects = wigStartInfo.DisposeOfStateObjects;
-            workItemInfo.WorkItemPriority = workItemPriority;
-
-            WorkItem workItem = new WorkItem(
-                workItemsGroup,
-                workItemInfo,
-                callback, 
-                state);
-
-            return workItem;
-        }
-
-        /// <summary>
-        /// Create a new work item
-        /// </summary>
-        /// <param name="wigStartInfo">Work item group start information</param>
-        /// <param name="workItemInfo">Work item information</param>
-        /// <param name="callback">A callback to execute</param>
-        /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
-        /// </param>
-        /// <returns>Returns a work item</returns>
+                /// <param name="callback">A callback to execute</param>
+                /// <param name="state">
+                /// The context object of the work item. Used for passing arguments to the work item. 
+                /// </param>
+                /// <returns>Returns a work item</returns>
+                public static WorkItem CreateWorkItem(
+                        IWorkItemsGroup workItemsGroup,
+                        WIGStartInfo wigStartInfo,
+                        WorkItemCallback callback, 
+                        object state)
+                {
+                        ValidateCallback(callback);
+            
+                        WorkItemInfo workItemInfo = new WorkItemInfo();
+                        workItemInfo.UseCallerCallContext = wigStartInfo.UseCallerCallContext;
+                        workItemInfo.UseCallerHttpContext = wigStartInfo.UseCallerHttpContext;
+                        workItemInfo.PostExecuteWorkItemCallback = wigStartInfo.PostExecuteWorkItemCallback;
+                        workItemInfo.CallToPostExecute = wigStartInfo.CallToPostExecute;
+                        workItemInfo.DisposeOfStateObjects = wigStartInfo.DisposeOfStateObjects;
+            workItemInfo.WorkItemPriority = wigStartInfo.WorkItemPriority;
+
+                        WorkItem workItem = new WorkItem(
+                                workItemsGroup,
+                                workItemInfo,
+                                callback, 
+                                state);
+                        return workItem;
+                }
+
+                /// <summary>
+                /// Create a new work item
+                /// </summary>
+                /// <param name="workItemsGroup">The work items group</param>
+                /// <param name="wigStartInfo">Work item group start information</param>
+                /// <param name="callback">A callback to execute</param>
+                /// <param name="state">
+                /// The context object of the work item. Used for passing arguments to the work item. 
+                /// </param>
+                /// <param name="workItemPriority">The work item priority</param>
+                /// <returns>Returns a work item</returns>
+                public static WorkItem CreateWorkItem(
+                        IWorkItemsGroup workItemsGroup,
+                        WIGStartInfo wigStartInfo,
+                        WorkItemCallback callback, 
+                        object state, 
+                        WorkItemPriority workItemPriority)
+                {
+                        ValidateCallback(callback);
+
+                        WorkItemInfo workItemInfo = new WorkItemInfo();
+                        workItemInfo.UseCallerCallContext = wigStartInfo.UseCallerCallContext;
+                        workItemInfo.UseCallerHttpContext = wigStartInfo.UseCallerHttpContext;
+                        workItemInfo.PostExecuteWorkItemCallback = wigStartInfo.PostExecuteWorkItemCallback;
+                        workItemInfo.CallToPostExecute = wigStartInfo.CallToPostExecute;
+                        workItemInfo.DisposeOfStateObjects = wigStartInfo.DisposeOfStateObjects;
+                        workItemInfo.WorkItemPriority = workItemPriority;
+
+                        WorkItem workItem = new WorkItem(
+                                workItemsGroup,
+                                workItemInfo,
+                                callback, 
+                                state);
+
+                        return workItem;
+                }
+
+                /// <summary>
+                /// Create a new work item
+                /// </summary>
+        /// <param name="workItemsGroup">The work items group</param>
+                /// <param name="wigStartInfo">Work item group start information</param>
+                /// <param name="workItemInfo">Work item information</param>
+                /// <param name="callback">A callback to execute</param>
+                /// <param name="state">
+                /// The context object of the work item. Used for passing arguments to the work item. 
+                /// </param>
+                /// <returns>Returns a work item</returns>
         public static WorkItem CreateWorkItem(
             IWorkItemsGroup workItemsGroup,
             WIGStartInfo wigStartInfo,
-            WorkItemInfo workItemInfo, 
-            WorkItemCallback callback, 
+            WorkItemInfo workItemInfo,
+            WorkItemCallback callback,
             object state)
         {
             ValidateCallback(callback);
@@ -151,183 +155,189 @@ namespace Amib.Threading.Internal
             WorkItem workItem = new WorkItem(
                 workItemsGroup,
                 new WorkItemInfo(workItemInfo),
-                callback, 
+                callback,
                 state);
 
             return workItem;
         }
 
-        /// <summary>
-        /// Create a new work item
-        /// </summary>
-        /// <param name="wigStartInfo">Work item group start information</param>
-        /// <param name="callback">A callback to execute</param>
-        /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
-        /// </param>
-        /// <param name="postExecuteWorkItemCallback">
-        /// A delegate to call after the callback completion
-        /// </param>
-        /// <returns>Returns a work item</returns>
-        public static WorkItem CreateWorkItem(
-            IWorkItemsGroup workItemsGroup,
-            WIGStartInfo wigStartInfo,
-            WorkItemCallback callback, 
-            object state,
-            PostExecuteWorkItemCallback postExecuteWorkItemCallback)
-        {
-            ValidateCallback(callback);
-            ValidateCallback(postExecuteWorkItemCallback);
-
-            WorkItemInfo workItemInfo = new WorkItemInfo();
-            workItemInfo.UseCallerCallContext = wigStartInfo.UseCallerCallContext;
-            workItemInfo.UseCallerHttpContext = wigStartInfo.UseCallerHttpContext;
-            workItemInfo.PostExecuteWorkItemCallback = postExecuteWorkItemCallback;
-            workItemInfo.CallToPostExecute = wigStartInfo.CallToPostExecute;
-            workItemInfo.DisposeOfStateObjects = wigStartInfo.DisposeOfStateObjects;
-
-            WorkItem workItem = new WorkItem(
-                workItemsGroup,
-                workItemInfo,
-                callback, 
-                state);
-
-            return workItem;
-        }
-
-        /// <summary>
-        /// Create a new work item
-        /// </summary>
-        /// <param name="wigStartInfo">Work item group start information</param>
-        /// <param name="callback">A callback to execute</param>
-        /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
-        /// </param>
-        /// <param name="postExecuteWorkItemCallback">
-        /// A delegate to call after the callback completion
-        /// </param>
-        /// <param name="workItemPriority">The work item priority</param>
-        /// <returns>Returns a work item</returns>
-        public static WorkItem CreateWorkItem(
-            IWorkItemsGroup workItemsGroup,
-            WIGStartInfo wigStartInfo,
-            WorkItemCallback callback, 
-            object state,
-            PostExecuteWorkItemCallback postExecuteWorkItemCallback,
-            WorkItemPriority workItemPriority)
-        {
-            ValidateCallback(callback);
-            ValidateCallback(postExecuteWorkItemCallback);
-
-            WorkItemInfo workItemInfo = new WorkItemInfo();
-            workItemInfo.UseCallerCallContext = wigStartInfo.UseCallerCallContext;
-            workItemInfo.UseCallerHttpContext = wigStartInfo.UseCallerHttpContext;
-            workItemInfo.PostExecuteWorkItemCallback = postExecuteWorkItemCallback;
-            workItemInfo.CallToPostExecute = wigStartInfo.CallToPostExecute;
-            workItemInfo.DisposeOfStateObjects = wigStartInfo.DisposeOfStateObjects;
-            workItemInfo.WorkItemPriority = workItemPriority;
-
-            WorkItem workItem = new WorkItem(
-                workItemsGroup,
-                workItemInfo,
-                callback, 
-                state);
-
-            return workItem;
-        }
-
-        /// <summary>
-        /// Create a new work item
-        /// </summary>
-        /// <param name="wigStartInfo">Work item group start information</param>
-        /// <param name="callback">A callback to execute</param>
-        /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
-        /// </param>
-        /// <param name="postExecuteWorkItemCallback">
-        /// A delegate to call after the callback completion
-        /// </param>
-        /// <param name="callToPostExecute">Indicates on which cases to call to the post execute callback</param>
-        /// <returns>Returns a work item</returns>
-        public static WorkItem CreateWorkItem(
-            IWorkItemsGroup workItemsGroup,
-            WIGStartInfo wigStartInfo,
-            WorkItemCallback callback, 
-            object state,
-            PostExecuteWorkItemCallback postExecuteWorkItemCallback,
-            CallToPostExecute callToPostExecute)
-        {
-            ValidateCallback(callback);
-            ValidateCallback(postExecuteWorkItemCallback);
-
-            WorkItemInfo workItemInfo = new WorkItemInfo();
-            workItemInfo.UseCallerCallContext = wigStartInfo.UseCallerCallContext;
-            workItemInfo.UseCallerHttpContext = wigStartInfo.UseCallerHttpContext;
-            workItemInfo.PostExecuteWorkItemCallback = postExecuteWorkItemCallback;
-            workItemInfo.CallToPostExecute = callToPostExecute;
-            workItemInfo.DisposeOfStateObjects = wigStartInfo.DisposeOfStateObjects;
-
-            WorkItem workItem = new WorkItem(
-                workItemsGroup,
-                workItemInfo,
-                callback, 
-                state);
-
-            return workItem;
-        }
-
-        /// <summary>
-        /// Create a new work item
-        /// </summary>
-        /// <param name="wigStartInfo">Work item group start information</param>
-        /// <param name="callback">A callback to execute</param>
-        /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
-        /// </param>
-        /// <param name="postExecuteWorkItemCallback">
-        /// A delegate to call after the callback completion
-        /// </param>
-        /// <param name="callToPostExecute">Indicates on which cases to call to the post execute callback</param>
-        /// <param name="workItemPriority">The work item priority</param>
-        /// <returns>Returns a work item</returns>
-        public static WorkItem CreateWorkItem(
-            IWorkItemsGroup workItemsGroup,
-            WIGStartInfo wigStartInfo,
-            WorkItemCallback callback, 
-            object state,
-            PostExecuteWorkItemCallback postExecuteWorkItemCallback,
-            CallToPostExecute callToPostExecute,
-            WorkItemPriority workItemPriority)
-        {
-
-            ValidateCallback(callback);
-            ValidateCallback(postExecuteWorkItemCallback);
-
-            WorkItemInfo workItemInfo = new WorkItemInfo();
-            workItemInfo.UseCallerCallContext = wigStartInfo.UseCallerCallContext;
-            workItemInfo.UseCallerHttpContext = wigStartInfo.UseCallerHttpContext;
-            workItemInfo.PostExecuteWorkItemCallback = postExecuteWorkItemCallback;
-            workItemInfo.CallToPostExecute = callToPostExecute;
-            workItemInfo.WorkItemPriority = workItemPriority;
-            workItemInfo.DisposeOfStateObjects = wigStartInfo.DisposeOfStateObjects;
-
-            WorkItem workItem = new WorkItem(
-                workItemsGroup,
-                workItemInfo,
-                callback, 
-                state);
-            
-            return workItem;
-        }
-
-        private static void ValidateCallback(Delegate callback)
-        {
-            if(callback.GetInvocationList().Length > 1)
-            {
-                throw new NotSupportedException("SmartThreadPool doesn't support delegates chains");
-            }
-        }
-    }
-
-    #endregion
+                /// <summary>
+                /// Create a new work item
+                /// </summary>
+        /// <param name="workItemsGroup">The work items group</param>
+                /// <param name="wigStartInfo">Work item group start information</param>
+                /// <param name="callback">A callback to execute</param>
+                /// <param name="state">
+                /// The context object of the work item. Used for passing arguments to the work item. 
+                /// </param>
+                /// <param name="postExecuteWorkItemCallback">
+                /// A delegate to call after the callback completion
+                /// </param>
+                /// <returns>Returns a work item</returns>
+                public static WorkItem CreateWorkItem(
+                        IWorkItemsGroup workItemsGroup,
+                        WIGStartInfo wigStartInfo,
+                        WorkItemCallback callback, 
+                        object state,
+                        PostExecuteWorkItemCallback postExecuteWorkItemCallback)
+                {
+                        ValidateCallback(callback);
+                        ValidateCallback(postExecuteWorkItemCallback);
+
+                        WorkItemInfo workItemInfo = new WorkItemInfo();
+                        workItemInfo.UseCallerCallContext = wigStartInfo.UseCallerCallContext;
+                        workItemInfo.UseCallerHttpContext = wigStartInfo.UseCallerHttpContext;
+                        workItemInfo.PostExecuteWorkItemCallback = postExecuteWorkItemCallback;
+                        workItemInfo.CallToPostExecute = wigStartInfo.CallToPostExecute;
+                        workItemInfo.DisposeOfStateObjects = wigStartInfo.DisposeOfStateObjects;
+            workItemInfo.WorkItemPriority = wigStartInfo.WorkItemPriority;
+
+                        WorkItem workItem = new WorkItem(
+                                workItemsGroup,
+                                workItemInfo,
+                                callback, 
+                                state);
+
+                        return workItem;
+                }
+
+                /// <summary>
+                /// Create a new work item
+                /// </summary>
+        /// <param name="workItemsGroup">The work items group</param>
+                /// <param name="wigStartInfo">Work item group start information</param>
+                /// <param name="callback">A callback to execute</param>
+                /// <param name="state">
+                /// The context object of the work item. Used for passing arguments to the work item. 
+                /// </param>
+                /// <param name="postExecuteWorkItemCallback">
+                /// A delegate to call after the callback completion
+                /// </param>
+                /// <param name="workItemPriority">The work item priority</param>
+                /// <returns>Returns a work item</returns>
+                public static WorkItem CreateWorkItem(
+                        IWorkItemsGroup workItemsGroup,
+                        WIGStartInfo wigStartInfo,
+                        WorkItemCallback callback, 
+                        object state,
+                        PostExecuteWorkItemCallback postExecuteWorkItemCallback,
+                        WorkItemPriority workItemPriority)
+                {
+                        ValidateCallback(callback);
+                        ValidateCallback(postExecuteWorkItemCallback);
+
+                        WorkItemInfo workItemInfo = new WorkItemInfo();
+                        workItemInfo.UseCallerCallContext = wigStartInfo.UseCallerCallContext;
+                        workItemInfo.UseCallerHttpContext = wigStartInfo.UseCallerHttpContext;
+                        workItemInfo.PostExecuteWorkItemCallback = postExecuteWorkItemCallback;
+                        workItemInfo.CallToPostExecute = wigStartInfo.CallToPostExecute;
+                        workItemInfo.DisposeOfStateObjects = wigStartInfo.DisposeOfStateObjects;
+                        workItemInfo.WorkItemPriority = workItemPriority;
+
+                        WorkItem workItem = new WorkItem(
+                                workItemsGroup,
+                                workItemInfo,
+                                callback, 
+                                state);
+
+                        return workItem;
+                }
+
+                /// <summary>
+                /// Create a new work item
+                /// </summary>
+        /// <param name="workItemsGroup">The work items group</param>
+                /// <param name="wigStartInfo">Work item group start information</param>
+                /// <param name="callback">A callback to execute</param>
+                /// <param name="state">
+                /// The context object of the work item. Used for passing arguments to the work item. 
+                /// </param>
+                /// <param name="postExecuteWorkItemCallback">
+                /// A delegate to call after the callback completion
+                /// </param>
+                /// <param name="callToPostExecute">Indicates on which cases to call to the post execute callback</param>
+                /// <returns>Returns a work item</returns>
+                public static WorkItem CreateWorkItem(
+                        IWorkItemsGroup workItemsGroup,
+                        WIGStartInfo wigStartInfo,
+                        WorkItemCallback callback, 
+                        object state,
+                        PostExecuteWorkItemCallback postExecuteWorkItemCallback,
+                        CallToPostExecute callToPostExecute)
+                {
+                        ValidateCallback(callback);
+                        ValidateCallback(postExecuteWorkItemCallback);
+
+                        WorkItemInfo workItemInfo = new WorkItemInfo();
+                        workItemInfo.UseCallerCallContext = wigStartInfo.UseCallerCallContext;
+                        workItemInfo.UseCallerHttpContext = wigStartInfo.UseCallerHttpContext;
+                        workItemInfo.PostExecuteWorkItemCallback = postExecuteWorkItemCallback;
+                        workItemInfo.CallToPostExecute = callToPostExecute;
+                        workItemInfo.DisposeOfStateObjects = wigStartInfo.DisposeOfStateObjects;
+            workItemInfo.WorkItemPriority = wigStartInfo.WorkItemPriority;
+
+                        WorkItem workItem = new WorkItem(
+                                workItemsGroup,
+                                workItemInfo,
+                                callback, 
+                                state);
+
+                        return workItem;
+                }
+
+                /// <summary>
+                /// Create a new work item
+                /// </summary>
+        /// <param name="workItemsGroup">The work items group</param>
+                /// <param name="wigStartInfo">Work item group start information</param>
+                /// <param name="callback">A callback to execute</param>
+                /// <param name="state">
+                /// The context object of the work item. Used for passing arguments to the work item. 
+                /// </param>
+                /// <param name="postExecuteWorkItemCallback">
+                /// A delegate to call after the callback completion
+                /// </param>
+                /// <param name="callToPostExecute">Indicates on which cases to call to the post execute callback</param>
+                /// <param name="workItemPriority">The work item priority</param>
+                /// <returns>Returns a work item</returns>
+                public static WorkItem CreateWorkItem(
+                        IWorkItemsGroup workItemsGroup,
+                        WIGStartInfo wigStartInfo,
+                        WorkItemCallback callback, 
+                        object state,
+                        PostExecuteWorkItemCallback postExecuteWorkItemCallback,
+                        CallToPostExecute callToPostExecute,
+                        WorkItemPriority workItemPriority)
+                {
+
+                        ValidateCallback(callback);
+                        ValidateCallback(postExecuteWorkItemCallback);
+
+                        WorkItemInfo workItemInfo = new WorkItemInfo();
+                        workItemInfo.UseCallerCallContext = wigStartInfo.UseCallerCallContext;
+                        workItemInfo.UseCallerHttpContext = wigStartInfo.UseCallerHttpContext;
+                        workItemInfo.PostExecuteWorkItemCallback = postExecuteWorkItemCallback;
+                        workItemInfo.CallToPostExecute = callToPostExecute;
+                        workItemInfo.WorkItemPriority = workItemPriority;
+                        workItemInfo.DisposeOfStateObjects = wigStartInfo.DisposeOfStateObjects;
+
+                        WorkItem workItem = new WorkItem(
+                                workItemsGroup,
+                                workItemInfo,
+                                callback, 
+                                state);
+                        
+                        return workItem;
+                }
+
+                private static void ValidateCallback(Delegate callback)
+                {
+            if (callback != null && callback.GetInvocationList().Length > 1)
+                        {
+                                throw new NotSupportedException("SmartThreadPool doesn't support delegates chains");
+                        }
+                }
+        }
+
+        #endregion
 }
diff --git a/ThirdParty/SmartThreadPool/WorkItemInfo.cs b/ThirdParty/SmartThreadPool/WorkItemInfo.cs
index c259339..0d7fc85 100644
--- a/ThirdParty/SmartThreadPool/WorkItemInfo.cs
+++ b/ThirdParty/SmartThreadPool/WorkItemInfo.cs
@@ -1,102 +1,69 @@
-// Ami Bar
-// amibar@gmail.com
-
 namespace Amib.Threading
 {
-    #region WorkItemInfo class
-
-    /// <summary>
-    /// Summary description for WorkItemInfo.
-    /// </summary>
-    public class WorkItemInfo
-    {
-        /// <summary>
-        /// Use the caller's security context
-        /// </summary>
-        private bool _useCallerCallContext;
-
-        /// <summary>
-        /// Use the caller's security context
-        /// </summary>
-        private bool _useCallerHttpContext;
-
-        /// <summary>
-        /// Dispose of the state object of a work item
-        /// </summary>
-        private bool _disposeOfStateObjects;
-
-        /// <summary>
-        /// The option to run the post execute
-        /// </summary>
-        private CallToPostExecute _callToPostExecute;
+        #region WorkItemInfo class
 
-        /// <summary>
-        /// A post execute callback to call when none is provided in 
-        /// the QueueWorkItem method.
-        /// </summary>
-        private PostExecuteWorkItemCallback _postExecuteWorkItemCallback;
-        
-        /// <summary>
-        /// The priority of the work item
-        /// </summary>
-        private WorkItemPriority _workItemPriority;
+        /// <summary>
+        /// Summary description for WorkItemInfo.
+        /// </summary>
+        public class WorkItemInfo
+        {
+            public WorkItemInfo()
+                {
+                        UseCallerCallContext = SmartThreadPool.DefaultUseCallerCallContext;
+                        UseCallerHttpContext = SmartThreadPool.DefaultUseCallerHttpContext;
+                        DisposeOfStateObjects = SmartThreadPool.DefaultDisposeOfStateObjects;
+                        CallToPostExecute = SmartThreadPool.DefaultCallToPostExecute;
+                        PostExecuteWorkItemCallback = SmartThreadPool.DefaultPostExecuteWorkItemCallback;
+                        WorkItemPriority = SmartThreadPool.DefaultWorkItemPriority;
+                }
 
-        public WorkItemInfo()
-        {
-            _useCallerCallContext = SmartThreadPool.DefaultUseCallerCallContext;
-            _useCallerHttpContext = SmartThreadPool.DefaultUseCallerHttpContext;
-            _disposeOfStateObjects = SmartThreadPool.DefaultDisposeOfStateObjects;
-            _callToPostExecute = SmartThreadPool.DefaultCallToPostExecute;
-            _postExecuteWorkItemCallback = SmartThreadPool.DefaultPostExecuteWorkItemCallback;
-            _workItemPriority = SmartThreadPool.DefaultWorkItemPriority;
-        }
+                public WorkItemInfo(WorkItemInfo workItemInfo)
+                {
+                        UseCallerCallContext = workItemInfo.UseCallerCallContext;
+                        UseCallerHttpContext = workItemInfo.UseCallerHttpContext;
+                        DisposeOfStateObjects = workItemInfo.DisposeOfStateObjects;
+                        CallToPostExecute = workItemInfo.CallToPostExecute;
+                        PostExecuteWorkItemCallback = workItemInfo.PostExecuteWorkItemCallback;
+                        WorkItemPriority = workItemInfo.WorkItemPriority;
+            Timeout = workItemInfo.Timeout;
+                }
 
-        public WorkItemInfo(WorkItemInfo workItemInfo)
-        {
-            _useCallerCallContext = workItemInfo._useCallerCallContext;
-            _useCallerHttpContext = workItemInfo._useCallerHttpContext;
-            _disposeOfStateObjects = workItemInfo._disposeOfStateObjects;
-            _callToPostExecute = workItemInfo._callToPostExecute;
-            _postExecuteWorkItemCallback = workItemInfo._postExecuteWorkItemCallback;
-            _workItemPriority = workItemInfo._workItemPriority;
-        }
+            /// <summary>
+            /// Get/Set if to use the caller's security context
+            /// </summary>
+            public bool UseCallerCallContext { get; set; }
 
-        public bool UseCallerCallContext
-        {
-            get { return _useCallerCallContext; }
-            set { _useCallerCallContext = value; }
-        }
+            /// <summary>
+            /// Get/Set if to use the caller's HTTP context
+            /// </summary>
+            public bool UseCallerHttpContext { get; set; }
 
-        public bool UseCallerHttpContext
-        {
-            get { return _useCallerHttpContext; }
-            set { _useCallerHttpContext = value; }
-        }
+            /// <summary>
+            /// Get/Set if to dispose of the state object of a work item
+            /// </summary>
+            public bool DisposeOfStateObjects { get; set; }
 
-        public bool DisposeOfStateObjects
-        {
-            get { return _disposeOfStateObjects; }
-            set { _disposeOfStateObjects = value; }
-        }
+            /// <summary>
+            /// Get/Set the run the post execute options
+            /// </summary>
+        public CallToPostExecute CallToPostExecute { get; set; }
 
-        public CallToPostExecute CallToPostExecute
-        {
-            get { return _callToPostExecute; }
-            set { _callToPostExecute = value; }
-        }
+            /// <summary>
+            /// Get/Set the post execute callback
+            /// </summary>
+        public PostExecuteWorkItemCallback PostExecuteWorkItemCallback { get; set; }
 
-        public PostExecuteWorkItemCallback PostExecuteWorkItemCallback
-        {
-            get { return _postExecuteWorkItemCallback; }
-            set { _postExecuteWorkItemCallback = value; }
-        }
+            /// <summary>
+            /// Get/Set the work item's priority
+            /// </summary>
+            public WorkItemPriority WorkItemPriority { get; set; }
 
-        public WorkItemPriority WorkItemPriority
-        {
-            get { return _workItemPriority; }
-            set { _workItemPriority = value; }
-        }
-    }
+            /// <summary>
+            /// Get/Set the work item's timout in milliseconds.
+        /// This is a passive timout. When the timout expires the work item won't be actively aborted!
+            /// </summary>
+            public long Timeout { get; set; }
+        }
 
-    #endregion
+        #endregion
 }
diff --git a/ThirdParty/SmartThreadPool/WorkItemResultTWrapper.cs b/ThirdParty/SmartThreadPool/WorkItemResultTWrapper.cs
new file mode 100644
index 0000000..d1eff95
--- /dev/null
+++ b/ThirdParty/SmartThreadPool/WorkItemResultTWrapper.cs
@@ -0,0 +1,128 @@
+using System;
+using System.Threading;
+
+namespace Amib.Threading.Internal
+{
+    #region WorkItemResultTWrapper class
+
+    internal class WorkItemResultTWrapper<TResult> : IWorkItemResult<TResult>, IInternalWaitableResult
+    {
+        private readonly IWorkItemResult _workItemResult;
+
+        public WorkItemResultTWrapper(IWorkItemResult workItemResult)
+        {
+            _workItemResult = workItemResult;
+        }
+
+        #region IWorkItemResult<TResult> Members
+
+        public TResult GetResult()
+        {
+            return (TResult)_workItemResult.GetResult();
+        }
+
+        public TResult GetResult(int millisecondsTimeout, bool exitContext)
+        {
+            return (TResult)_workItemResult.GetResult(millisecondsTimeout, exitContext);
+        }
+
+        public TResult GetResult(TimeSpan timeout, bool exitContext)
+        {
+            return (TResult)_workItemResult.GetResult(timeout, exitContext);
+        }
+
+        public TResult GetResult(int millisecondsTimeout, bool exitContext, WaitHandle cancelWaitHandle)
+        {
+            return (TResult)_workItemResult.GetResult(millisecondsTimeout, exitContext, cancelWaitHandle);
+        }
+
+        public TResult GetResult(TimeSpan timeout, bool exitContext, WaitHandle cancelWaitHandle)
+        {
+            return (TResult)_workItemResult.GetResult(timeout, exitContext, cancelWaitHandle);
+        }
+
+        public TResult GetResult(out Exception e)
+        {
+            return (TResult)_workItemResult.GetResult(out e);
+        }
+
+        public TResult GetResult(int millisecondsTimeout, bool exitContext, out Exception e)
+        {
+            return (TResult)_workItemResult.GetResult(millisecondsTimeout, exitContext, out e);
+        }
+
+        public TResult GetResult(TimeSpan timeout, bool exitContext, out Exception e)
+        {
+            return (TResult)_workItemResult.GetResult(timeout, exitContext, out e);
+        }
+
+        public TResult GetResult(int millisecondsTimeout, bool exitContext, WaitHandle cancelWaitHandle, out Exception e)
+        {
+            return (TResult)_workItemResult.GetResult(millisecondsTimeout, exitContext, cancelWaitHandle, out e);
+        }
+
+        public TResult GetResult(TimeSpan timeout, bool exitContext, WaitHandle cancelWaitHandle, out Exception e)
+        {
+            return (TResult)_workItemResult.GetResult(timeout, exitContext, cancelWaitHandle, out e);
+        }
+
+        public bool IsCompleted
+        {
+            get { return _workItemResult.IsCompleted; }
+        }
+
+        public bool IsCanceled
+        {
+            get { return _workItemResult.IsCanceled; }
+        }
+
+        public object State
+        {
+            get { return _workItemResult.State; }
+        }
+
+        public bool Cancel()
+        {
+            return _workItemResult.Cancel();
+        }
+
+        public bool Cancel(bool abortExecution)
+        {
+            return _workItemResult.Cancel(abortExecution);
+        }
+
+        public WorkItemPriority WorkItemPriority
+        {
+            get { return _workItemResult.WorkItemPriority; }
+        }
+
+        public TResult Result
+        {
+            get { return (TResult)_workItemResult.Result; }
+        }
+
+        public object Exception
+        {
+            get { return (TResult)_workItemResult.Exception; }
+        }
+
+        #region IInternalWorkItemResult Members
+
+        public IWorkItemResult GetWorkItemResult()
+        {
+            return _workItemResult.GetWorkItemResult();
+        }
+
+        public IWorkItemResult<TRes> GetWorkItemResultT<TRes>()
+        {
+            return (IWorkItemResult<TRes>)this;
+        }
+
+        #endregion
+
+        #endregion
+    }
+
+    #endregion
+
+}
diff --git a/ThirdParty/SmartThreadPool/WorkItemsGroup.cs b/ThirdParty/SmartThreadPool/WorkItemsGroup.cs
index 01ac8dd..d9d34ac 100644
--- a/ThirdParty/SmartThreadPool/WorkItemsGroup.cs
+++ b/ThirdParty/SmartThreadPool/WorkItemsGroup.cs
@@ -1,6 +1,3 @@
-// Ami Bar
-// amibar@gmail.com
-
 using System;
 using System.Threading;
 using System.Runtime.CompilerServices;
@@ -8,505 +5,357 @@ using System.Diagnostics;
 
 namespace Amib.Threading.Internal
 {
-    #region WorkItemsGroup class 
-
-    /// <summary>
-    /// Summary description for WorkItemsGroup.
-    /// </summary>
-    public class WorkItemsGroup : IWorkItemsGroup
-    {
-        #region Private members
-
-        private object _lock = new object();
-        /// <summary>
-        /// Contains the name of this instance of SmartThreadPool.
-        /// Can be changed by the user.
-        /// </summary>
-        private string _name = "WorkItemsGroup";
-
-        /// <summary>
-        /// A reference to the SmartThreadPool instance that created this 
-        /// WorkItemsGroup.
-        /// </summary>
-        private SmartThreadPool _stp;
-
-        /// <summary>
-        /// The OnIdle event
-        /// </summary>
-        private event WorkItemsGroupIdleHandler _onIdle;
 
-        /// <summary>
-        /// Defines how many work items of this WorkItemsGroup can run at once.
-        /// </summary>
-        private int _concurrency;
+        #region WorkItemsGroup class 
 
-        /// <summary>
-        /// Priority queue to hold work items before they are passed 
-        /// to the SmartThreadPool.
-        /// </summary>
-        private PriorityQueue _workItemsQueue;
+        /// <summary>
+        /// Summary description for WorkItemsGroup.
+        /// </summary>
+        public class WorkItemsGroup : WorkItemsGroupBase
+        {
+                #region Private members
 
-        /// <summary>
-        /// Indicate how many work items are waiting in the SmartThreadPool
-        /// queue.
-        /// This value is used to apply the concurrency.
-        /// </summary>
-        private int _workItemsInStpQueue;
+                private readonly object _lock = new object();
 
-        /// <summary>
-        /// Indicate how many work items are currently running in the SmartThreadPool.
-        /// This value is used with the Cancel, to calculate if we can send new 
-        /// work items to the STP.
-        /// </summary>
-        private int _workItemsExecutingInStp = 0;
+                /// <summary>
+                /// A reference to the SmartThreadPool instance that created this 
+                /// WorkItemsGroup.
+                /// </summary>
+                private readonly SmartThreadPool _stp;
 
-        /// <summary>
-        /// WorkItemsGroup start information
-        /// </summary>
-        private WIGStartInfo _workItemsGroupStartInfo;
+                /// <summary>
+                /// The OnIdle event
+                /// </summary>
+                private event WorkItemsGroupIdleHandler _onIdle;
 
         /// <summary>
-        /// Signaled when all of the WorkItemsGroup's work item completed.
+        /// A flag to indicate if the Work Items Group is now suspended.
         /// </summary>
-        private ManualResetEvent _isIdleWaitHandle = new ManualResetEvent(true);
-
-        /// <summary>
-        /// A common object for all the work items that this work items group
-        /// generate so we can mark them to cancel in O(1)
-        /// </summary>
-        private CanceledWorkItemsGroup _canceledWorkItemsGroup = new CanceledWorkItemsGroup();
-
-        #endregion 
-
-        #region Construction
-
-        public WorkItemsGroup(
-            SmartThreadPool stp, 
-            int concurrency, 
-            WIGStartInfo wigStartInfo)
+        private bool _isSuspended;
+
+                /// <summary>
+                /// Defines how many work items of this WorkItemsGroup can run at once.
+                /// </summary>
+                private int _concurrency;
+
+                /// <summary>
+                /// Priority queue to hold work items before they are passed 
+                /// to the SmartThreadPool.
+                /// </summary>
+                private readonly PriorityQueue _workItemsQueue;
+
+                /// <summary>
+                /// Indicate how many work items are waiting in the SmartThreadPool
+                /// queue.
+                /// This value is used to apply the concurrency.
+                /// </summary>
+                private int _workItemsInStpQueue;
+
+                /// <summary>
+                /// Indicate how many work items are currently running in the SmartThreadPool.
+                /// This value is used with the Cancel, to calculate if we can send new 
+                /// work items to the STP.
+                /// </summary>
+                private int _workItemsExecutingInStp = 0;
+
+                /// <summary>
+                /// WorkItemsGroup start information
+                /// </summary>
+                private readonly WIGStartInfo _workItemsGroupStartInfo;
+
+                /// <summary>
+                /// Signaled when all of the WorkItemsGroup's work item completed.
+                /// </summary>
+        //private readonly ManualResetEvent _isIdleWaitHandle = new ManualResetEvent(true);
+        private readonly ManualResetEvent _isIdleWaitHandle = EventWaitHandleFactory.CreateManualResetEvent(true);
+
+                /// <summary>
+                /// A common object for all the work items that this work items group
+                /// generate so we can mark them to cancel in O(1)
+                /// </summary>
+                private CanceledWorkItemsGroup _canceledWorkItemsGroup = new CanceledWorkItemsGroup();
+
+                #endregion 
+
+                #region Construction
+
+            public WorkItemsGroup(
+                        SmartThreadPool stp, 
+                        int concurrency, 
+                        WIGStartInfo wigStartInfo)
+                {
+                        if (concurrency <= 0)
+                        {
+                                throw new ArgumentOutOfRangeException(
+                    "concurrency",
+#if !(_WINDOWS_CE) && !(_SILVERLIGHT) && !(WINDOWS_PHONE)
+                    concurrency,
+#endif
+ "concurrency must be greater than zero");
+                        }
+                        _stp = stp;
+                        _concurrency = concurrency;
+                        _workItemsGroupStartInfo = new WIGStartInfo(wigStartInfo).AsReadOnly();
+                        _workItemsQueue = new PriorityQueue();
+                Name = "WorkItemsGroup";
+
+                        // The _workItemsInStpQueue gets the number of currently executing work items,
+                        // because once a work item is executing, it cannot be cancelled.
+                        _workItemsInStpQueue = _workItemsExecutingInStp;
+
+            _isSuspended = _workItemsGroupStartInfo.StartSuspended;
+                }
+
+                #endregion 
+
+        #region WorkItemsGroupBase Overrides
+
+        public override int Concurrency
         {
-            if (concurrency <= 0)
-            {
-                throw new ArgumentOutOfRangeException("concurrency", concurrency, "concurrency must be greater than zero");
-            }
-            _stp = stp;
-            _concurrency = concurrency;
-            _workItemsGroupStartInfo = new WIGStartInfo(wigStartInfo);
-            _workItemsQueue = new PriorityQueue();
-
-            // The _workItemsInStpQueue gets the number of currently executing work items,
-            // because once a work item is executing, it cannot be cancelled.
-            _workItemsInStpQueue = _workItemsExecutingInStp;
-        }
-
-        #endregion 
-
-        #region IWorkItemsGroup implementation
-
-        /// <summary>
-        /// Get/Set the name of the SmartThreadPool instance
-        /// </summary>
-        public string Name 
-        { 
-            get
-            {
-                return _name;
-            }
-
+            get { return _concurrency; }
             set
             {
-                _name = value;
-            }
-        }
-
-        /// <summary>
-        /// Queue a work item
-        /// </summary>
-        /// <param name="callback">A callback to execute</param>
-        /// <returns>Returns a work item result</returns>
-        public IWorkItemResult QueueWorkItem(WorkItemCallback callback)
-        {
-            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, _workItemsGroupStartInfo, callback);
-            EnqueueToSTPNextWorkItem(workItem);
-            return workItem.GetWorkItemResult();
-        }
+                Debug.Assert(value > 0);
 
-        /// <summary>
-        /// Queue a work item
-        /// </summary>
-        /// <param name="callback">A callback to execute</param>
-        /// <param name="workItemPriority">The priority of the work item</param>
-        /// <returns>Returns a work item result</returns>
-        public IWorkItemResult QueueWorkItem(WorkItemCallback callback, WorkItemPriority workItemPriority)
-        {
-            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, _workItemsGroupStartInfo, callback, workItemPriority);
-            EnqueueToSTPNextWorkItem(workItem);
-            return workItem.GetWorkItemResult();
-        }
-
-        /// <summary>
-        /// Queue a work item
-        /// </summary>
-        /// <param name="workItemInfo">Work item info</param>
-        /// <param name="callback">A callback to execute</param>
-        /// <returns>Returns a work item result</returns>
-        public IWorkItemResult QueueWorkItem(WorkItemInfo workItemInfo, WorkItemCallback callback)
-        {
-            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, _workItemsGroupStartInfo, workItemInfo, callback);
-            EnqueueToSTPNextWorkItem(workItem);
-            return workItem.GetWorkItemResult();
-        }
-
-        /// <summary>
-        /// Queue a work item
-        /// </summary>
-        /// <param name="callback">A callback to execute</param>
-        /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
-        /// </param>
-        /// <returns>Returns a work item result</returns>
-        public IWorkItemResult QueueWorkItem(WorkItemCallback callback, object state)
-        {
-            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, _workItemsGroupStartInfo, callback, state);
-            EnqueueToSTPNextWorkItem(workItem);
-            return workItem.GetWorkItemResult();
-        }
-
-        /// <summary>
-        /// Queue a work item
-        /// </summary>
-        /// <param name="callback">A callback to execute</param>
-        /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
-        /// </param>
-        /// <param name="workItemPriority">The work item priority</param>
-        /// <returns>Returns a work item result</returns>
-        public IWorkItemResult QueueWorkItem(WorkItemCallback callback, object state, WorkItemPriority workItemPriority)
-        {
-            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, _workItemsGroupStartInfo, callback, state, workItemPriority);
-            EnqueueToSTPNextWorkItem(workItem);
-            return workItem.GetWorkItemResult();
-        }
-
-        /// <summary>
-        /// Queue a work item
-        /// </summary>
-        /// <param name="workItemInfo">Work item information</param>
-        /// <param name="callback">A callback to execute</param>
-        /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
-        /// </param>
-        /// <returns>Returns a work item result</returns>
-        public IWorkItemResult QueueWorkItem(WorkItemInfo workItemInfo, WorkItemCallback callback, object state)
-        {
-            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, _workItemsGroupStartInfo, workItemInfo, callback, state);
-            EnqueueToSTPNextWorkItem(workItem);
-            return workItem.GetWorkItemResult();
-        }
-
-        /// <summary>
-        /// Queue a work item
-        /// </summary>
-        /// <param name="callback">A callback to execute</param>
-        /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
-        /// </param>
-        /// <param name="postExecuteWorkItemCallback">
-        /// A delegate to call after the callback completion
-        /// </param>
-        /// <returns>Returns a work item result</returns>
-        public IWorkItemResult QueueWorkItem(
-            WorkItemCallback callback, 
-            object state,
-            PostExecuteWorkItemCallback postExecuteWorkItemCallback)
-        {
-            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, _workItemsGroupStartInfo, callback, state, postExecuteWorkItemCallback);
-            EnqueueToSTPNextWorkItem(workItem);
-            return workItem.GetWorkItemResult();
-        }
-
-        /// <summary>
-        /// Queue a work item
-        /// </summary>
-        /// <param name="callback">A callback to execute</param>
-        /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
-        /// </param>
-        /// <param name="postExecuteWorkItemCallback">
-        /// A delegate to call after the callback completion
-        /// </param>
-        /// <param name="workItemPriority">The work item priority</param>
-        /// <returns>Returns a work item result</returns>
-        public IWorkItemResult QueueWorkItem(
-            WorkItemCallback callback, 
-            object state,
-            PostExecuteWorkItemCallback postExecuteWorkItemCallback,
-            WorkItemPriority workItemPriority)
-        {
-            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, _workItemsGroupStartInfo, callback, state, postExecuteWorkItemCallback, workItemPriority);
-            EnqueueToSTPNextWorkItem(workItem);
-            return workItem.GetWorkItemResult();
-        }
-
-        /// <summary>
-        /// Queue a work item
-        /// </summary>
-        /// <param name="callback">A callback to execute</param>
-        /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
-        /// </param>
-        /// <param name="postExecuteWorkItemCallback">
-        /// A delegate to call after the callback completion
-        /// </param>
-        /// <param name="callToPostExecute">Indicates on which cases to call to the post execute callback</param>
-        /// <returns>Returns a work item result</returns>
-        public IWorkItemResult QueueWorkItem(
-            WorkItemCallback callback, 
-            object state,
-            PostExecuteWorkItemCallback postExecuteWorkItemCallback,
-            CallToPostExecute callToPostExecute)
-        {
-            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, _workItemsGroupStartInfo, callback, state, postExecuteWorkItemCallback, callToPostExecute);
-            EnqueueToSTPNextWorkItem(workItem);
-            return workItem.GetWorkItemResult();
+                int diff = value - _concurrency;
+                _concurrency = value;
+                if (diff > 0)
+                {
+                    EnqueueToSTPNextNWorkItem(diff);
+                }
+            }
         }
 
-        /// <summary>
-        /// Queue a work item
-        /// </summary>
-        /// <param name="callback">A callback to execute</param>
-        /// <param name="state">
-        /// The context object of the work item. Used for passing arguments to the work item. 
-        /// </param>
-        /// <param name="postExecuteWorkItemCallback">
-        /// A delegate to call after the callback completion
-        /// </param>
-        /// <param name="callToPostExecute">Indicates on which cases to call to the post execute callback</param>
-        /// <param name="workItemPriority">The work item priority</param>
-        /// <returns>Returns a work item result</returns>
-        public IWorkItemResult QueueWorkItem(
-            WorkItemCallback callback, 
-            object state,
-            PostExecuteWorkItemCallback postExecuteWorkItemCallback,
-            CallToPostExecute callToPostExecute,
-            WorkItemPriority workItemPriority)
+        public override int WaitingCallbacks
         {
-            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, _workItemsGroupStartInfo, callback, state, postExecuteWorkItemCallback, callToPostExecute, workItemPriority);
-            EnqueueToSTPNextWorkItem(workItem);
-            return workItem.GetWorkItemResult();
+            get { return _workItemsQueue.Count; }
         }
 
-        /// <summary>
-        /// Wait for the thread pool to be idle
-        /// </summary>
-        public void WaitForIdle()
+        public override object[] GetStates()
         {
-            WaitForIdle(Timeout.Infinite);
+            lock (_lock)
+            {
+                object[] states = new object[_workItemsQueue.Count];
+                int i = 0;
+                foreach (WorkItem workItem in _workItemsQueue)
+                {
+                    states[i] = workItem.GetWorkItemResult().State;
+                    ++i;
+                }
+                return states;
+            }
         }
 
-        /// <summary>
-        /// Wait for the thread pool to be idle
+            /// <summary>
+        /// WorkItemsGroup start information
         /// </summary>
-        public bool WaitForIdle(TimeSpan timeout)
+        public override WIGStartInfo WIGStartInfo
         {
-            return WaitForIdle((int)timeout.TotalMilliseconds);
+            get { return _workItemsGroupStartInfo; }
         }
 
-        /// <summary>
+            /// <summary>
+            /// Start the Work Items Group if it was started suspended
+            /// </summary>
+            public override void Start()
+            {
+                // If the Work Items Group already started then quit
+                if (!_isSuspended)
+                {
+                    return;
+                }
+                _isSuspended = false;
+            
+                EnqueueToSTPNextNWorkItem(Math.Min(_workItemsQueue.Count, _concurrency));
+            }
+
+            public override void Cancel(bool abortExecution)
+            {
+                lock (_lock)
+                {
+                    _canceledWorkItemsGroup.IsCanceled = true;
+                    _workItemsQueue.Clear();
+                    _workItemsInStpQueue = 0;
+                    _canceledWorkItemsGroup = new CanceledWorkItemsGroup();
+                }
+
+                if (abortExecution)
+                {
+                    _stp.CancelAbortWorkItemsGroup(this);
+                }
+            }
+
+            /// <summary>
         /// Wait for the thread pool to be idle
         /// </summary>
-        public bool WaitForIdle(int millisecondsTimeout)
+        public override bool WaitForIdle(int millisecondsTimeout)
         {
-            _stp.ValidateWorkItemsGroupWaitForIdle(this);
-            return _isIdleWaitHandle.WaitOne(millisecondsTimeout, false);
+            SmartThreadPool.ValidateWorkItemsGroupWaitForIdle(this);
+            return STPEventWaitHandle.WaitOne(_isIdleWaitHandle, millisecondsTimeout, false);
         }
 
-        public int WaitingCallbacks
-        {
-            get
-            {
-                return _workItemsQueue.Count;
-            }
-        }
+            public override event WorkItemsGroupIdleHandler OnIdle
+                {
+                        add { _onIdle += value; }
+                        remove { _onIdle -= value; }
+                }
 
-        public event WorkItemsGroupIdleHandler OnIdle
-        {
-            add
-            {
-                _onIdle += value;
-            }
-            remove
-            {
-                _onIdle -= value;
-            }
-        }
+            #endregion 
 
-        public void Cancel()
-        {
-            lock(_lock)
-            {
-                _canceledWorkItemsGroup.IsCanceled = true;
-                _workItemsQueue.Clear();
-                _workItemsInStpQueue = 0;
-                _canceledWorkItemsGroup = new CanceledWorkItemsGroup();
-            }
-        }
+                #region Private methods
 
-        public void Start()
-        {
-            lock (this)
-            {
-                if (!_workItemsGroupStartInfo.StartSuspended)
-                {
-                    return;
-                }
-                _workItemsGroupStartInfo.StartSuspended = false;
-            }
-            
-            for(int i = 0; i < _concurrency; ++i)
-            {
-                EnqueueToSTPNextWorkItem(null, false);
-            }
-        }
-
-        #endregion 
+            private void RegisterToWorkItemCompletion(IWorkItemResult wir)
+                {
+                        IInternalWorkItemResult iwir = (IInternalWorkItemResult)wir;
+                        iwir.OnWorkItemStarted += OnWorkItemStartedCallback;
+                        iwir.OnWorkItemCompleted += OnWorkItemCompletedCallback;
+                }
 
-        #region Private methods
-
-        private void RegisterToWorkItemCompletion(IWorkItemResult wir)
-        {
-            IInternalWorkItemResult iwir = wir as IInternalWorkItemResult;
-            iwir.OnWorkItemStarted += new WorkItemStateCallback(OnWorkItemStartedCallback);
-            iwir.OnWorkItemCompleted += new WorkItemStateCallback(OnWorkItemCompletedCallback);
-        }
-
-        public void OnSTPIsStarting()
-        {
-            lock (this)
-            {
-                if (_workItemsGroupStartInfo.StartSuspended)
-                {
-                    return;
-                }
-            }
-            
-            for(int i = 0; i < _concurrency; ++i)
-            {
-                EnqueueToSTPNextWorkItem(null, false);
-            }
-        }
-
-        private object FireOnIdle(object state)
-        {
-            FireOnIdleImpl(_onIdle);
-            return null;
-        }
-
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        private void FireOnIdleImpl(WorkItemsGroupIdleHandler onIdle)
-        {
-            if(null == onIdle)
+            public void OnSTPIsStarting()
+                {
+            if (_isSuspended)
             {
                 return;
             }
+                        
+            EnqueueToSTPNextNWorkItem(_concurrency);
+                }
 
-            Delegate[] delegates = onIdle.GetInvocationList();
-            foreach(WorkItemsGroupIdleHandler eh in delegates)
-            {
-                try
-                {
-                    eh(this);
-                }
-                    // Ignore exceptions
-                catch{} 
-            }
-        }
-
-        private void OnWorkItemStartedCallback(WorkItem workItem)
+            public void EnqueueToSTPNextNWorkItem(int count)
         {
-            lock(_lock)
+            for (int i = 0; i < count; ++i)
             {
-                ++_workItemsExecutingInStp;
+                EnqueueToSTPNextWorkItem(null, false);
             }
         }
 
-        private void OnWorkItemCompletedCallback(WorkItem workItem)
-        {
-            EnqueueToSTPNextWorkItem(null, true);
-        }
-
-        private void EnqueueToSTPNextWorkItem(WorkItem workItem)
+                private object FireOnIdle(object state)
+                {
+                        FireOnIdleImpl(_onIdle);
+                        return null;
+                }
+
+                [MethodImpl(MethodImplOptions.NoInlining)]
+                private void FireOnIdleImpl(WorkItemsGroupIdleHandler onIdle)
+                {
+                        if(null == onIdle)
+                        {
+                                return;
+                        }
+
+                        Delegate[] delegates = onIdle.GetInvocationList();
+                        foreach(WorkItemsGroupIdleHandler eh in delegates)
+                        {
+                                try
+                                {
+                                        eh(this);
+                                }
+                catch { }  // Suppress exceptions
+                        }
+                }
+
+                private void OnWorkItemStartedCallback(WorkItem workItem)
+                {
+                        lock(_lock)
+                        {
+                                ++_workItemsExecutingInStp;
+                        }
+                }
+
+                private void OnWorkItemCompletedCallback(WorkItem workItem)
+                {
+                        EnqueueToSTPNextWorkItem(null, true);
+                }
+
+        internal override void Enqueue(WorkItem workItem)
         {
-            EnqueueToSTPNextWorkItem(workItem, false);
+            EnqueueToSTPNextWorkItem(workItem);
         }
 
-        private void EnqueueToSTPNextWorkItem(WorkItem workItem, bool decrementWorkItemsInStpQueue)
-        {
-            lock(_lock)
-            {
-                // Got here from OnWorkItemCompletedCallback()
-                if (decrementWorkItemsInStpQueue)
-                {
-                    --_workItemsInStpQueue;
-
-                    if(_workItemsInStpQueue < 0)
-                    {
-                        _workItemsInStpQueue = 0;
-                    }
-
-                    --_workItemsExecutingInStp;
-
-                    if(_workItemsExecutingInStp < 0)
-                    {
-                        _workItemsExecutingInStp = 0;
-                    }
-                }
-
-                // If the work item is not null then enqueue it
-                if (null != workItem)
-                {
-                    workItem.CanceledWorkItemsGroup = _canceledWorkItemsGroup;
-
-                    RegisterToWorkItemCompletion(workItem.GetWorkItemResult());
-                    _workItemsQueue.Enqueue(workItem);
-                    //_stp.IncrementWorkItemsCount();
-
-                    if ((1 == _workItemsQueue.Count) && 
-                        (0 == _workItemsInStpQueue))
-                    {
-                        _stp.RegisterWorkItemsGroup(this);
-                        Trace.WriteLine("WorkItemsGroup " + Name + " is NOT idle");
+            private void EnqueueToSTPNextWorkItem(WorkItem workItem)
+                {
+                        EnqueueToSTPNextWorkItem(workItem, false);
+                }
+
+                private void EnqueueToSTPNextWorkItem(WorkItem workItem, bool decrementWorkItemsInStpQueue)
+                {
+                        lock(_lock)
+                        {
+                                // Got here from OnWorkItemCompletedCallback()
+                                if (decrementWorkItemsInStpQueue)
+                                {
+                                        --_workItemsInStpQueue;
+
+                                        if(_workItemsInStpQueue < 0)
+                                        {
+                                                _workItemsInStpQueue = 0;
+                                        }
+
+                                        --_workItemsExecutingInStp;
+
+                                        if(_workItemsExecutingInStp < 0)
+                                        {
+                                                _workItemsExecutingInStp = 0;
+                                        }
+                                }
+
+                                // If the work item is not null then enqueue it
+                                if (null != workItem)
+                                {
+                                        workItem.CanceledWorkItemsGroup = _canceledWorkItemsGroup;
+
+                                        RegisterToWorkItemCompletion(workItem.GetWorkItemResult());
+                                        _workItemsQueue.Enqueue(workItem);
+                                        //_stp.IncrementWorkItemsCount();
+
+                                        if ((1 == _workItemsQueue.Count) && 
+                                                (0 == _workItemsInStpQueue))
+                                        {
+                                                _stp.RegisterWorkItemsGroup(this);
+                        IsIdle = false;
                         _isIdleWaitHandle.Reset();
-                    }
-                }
-
-                // If the work items queue of the group is empty than quit
-                if (0 == _workItemsQueue.Count)
-                {
-                    if (0 == _workItemsInStpQueue)
-                    {
-                        _stp.UnregisterWorkItemsGroup(this);
-                        Trace.WriteLine("WorkItemsGroup " + Name + " is idle");
+                                        }
+                                }
+
+                                // If the work items queue of the group is empty than quit
+                                if (0 == _workItemsQueue.Count)
+                                {
+                                        if (0 == _workItemsInStpQueue)
+                                        {
+                                                _stp.UnregisterWorkItemsGroup(this);
+                        IsIdle = true;
                         _isIdleWaitHandle.Set();
-                        _stp.QueueWorkItem(new WorkItemCallback(this.FireOnIdle));
-                    }
-                    return;
-                }
-
-                if (!_workItemsGroupStartInfo.StartSuspended)
-                {
-                    if (_workItemsInStpQueue < _concurrency)
-                    {
-                        WorkItem nextWorkItem = _workItemsQueue.Dequeue() as WorkItem;
-                        _stp.Enqueue(nextWorkItem, true);
-                        ++_workItemsInStpQueue;
-                    }
-                }
-            }
-        }
-
-        #endregion
+                        if (decrementWorkItemsInStpQueue && _onIdle != null && _onIdle.GetInvocationList().Length > 0)
+                        {
+                            _stp.QueueWorkItem(new WorkItemCallback(FireOnIdle));
+                        }
+                                        }
+                                        return;
+                                }
+
+                if (!_isSuspended)
+                                {
+                                        if (_workItemsInStpQueue < _concurrency)
+                                        {
+                                                WorkItem nextWorkItem = _workItemsQueue.Dequeue() as WorkItem;
+                        try
+                        {
+                            _stp.Enqueue(nextWorkItem);
+                        }
+                        catch (ObjectDisposedException e)
+                        {
+                            e.GetHashCode();
+                            // The STP has been shutdown
+                        }
+
+                                                ++_workItemsInStpQueue;
+                                        }
+                                }
+                        }
+                }
+
+                #endregion
     }
 
-    #endregion
+        #endregion
 }
diff --git a/ThirdParty/SmartThreadPool/WorkItemsGroupBase.cs b/ThirdParty/SmartThreadPool/WorkItemsGroupBase.cs
new file mode 100644
index 0000000..27fae5e
--- /dev/null
+++ b/ThirdParty/SmartThreadPool/WorkItemsGroupBase.cs
@@ -0,0 +1,471 @@
+using System;
+using System.Threading;
+
+namespace Amib.Threading.Internal
+{
+    public abstract class WorkItemsGroupBase : IWorkItemsGroup
+    {
+        #region Private Fields
+
+        /// <summary>
+        /// Contains the name of this instance of SmartThreadPool.
+        /// Can be changed by the user.
+        /// </summary>
+        private string _name = "WorkItemsGroupBase";
+
+        public WorkItemsGroupBase()
+        {
+            IsIdle = true;
+        }
+
+        #endregion
+
+        #region IWorkItemsGroup Members
+
+        #region Public Methods
+
+        /// <summary>
+        /// Get/Set the name of the SmartThreadPool/WorkItemsGroup instance
+        /// </summary>
+        public string Name
+        {
+            get { return _name; }
+            set { _name = value; }
+        }
+
+        #endregion
+
+        #region Abstract Methods
+
+        public abstract int Concurrency { get; set; }
+        public abstract int WaitingCallbacks { get; }
+        public abstract object[] GetStates();
+        public abstract WIGStartInfo WIGStartInfo { get; }
+        public abstract void Start();
+        public abstract void Cancel(bool abortExecution);
+        public abstract bool WaitForIdle(int millisecondsTimeout);
+        public abstract event WorkItemsGroupIdleHandler OnIdle;
+
+        internal abstract void Enqueue(WorkItem workItem);
+        internal virtual void PreQueueWorkItem() { }
+
+        #endregion
+
+        #region Common Base Methods
+
+        /// <summary>
+        /// Cancel all the work items.
+        /// Same as Cancel(false)
+        /// </summary>
+        public virtual void Cancel()
+        {
+            Cancel(false);
+        }
+
+        /// <summary>
+        /// Wait for the SmartThreadPool/WorkItemsGroup to be idle
+        /// </summary>
+        public void WaitForIdle()
+        {
+            WaitForIdle(Timeout.Infinite);
+        }
+
+        /// <summary>
+        /// Wait for the SmartThreadPool/WorkItemsGroup to be idle
+        /// </summary>
+        public bool WaitForIdle(TimeSpan timeout)
+        {
+            return WaitForIdle((int)timeout.TotalMilliseconds);
+        }
+
+        /// <summary>
+        /// IsIdle is true when there are no work items running or queued.
+        /// </summary>
+        public bool IsIdle { get; protected set; }
+
+        #endregion
+
+        #region QueueWorkItem
+
+        /// <summary>
+        /// Queue a work item
+        /// </summary>
+        /// <param name="callback">A callback to execute</param>
+        /// <returns>Returns a work item result</returns>
+        public IWorkItemResult QueueWorkItem(WorkItemCallback callback)
+        {
+            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, WIGStartInfo, callback);
+            Enqueue(workItem);
+            return workItem.GetWorkItemResult();
+        }
+
+        /// <summary>
+        /// Queue a work item
+        /// </summary>
+        /// <param name="callback">A callback to execute</param>
+        /// <param name="workItemPriority">The priority of the work item</param>
+        /// <returns>Returns a work item result</returns>
+        public IWorkItemResult QueueWorkItem(WorkItemCallback callback, WorkItemPriority workItemPriority)
+        {
+            PreQueueWorkItem();
+            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, WIGStartInfo, callback, workItemPriority);
+            Enqueue(workItem);
+            return workItem.GetWorkItemResult();
+        }
+
+        /// <summary>
+        /// Queue a work item
+        /// </summary>
+        /// <param name="workItemInfo">Work item info</param>
+        /// <param name="callback">A callback to execute</param>
+        /// <returns>Returns a work item result</returns>
+        public IWorkItemResult QueueWorkItem(WorkItemInfo workItemInfo, WorkItemCallback callback)
+        {
+            PreQueueWorkItem();
+            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, WIGStartInfo, workItemInfo, callback);
+            Enqueue(workItem);
+            return workItem.GetWorkItemResult();
+        }
+
+        /// <summary>
+        /// Queue a work item
+        /// </summary>
+        /// <param name="callback">A callback to execute</param>
+        /// <param name="state">
+        /// The context object of the work item. Used for passing arguments to the work item. 
+        /// </param>
+        /// <returns>Returns a work item result</returns>
+        public IWorkItemResult QueueWorkItem(WorkItemCallback callback, object state)
+        {
+            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, WIGStartInfo, callback, state);
+            Enqueue(workItem);
+            return workItem.GetWorkItemResult();
+        }
+
+        /// <summary>
+        /// Queue a work item
+        /// </summary>
+        /// <param name="callback">A callback to execute</param>
+        /// <param name="state">
+        /// The context object of the work item. Used for passing arguments to the work item. 
+        /// </param>
+        /// <param name="workItemPriority">The work item priority</param>
+        /// <returns>Returns a work item result</returns>
+        public IWorkItemResult QueueWorkItem(WorkItemCallback callback, object state, WorkItemPriority workItemPriority)
+        {
+            PreQueueWorkItem();
+            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, WIGStartInfo, callback, state, workItemPriority);
+            Enqueue(workItem);
+            return workItem.GetWorkItemResult();
+        }
+
+        /// <summary>
+        /// Queue a work item
+        /// </summary>
+        /// <param name="workItemInfo">Work item information</param>
+        /// <param name="callback">A callback to execute</param>
+        /// <param name="state">
+        /// The context object of the work item. Used for passing arguments to the work item. 
+        /// </param>
+        /// <returns>Returns a work item result</returns>
+        public IWorkItemResult QueueWorkItem(WorkItemInfo workItemInfo, WorkItemCallback callback, object state)
+        {
+            PreQueueWorkItem();
+            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, WIGStartInfo, workItemInfo, callback, state);
+            Enqueue(workItem);
+            return workItem.GetWorkItemResult();
+        }
+
+        /// <summary>
+        /// Queue a work item
+        /// </summary>
+        /// <param name="callback">A callback to execute</param>
+        /// <param name="state">
+        /// The context object of the work item. Used for passing arguments to the work item. 
+        /// </param>
+        /// <param name="postExecuteWorkItemCallback">
+        /// A delegate to call after the callback completion
+        /// </param>
+        /// <returns>Returns a work item result</returns>
+        public IWorkItemResult QueueWorkItem(
+            WorkItemCallback callback,
+            object state,
+            PostExecuteWorkItemCallback postExecuteWorkItemCallback)
+        {
+            PreQueueWorkItem();
+            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, WIGStartInfo, callback, state, postExecuteWorkItemCallback);
+            Enqueue(workItem);
+            return workItem.GetWorkItemResult();
+        }
+
+        /// <summary>
+        /// Queue a work item
+        /// </summary>
+        /// <param name="callback">A callback to execute</param>
+        /// <param name="state">
+        /// The context object of the work item. Used for passing arguments to the work item. 
+        /// </param>
+        /// <param name="postExecuteWorkItemCallback">
+        /// A delegate to call after the callback completion
+        /// </param>
+        /// <param name="workItemPriority">The work item priority</param>
+        /// <returns>Returns a work item result</returns>
+        public IWorkItemResult QueueWorkItem(
+            WorkItemCallback callback,
+            object state,
+            PostExecuteWorkItemCallback postExecuteWorkItemCallback,
+            WorkItemPriority workItemPriority)
+        {
+            PreQueueWorkItem();
+            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, WIGStartInfo, callback, state, postExecuteWorkItemCallback, workItemPriority);
+            Enqueue(workItem);
+            return workItem.GetWorkItemResult();
+        }
+
+        /// <summary>
+        /// Queue a work item
+        /// </summary>
+        /// <param name="callback">A callback to execute</param>
+        /// <param name="state">
+        /// The context object of the work item. Used for passing arguments to the work item. 
+        /// </param>
+        /// <param name="postExecuteWorkItemCallback">
+        /// A delegate to call after the callback completion
+        /// </param>
+        /// <param name="callToPostExecute">Indicates on which cases to call to the post execute callback</param>
+        /// <returns>Returns a work item result</returns>
+        public IWorkItemResult QueueWorkItem(
+            WorkItemCallback callback,
+            object state,
+            PostExecuteWorkItemCallback postExecuteWorkItemCallback,
+            CallToPostExecute callToPostExecute)
+        {
+            PreQueueWorkItem();
+            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, WIGStartInfo, callback, state, postExecuteWorkItemCallback, callToPostExecute);
+            Enqueue(workItem);
+            return workItem.GetWorkItemResult();
+        }
+
+        /// <summary>
+        /// Queue a work item
+        /// </summary>
+        /// <param name="callback">A callback to execute</param>
+        /// <param name="state">
+        /// The context object of the work item. Used for passing arguments to the work item. 
+        /// </param>
+        /// <param name="postExecuteWorkItemCallback">
+        /// A delegate to call after the callback completion
+        /// </param>
+        /// <param name="callToPostExecute">Indicates on which cases to call to the post execute callback</param>
+        /// <param name="workItemPriority">The work item priority</param>
+        /// <returns>Returns a work item result</returns>
+        public IWorkItemResult QueueWorkItem(
+            WorkItemCallback callback,
+            object state,
+            PostExecuteWorkItemCallback postExecuteWorkItemCallback,
+            CallToPostExecute callToPostExecute,
+            WorkItemPriority workItemPriority)
+        {
+            PreQueueWorkItem();
+            WorkItem workItem = WorkItemFactory.CreateWorkItem(this, WIGStartInfo, callback, state, postExecuteWorkItemCallback, callToPostExecute, workItemPriority);
+            Enqueue(workItem);
+            return workItem.GetWorkItemResult();
+        }
+
+        #endregion
+
+        #region QueueWorkItem(Action<...>)
+
+        public IWorkItemResult QueueWorkItem(Action action)
+        {
+            return QueueWorkItem (action, SmartThreadPool.DefaultWorkItemPriority);
+        }
+
+        public IWorkItemResult QueueWorkItem (Action action, WorkItemPriority priority)
+        {
+            PreQueueWorkItem ();
+            WorkItem workItem = WorkItemFactory.CreateWorkItem (
+                this,
+                WIGStartInfo,
+                delegate
+                {
+                    action.Invoke ();
+                    return null;
+                }, priority);
+            Enqueue (workItem);
+            return workItem.GetWorkItemResult ();
+        }
+
+        public IWorkItemResult QueueWorkItem<T>(Action<T> action, T arg)
+        {
+            return QueueWorkItem<T> (action, arg, SmartThreadPool.DefaultWorkItemPriority);
+        }
+
+        public IWorkItemResult QueueWorkItem<T> (Action<T> action, T arg, WorkItemPriority priority)
+        {
+            PreQueueWorkItem ();
+            WorkItem workItem = WorkItemFactory.CreateWorkItem (
+                this,
+                WIGStartInfo,
+                state =>
+                {
+                    action.Invoke (arg);
+                    return null;
+                },
+                WIGStartInfo.FillStateWithArgs ? new object[] { arg } : null, priority);
+            Enqueue (workItem);
+            return workItem.GetWorkItemResult ();
+        }
+
+        public IWorkItemResult QueueWorkItem<T1, T2>(Action<T1, T2> action, T1 arg1, T2 arg2)
+        {
+            return QueueWorkItem<T1, T2> (action, arg1, arg2, SmartThreadPool.DefaultWorkItemPriority);
+        }
+
+        public IWorkItemResult QueueWorkItem<T1, T2> (Action<T1, T2> action, T1 arg1, T2 arg2, WorkItemPriority priority)
+        {
+            PreQueueWorkItem ();
+            WorkItem workItem = WorkItemFactory.CreateWorkItem (
+                this,
+                WIGStartInfo,
+                state =>
+                {
+                    action.Invoke (arg1, arg2);
+                    return null;
+                },
+                WIGStartInfo.FillStateWithArgs ? new object[] { arg1, arg2 } : null, priority);
+            Enqueue (workItem);
+            return workItem.GetWorkItemResult ();
+        }
+
+        public IWorkItemResult QueueWorkItem<T1, T2, T3>(Action<T1, T2, T3> action, T1 arg1, T2 arg2, T3 arg3)
+        {
+            return QueueWorkItem<T1, T2, T3> (action, arg1, arg2, arg3, SmartThreadPool.DefaultWorkItemPriority);
+            ;
+        }
+
+        public IWorkItemResult QueueWorkItem<T1, T2, T3> (Action<T1, T2, T3> action, T1 arg1, T2 arg2, T3 arg3, WorkItemPriority priority)
+        {
+            PreQueueWorkItem ();
+            WorkItem workItem = WorkItemFactory.CreateWorkItem (
+                this,
+                WIGStartInfo,
+                state =>
+                {
+                    action.Invoke (arg1, arg2, arg3);
+                    return null;
+                },
+                WIGStartInfo.FillStateWithArgs ? new object[] { arg1, arg2, arg3 } : null, priority);
+            Enqueue (workItem);
+            return workItem.GetWorkItemResult ();
+        }
+
+        public IWorkItemResult QueueWorkItem<T1, T2, T3, T4>(
+            Action<T1, T2, T3, T4> action, T1 arg1, T2 arg2, T3 arg3, T4 arg4)
+        {
+            return QueueWorkItem<T1, T2, T3, T4> (action, arg1, arg2, arg3, arg4,
+                                                  SmartThreadPool.DefaultWorkItemPriority);
+        }
+
+        public IWorkItemResult QueueWorkItem<T1, T2, T3, T4> (
+            Action<T1, T2, T3, T4> action, T1 arg1, T2 arg2, T3 arg3, T4 arg4, WorkItemPriority priority)
+        {
+            PreQueueWorkItem ();
+            WorkItem workItem = WorkItemFactory.CreateWorkItem (
+                           this,
+                           WIGStartInfo,
+                           state =>
+                           {
+                               action.Invoke (arg1, arg2, arg3, arg4);
+                               return null;
+                           },
+                           WIGStartInfo.FillStateWithArgs ? new object[] { arg1, arg2, arg3, arg4 } : null, priority);
+            Enqueue (workItem);
+            return workItem.GetWorkItemResult ();
+        }
+
+        #endregion
+
+        #region QueueWorkItem(Func<...>)
+
+        public IWorkItemResult<TResult> QueueWorkItem<TResult>(Func<TResult> func)
+        {
+            PreQueueWorkItem();
+            WorkItem workItem = WorkItemFactory.CreateWorkItem(
+                            this,
+                            WIGStartInfo,
+                            state =>
+                            {
+                                return func.Invoke();
+                            });
+            Enqueue(workItem);
+            return new WorkItemResultTWrapper<TResult>(workItem.GetWorkItemResult());
+        }
+
+        public IWorkItemResult<TResult> QueueWorkItem<T, TResult>(Func<T, TResult> func, T arg)
+        {
+            PreQueueWorkItem();
+            WorkItem workItem = WorkItemFactory.CreateWorkItem(
+                this,
+                WIGStartInfo,
+                state =>
+                {
+                    return func.Invoke(arg);
+                },
+                WIGStartInfo.FillStateWithArgs ? new object[] { arg } : null);
+            Enqueue(workItem);
+            return new WorkItemResultTWrapper<TResult>(workItem.GetWorkItemResult());
+        }
+
+        public IWorkItemResult<TResult> QueueWorkItem<T1, T2, TResult>(Func<T1, T2, TResult> func, T1 arg1, T2 arg2)
+        {
+            PreQueueWorkItem();
+            WorkItem workItem = WorkItemFactory.CreateWorkItem(
+                            this,
+                            WIGStartInfo,
+                            state =>
+                            {
+                                return func.Invoke(arg1, arg2);
+                            },
+                           WIGStartInfo.FillStateWithArgs ? new object[] { arg1, arg2 } : null);
+            Enqueue(workItem);
+            return new WorkItemResultTWrapper<TResult>(workItem.GetWorkItemResult());
+        }
+
+        public IWorkItemResult<TResult> QueueWorkItem<T1, T2, T3, TResult>(
+            Func<T1, T2, T3, TResult> func, T1 arg1, T2 arg2, T3 arg3)
+        {
+            PreQueueWorkItem();
+            WorkItem workItem = WorkItemFactory.CreateWorkItem(
+                            this,
+                            WIGStartInfo,
+                            state =>
+                            {
+                                return func.Invoke(arg1, arg2, arg3);
+                            },
+                           WIGStartInfo.FillStateWithArgs ? new object[] { arg1, arg2, arg3 } : null);
+            Enqueue(workItem);
+            return new WorkItemResultTWrapper<TResult>(workItem.GetWorkItemResult());
+        }
+
+        public IWorkItemResult<TResult> QueueWorkItem<T1, T2, T3, T4, TResult>(
+            Func<T1, T2, T3, T4, TResult> func, T1 arg1, T2 arg2, T3 arg3, T4 arg4)
+        {
+            PreQueueWorkItem();
+            WorkItem workItem = WorkItemFactory.CreateWorkItem(
+                            this,
+                            WIGStartInfo,
+                            state =>
+                            {
+                                return func.Invoke(arg1, arg2, arg3, arg4);
+                            },
+                           WIGStartInfo.FillStateWithArgs ? new object[] { arg1, arg2, arg3, arg4 } : null);
+            Enqueue(workItem);
+            return new WorkItemResultTWrapper<TResult>(workItem.GetWorkItemResult());
+        }
+
+        #endregion
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/ThirdParty/SmartThreadPool/WorkItemsQueue.cs b/ThirdParty/SmartThreadPool/WorkItemsQueue.cs
index af5af07..e0bc916 100644
--- a/ThirdParty/SmartThreadPool/WorkItemsQueue.cs
+++ b/ThirdParty/SmartThreadPool/WorkItemsQueue.cs
@@ -1,109 +1,151 @@
-// Ami Bar
-// amibar@gmail.com
-
 using System;
+using System.Collections.Generic;
 using System.Threading;
 
 namespace Amib.Threading.Internal
 {
-    #region WorkItemsQueue class
-
-    /// <summary>
-    /// WorkItemsQueue class.
-    /// </summary>
-    public class WorkItemsQueue : IDisposable
-    {
-        #region Member variables
-
-        /// <summary>
-        /// Waiters queue (implemented as stack).
-        /// </summary>
-        private WaiterEntry _headWaiterEntry = new WaiterEntry();
-
-        /// <summary>
-        /// Waiters count
-        /// </summary>
-        private int _waitersCount = 0;
-
-        /// <summary>
-        /// Work items queue
-        /// </summary>
-        private PriorityQueue _workItems = new PriorityQueue();
+        #region WorkItemsQueue class
+
+        /// <summary>
+        /// WorkItemsQueue class.
+        /// </summary>
+        public class WorkItemsQueue : IDisposable
+        {
+                #region Member variables
+
+                /// <summary>
+                /// Waiters queue (implemented as stack).
+                /// </summary>
+                private readonly WaiterEntry _headWaiterEntry = new WaiterEntry();
+
+                /// <summary>
+                /// Waiters count
+                /// </summary>
+                private int _waitersCount = 0;
+
+                /// <summary>
+                /// Work items queue
+                /// </summary>
+                private readonly PriorityQueue _workItems = new PriorityQueue();
 
         /// <summary>
         /// Indicate that work items are allowed to be queued
         /// </summary>
         private bool _isWorkItemsQueueActive = true;
 
-        /// <summary>
-        /// Each thread in the thread pool keeps its own waiter entry.
-        /// </summary>
-        [ThreadStatic]
-        private static WaiterEntry _waiterEntry;
 
-        /// <summary>
-        /// A flag that indicates if the WorkItemsQueue has been disposed.
-        /// </summary>
-        private bool _isDisposed = false;
+#if (WINDOWS_PHONE) 
+        private static readonly Dictionary<int, WaiterEntry> _waiterEntries = new Dictionary<int, WaiterEntry>();
+#elif (_WINDOWS_CE)
+        private static LocalDataStoreSlot _waiterEntrySlot = Thread.AllocateDataSlot();
+#else
 
-        #endregion
+        [ThreadStatic]
+        private static WaiterEntry _waiterEntry;
+#endif
 
-        #region Public properties
 
         /// <summary>
-        /// Returns the current number of work items in the queue
+        /// Each thread in the thread pool keeps its own waiter entry.
         /// </summary>
-        public int Count
+        private static WaiterEntry CurrentWaiterEntry
         {
+#if (WINDOWS_PHONE) 
             get
             {
-                lock(this)
+                lock (_waiterEntries)
                 {
-                    ValidateNotDisposed();
-                    return _workItems.Count;
+                    WaiterEntry waiterEntry;
+                    if (_waiterEntries.TryGetValue(Thread.CurrentThread.ManagedThreadId, out waiterEntry))
+                    {
+                        return waiterEntry;
+                    }
                 }
+                return null;
             }
-        }
-
-        /// <summary>
-        /// Returns the current number of waiters
-        /// </summary>
-        public int WaitersCount
-        {
-            get
+            set
             {
-                lock(this)
+                lock (_waiterEntries)
                 {
-                    ValidateNotDisposed();
-                    return _waitersCount;
+                    _waiterEntries[Thread.CurrentThread.ManagedThreadId] = value;
                 }
             }
+#elif (_WINDOWS_CE)
+            get
+            {
+                return Thread.GetData(_waiterEntrySlot) as WaiterEntry;
+            }
+            set
+            {
+                Thread.SetData(_waiterEntrySlot, value);
+            }
+#else
+            get
+            {
+                return _waiterEntry;
+            }
+            set
+            {
+                _waiterEntry = value;
+            }
+#endif
         }
 
+        /// <summary>
+                /// A flag that indicates if the WorkItemsQueue has been disposed.
+                /// </summary>
+        private bool _isDisposed = false;
 
-        #endregion
+                #endregion
 
-        #region Public methods
+                #region Public properties
 
         /// <summary>
-        /// Enqueue a work item to the queue.
+        /// Returns the current number of work items in the queue
         /// </summary>
-        public bool EnqueueWorkItem(WorkItem workItem)
-        {
-            // A work item cannot be null, since null is used in the
-            // WaitForWorkItem() method to indicate timeout or cancel
-            if (null == workItem)
-            {
-                throw new ArgumentNullException("workItem" , "workItem cannot be null");
-            }
+                public int Count
+                {
+                        get
+                        {
+                return _workItems.Count;
+                        }
+                }
+
+                /// <summary>
+                /// Returns the current number of waiters
+                /// </summary>
+                public int WaitersCount
+                {
+                        get
+                        {
+                                return _waitersCount;
+                        }
+                }
 
-            bool enqueue = true;
 
-            // First check if there is a waiter waiting for work item. During 
-            // the check, timed out waiters are ignored. If there is no 
-            // waiter then the work item is queued.
-            lock(this)
-            {
+        #endregion
+
+        #region Public methods
+
+                /// <summary>
+                /// Enqueue a work item to the queue.
+                /// </summary>
+                public bool EnqueueWorkItem(WorkItem workItem)
+                {
+                        // A work item cannot be null, since null is used in the
+                        // WaitForWorkItem() method to indicate timeout or cancel
+                        if (null == workItem)
+                        {
+                                throw new ArgumentNullException("workItem" , "workItem cannot be null");
+                        }
+
+                        bool enqueue = true;
+
+                        // First check if there is a waiter waiting for work item. During 
+                        // the check, timed out waiters are ignored. If there is no 
+                        // waiter then the work item is queued.
+                        lock(this)
+                        {
                 ValidateNotDisposed();
 
                 if (!_isWorkItemsQueueActive)
@@ -111,56 +153,55 @@ namespace Amib.Threading.Internal
                     return false;
                 }
 
-                while(_waitersCount > 0)
-                {
-                    // Dequeue a waiter.
-                    WaiterEntry waiterEntry = PopWaiter();
-
-                    // Signal the waiter. On success break the loop
-                    if (waiterEntry.Signal(workItem))
-                    {
-                        enqueue = false;
-                        break;
-                    }
-                }
-
-                if (enqueue)
-                {
-                    // Enqueue the work item
-                    _workItems.Enqueue(workItem);
-                }
-            }
+                                while(_waitersCount > 0)
+                                {
+                                        // Dequeue a waiter.
+                                        WaiterEntry waiterEntry = PopWaiter();
+
+                                        // Signal the waiter. On success break the loop
+                                        if (waiterEntry.Signal(workItem))
+                                        {
+                                                enqueue = false;
+                                                break;
+                                        }
+                                }
+
+                                if (enqueue)
+                                {
+                                        // Enqueue the work item
+                                        _workItems.Enqueue(workItem);
+                                }
+                        }
             return true;
-        }
-
-
-        /// <summary>
-        /// Waits for a work item or exits on timeout or cancel
-        /// </summary>
-        /// <param name="millisecondsTimeout">Timeout in milliseconds</param>
-        /// <param name="cancelEvent">Cancel wait handle</param>
-        /// <returns>Returns true if the resource was granted</returns>
-        public WorkItem DequeueWorkItem(
-            int millisecondsTimeout, 
-            WaitHandle cancelEvent)
-        {
-            /// This method cause the caller to wait for a work item.
-            /// If there is at least one waiting work item then the 
-            /// method returns immidiately with true.
-            /// 
-            /// If there are no waiting work items then the caller 
-            /// is queued between other waiters for a work item to arrive.
-            /// 
-            /// If a work item didn't come within millisecondsTimeout or 
-            /// the user canceled the wait by signaling the cancelEvent 
-            /// then the method returns false to indicate that the caller 
-            /// didn't get a work item.
-
-            WaiterEntry waiterEntry = null;
-            WorkItem workItem = null;
-
-            lock(this)
-            {
+                }
+
+
+                /// <summary>
+                /// Waits for a work item or exits on timeout or cancel
+                /// </summary>
+                /// <param name="millisecondsTimeout">Timeout in milliseconds</param>
+                /// <param name="cancelEvent">Cancel wait handle</param>
+                /// <returns>Returns true if the resource was granted</returns>
+                public WorkItem DequeueWorkItem(
+                        int millisecondsTimeout, 
+                        WaitHandle cancelEvent)
+                {
+                        // This method cause the caller to wait for a work item.
+                        // If there is at least one waiting work item then the 
+                        // method returns immidiately with it.
+                        // 
+                        // If there are no waiting work items then the caller 
+                        // is queued between other waiters for a work item to arrive.
+                        // 
+                        // If a work item didn't come within millisecondsTimeout or 
+                        // the user canceled the wait by signaling the cancelEvent 
+                        // then the method returns null to indicate that the caller 
+                        // didn't get a work item.
+
+                        WaiterEntry waiterEntry;
+                        WorkItem workItem = null;
+                    lock (this)
+                    {
                 ValidateNotDisposed();
 
                 // If there are waiting work items then take one and return.
@@ -169,80 +210,79 @@ namespace Amib.Threading.Internal
                     workItem = _workItems.Dequeue() as WorkItem;
                     return workItem;
                 }
-                    // No waiting work items ...
-                else
-                {
-                    // Get the wait entry for the waiters queue
-                    waiterEntry = GetThreadWaiterEntry();
-
-                    // Put the waiter with the other waiters
-                    PushWaiter(waiterEntry);
-                }
-            }
-
-            // Prepare array of wait handle for the WaitHandle.WaitAny()
-            WaitHandle [] waitHandles = new WaitHandle [] { 
-                                                                waiterEntry.WaitHandle, 
-                                                                cancelEvent };
-
-            // Wait for an available resource, cancel event, or timeout.
 
-            // During the wait we are supposes to exit the synchronization 
-            // domain. (Placing true as the third argument of the WaitAny())
-            // It just doesn't work, I don't know why, so I have lock(this) 
-            // statments insted of one.
-
-            int index = WaitHandle.WaitAny(
-                waitHandles,
-                millisecondsTimeout, 
-                true);
-
-            lock(this)
-            {
-                // success is true if it got a work item.
-                bool success = (0 == index);
-
-                // The timeout variable is used only for readability.
-                // (We treat cancel as timeout)
-                bool timeout = !success;
-
-                // On timeout update the waiterEntry that it is timed out
-                if (timeout)
-                {
-                    // The Timeout() fails if the waiter has already been signaled
-                    timeout = waiterEntry.Timeout();
-
-                    // On timeout remove the waiter from the queue.
-                    // Note that the complexity is O(1).
-                    if(timeout)
-                    {
-                        RemoveWaiter(waiterEntry, false);
-                    }
-
-                    // Again readability
-                    success = !timeout;
-                }
-
-                // On success return the work item
-                if (success)
-                {
-                    workItem = waiterEntry.WorkItem;
-
-                    if (null == workItem)
-                    {
-                        workItem = _workItems.Dequeue() as WorkItem;
-                    }
-                }
-            }
-            // On failure return null.
-            return workItem;
-        }
+                // No waiting work items ...
+
+                // Get the waiter entry for the waiters queue
+                waiterEntry = GetThreadWaiterEntry();
+
+                // Put the waiter with the other waiters
+                PushWaiter(waiterEntry);
+                    }
+
+                    // Prepare array of wait handle for the WaitHandle.WaitAny()
+            WaitHandle [] waitHandles = new WaitHandle[] { 
+                                                                                                                                waiterEntry.WaitHandle, 
+                                                                                                                                cancelEvent };
+
+                        // Wait for an available resource, cancel event, or timeout.
+
+                        // During the wait we are supposes to exit the synchronization 
+                        // domain. (Placing true as the third argument of the WaitAny())
+                        // It just doesn't work, I don't know why, so I have two lock(this) 
+                        // statments instead of one.
+
+            int index = STPEventWaitHandle.WaitAny(
+                                waitHandles,
+                                millisecondsTimeout, 
+                                true);
+
+                        lock(this)
+                        {
+                                // success is true if it got a work item.
+                                bool success = (0 == index);
+
+                                // The timeout variable is used only for readability.
+                                // (We treat cancel as timeout)
+                                bool timeout = !success;
+
+                                // On timeout update the waiterEntry that it is timed out
+                                if (timeout)
+                                {
+                                        // The Timeout() fails if the waiter has already been signaled
+                                        timeout = waiterEntry.Timeout();
+
+                                        // On timeout remove the waiter from the queue.
+                                        // Note that the complexity is O(1).
+                                        if(timeout)
+                                        {
+                                                RemoveWaiter(waiterEntry, false);
+                                        }
+
+                                        // Again readability
+                                        success = !timeout;
+                                }
+
+                                // On success return the work item
+                                if (success)
+                                {
+                                        workItem = waiterEntry.WorkItem;
+
+                                        if (null == workItem)
+                                        {
+                                                workItem = _workItems.Dequeue() as WorkItem;
+                                        }
+                                }
+                        }
+                        // On failure return null.
+                        return workItem;
+                }
 
         /// <summary>
         /// Cleanup the work items queue, hence no more work 
         /// items are allowed to be queue
         /// </summary>
-        protected virtual void Cleanup()
+        private void Cleanup()
         {
             lock(this)
             {
@@ -271,301 +311,312 @@ namespace Amib.Threading.Internal
                 // Tell the waiters that they were timed out.
                 // It won't signal them to exit, but to ignore their
                 // next work item.
-                while(_waitersCount > 0)
-                {
-                    WaiterEntry waiterEntry = PopWaiter();
-                    waiterEntry.Timeout();
-                }
+                                while(_waitersCount > 0)
+                                {
+                                        WaiterEntry waiterEntry = PopWaiter();
+                                        waiterEntry.Timeout();
+                                }
             }
         }
 
-        #endregion
-
-        #region Private methods
-
-        /// <summary>
-        /// Returns the WaiterEntry of the current thread
-        /// </summary>
-        /// <returns></returns>
-        /// In order to avoid creation and destuction of WaiterEntry
-        /// objects each thread has its own WaiterEntry object.
-        private WaiterEntry GetThreadWaiterEntry()
+        public object[] GetStates()
         {
-            if (null == _waiterEntry)
+            lock (this)
             {
-                _waiterEntry = new WaiterEntry();
+                object[] states = new object[_workItems.Count];
+                int i = 0;
+                foreach (WorkItem workItem in _workItems)
+                {
+                    states[i] = workItem.GetWorkItemResult().State;
+                    ++i;
+                }
+                return states;
             }
-            _waiterEntry.Reset();
-            return _waiterEntry;
         }
 
-        #region Waiters stack methods
-
-        /// <summary>
-        /// Push a new waiter into the waiter's stack
-        /// </summary>
-        /// <param name="newWaiterEntry">A waiter to put in the stack</param>
-        public void PushWaiter(WaiterEntry newWaiterEntry)
-        {
-            // Remove the waiter if it is already in the stack and 
-            // update waiter's count as needed
-            RemoveWaiter(newWaiterEntry, false);
-
-            // If the stack is empty then newWaiterEntry is the new head of the stack 
-            if (null == _headWaiterEntry._nextWaiterEntry)
-            {
-                _headWaiterEntry._nextWaiterEntry = newWaiterEntry;
-                newWaiterEntry._prevWaiterEntry = _headWaiterEntry;
-
-            }
-            // If the stack is not empty then put newWaiterEntry as the new head 
-            // of the stack.
-            else
-            {
-                // Save the old first waiter entry
-                WaiterEntry oldFirstWaiterEntry = _headWaiterEntry._nextWaiterEntry;
+                #endregion
+
+                #region Private methods
+
+                /// <summary>
+                /// Returns the WaiterEntry of the current thread
+                /// </summary>
+                /// <returns></returns>
+                /// In order to avoid creation and destuction of WaiterEntry
+                /// objects each thread has its own WaiterEntry object.
+                private static WaiterEntry GetThreadWaiterEntry()
+                {
+                        if (null == CurrentWaiterEntry)
+                        {
+                                CurrentWaiterEntry = new WaiterEntry();
+                        }
+                        CurrentWaiterEntry.Reset();
+                        return CurrentWaiterEntry;
+                }
+
+                #region Waiters stack methods
+
+                /// <summary>
+                /// Push a new waiter into the waiter's stack
+                /// </summary>
+                /// <param name="newWaiterEntry">A waiter to put in the stack</param>
+                public void PushWaiter(WaiterEntry newWaiterEntry)
+                {
+                        // Remove the waiter if it is already in the stack and 
+                        // update waiter's count as needed
+                        RemoveWaiter(newWaiterEntry, false);
+
+                        // If the stack is empty then newWaiterEntry is the new head of the stack 
+                        if (null == _headWaiterEntry._nextWaiterEntry)
+                        {
+                                _headWaiterEntry._nextWaiterEntry = newWaiterEntry;
+                                newWaiterEntry._prevWaiterEntry = _headWaiterEntry;
+
+                        }
+                        // If the stack is not empty then put newWaiterEntry as the new head 
+                        // of the stack.
+                        else
+                        {
+                                // Save the old first waiter entry
+                                WaiterEntry oldFirstWaiterEntry = _headWaiterEntry._nextWaiterEntry;
 
                 // Update the links
-                _headWaiterEntry._nextWaiterEntry = newWaiterEntry;
-                newWaiterEntry._nextWaiterEntry = oldFirstWaiterEntry;
-                newWaiterEntry._prevWaiterEntry = _headWaiterEntry;
-                oldFirstWaiterEntry._prevWaiterEntry = newWaiterEntry;
-            }
-
-            // Increment the number of waiters
-            ++_waitersCount;
-        }
-
-        /// <summary>
-        /// Pop a waiter from the waiter's stack
-        /// </summary>
-        /// <returns>Returns the first waiter in the stack</returns>
-        private WaiterEntry PopWaiter()
-        {
-            // Store the current stack head
-            WaiterEntry oldFirstWaiterEntry = _headWaiterEntry._nextWaiterEntry;
-
-            // Store the new stack head
-            WaiterEntry newHeadWaiterEntry = oldFirstWaiterEntry._nextWaiterEntry;
-
-            // Update the old stack head list links and decrement the number
-            // waiters.
-            RemoveWaiter(oldFirstWaiterEntry, true);
-
-            // Update the new stack head
-            _headWaiterEntry._nextWaiterEntry = newHeadWaiterEntry;
-            if (null != newHeadWaiterEntry)
-            {
-                newHeadWaiterEntry._prevWaiterEntry = _headWaiterEntry;
-            }
-
-            // Return the old stack head
-            return oldFirstWaiterEntry;
-        }
-
-        /// <summary>
-        /// Remove a waiter from the stack
-        /// </summary>
-        /// <param name="waiterEntry">A waiter entry to remove</param>
-        /// <param name="popDecrement">If true the waiter count is always decremented</param>
-        private void RemoveWaiter(WaiterEntry waiterEntry, bool popDecrement)
-        {
-            // Store the prev entry in the list
-            WaiterEntry prevWaiterEntry = waiterEntry._prevWaiterEntry;
-
-            // Store the next entry in the list
-            WaiterEntry nextWaiterEntry = waiterEntry._nextWaiterEntry;
-
-            // A flag to indicate if we need to decrement the waiters count.
-            // If we got here from PopWaiter then we must decrement.
-            // If we got here from PushWaiter then we decrement only if
-            // the waiter was already in the stack.
-            bool decrementCounter = popDecrement;
-
-            // Null the waiter's entry links
-            waiterEntry._prevWaiterEntry = null;
-            waiterEntry._nextWaiterEntry = null;
-
-            // If the waiter entry had a prev link then update it.
-            // It also means that the waiter is already in the list and we
-            // need to decrement the waiters count.
-            if (null != prevWaiterEntry)
-            {
-                prevWaiterEntry._nextWaiterEntry = nextWaiterEntry;
-                decrementCounter = true;
-            }
-
-            // If the waiter entry had a next link then update it.
-            // It also means that the waiter is already in the list and we
-            // need to decrement the waiters count.
-            if (null != nextWaiterEntry)
-            {
-                nextWaiterEntry._prevWaiterEntry = prevWaiterEntry;
-                decrementCounter = true;
-            }
-
-            // Decrement the waiters count if needed
-            if (decrementCounter)
-            {
-                --_waitersCount;
-            }
-        }
-
-        #endregion
-
-        #endregion
-
-        #region WaiterEntry class 
-
-        // A waiter entry in the _waiters queue.
-        public class WaiterEntry : IDisposable
-        {
-            #region Member variables
-
-            /// <summary>
-            /// Event to signal the waiter that it got the work item.
-            /// </summary>
-            private AutoResetEvent _waitHandle = new AutoResetEvent(false);
-
-            /// <summary>
-            /// Flag to know if this waiter already quited from the queue 
-            /// because of a timeout.
-            /// </summary>
-            private bool _isTimedout = false;
-
-            /// <summary>
-            /// Flag to know if the waiter was signaled and got a work item. 
-            /// </summary>
-            private bool _isSignaled = false;
+                                _headWaiterEntry._nextWaiterEntry = newWaiterEntry;
+                                newWaiterEntry._nextWaiterEntry = oldFirstWaiterEntry;
+                                newWaiterEntry._prevWaiterEntry = _headWaiterEntry;
+                                oldFirstWaiterEntry._prevWaiterEntry = newWaiterEntry;
+                        }
+
+                        // Increment the number of waiters
+                        ++_waitersCount;
+                }
+
+                /// <summary>
+                /// Pop a waiter from the waiter's stack
+                /// </summary>
+                /// <returns>Returns the first waiter in the stack</returns>
+                private WaiterEntry PopWaiter()
+                {
+                        // Store the current stack head
+                        WaiterEntry oldFirstWaiterEntry = _headWaiterEntry._nextWaiterEntry;
+
+                        // Store the new stack head
+                        WaiterEntry newHeadWaiterEntry = oldFirstWaiterEntry._nextWaiterEntry;
+
+                        // Update the old stack head list links and decrement the number
+                        // waiters.
+                        RemoveWaiter(oldFirstWaiterEntry, true);
+
+                        // Update the new stack head
+                        _headWaiterEntry._nextWaiterEntry = newHeadWaiterEntry;
+                        if (null != newHeadWaiterEntry)
+                        {
+                                newHeadWaiterEntry._prevWaiterEntry = _headWaiterEntry;
+                        }
+
+                        // Return the old stack head
+                        return oldFirstWaiterEntry;
+                }
+
+                /// <summary>
+                /// Remove a waiter from the stack
+                /// </summary>
+                /// <param name="waiterEntry">A waiter entry to remove</param>
+                /// <param name="popDecrement">If true the waiter count is always decremented</param>
+                private void RemoveWaiter(WaiterEntry waiterEntry, bool popDecrement)
+                {
+                        // Store the prev entry in the list
+                        WaiterEntry prevWaiterEntry = waiterEntry._prevWaiterEntry;
+
+                        // Store the next entry in the list
+                        WaiterEntry nextWaiterEntry = waiterEntry._nextWaiterEntry;
+
+                        // A flag to indicate if we need to decrement the waiters count.
+                        // If we got here from PopWaiter then we must decrement.
+                        // If we got here from PushWaiter then we decrement only if
+                        // the waiter was already in the stack.
+                        bool decrementCounter = popDecrement;
+
+                        // Null the waiter's entry links
+                        waiterEntry._prevWaiterEntry = null;
+                        waiterEntry._nextWaiterEntry = null;
+
+                        // If the waiter entry had a prev link then update it.
+                        // It also means that the waiter is already in the list and we
+                        // need to decrement the waiters count.
+                        if (null != prevWaiterEntry)
+                        {
+                                prevWaiterEntry._nextWaiterEntry = nextWaiterEntry;
+                                decrementCounter = true;
+                        }
+
+                        // If the waiter entry had a next link then update it.
+                        // It also means that the waiter is already in the list and we
+                        // need to decrement the waiters count.
+                        if (null != nextWaiterEntry)
+                        {
+                                nextWaiterEntry._prevWaiterEntry = prevWaiterEntry;
+                                decrementCounter = true;
+                        }
+
+                        // Decrement the waiters count if needed
+                        if (decrementCounter)
+                        {
+                                --_waitersCount;
+                        }
+                }
+
+                #endregion
+
+                #endregion
+
+                #region WaiterEntry class 
+
+                // A waiter entry in the _waiters queue.
+                public sealed class WaiterEntry : IDisposable
+                {
+                        #region Member variables
+
+                        /// <summary>
+                        /// Event to signal the waiter that it got the work item.
+                        /// </summary>
+                        //private AutoResetEvent _waitHandle = new AutoResetEvent(false);
+            private AutoResetEvent _waitHandle = EventWaitHandleFactory.CreateAutoResetEvent();
+
+                        /// <summary>
+                        /// Flag to know if this waiter already quited from the queue 
+                        /// because of a timeout.
+                        /// </summary>
+                        private bool _isTimedout = false;
+
+                        /// <summary>
+                        /// Flag to know if the waiter was signaled and got a work item. 
+                        /// </summary>
+                        private bool _isSignaled = false;
 
             /// <summary>
             /// A work item that passed directly to the waiter withou going 
             /// through the queue
             /// </summary>
-            private WorkItem _workItem = null;
+                        private WorkItem _workItem = null;
 
             private bool _isDisposed = false;
 
-            // Linked list members
-            internal WaiterEntry _nextWaiterEntry = null;
-            internal WaiterEntry _prevWaiterEntry = null;
-
-            #endregion
-
-            #region Construction
-
-            public WaiterEntry()
-            {
-                Reset();
-            }
-                        
-            #endregion
-
-            #region Public methods
-
-            public WaitHandle WaitHandle
-            {
-                get { return _waitHandle; }
-            }
-
-            public WorkItem WorkItem
-            {
-                get
-                {
-                    lock(this)
-                    {
-                        return _workItem;
-                    }
-                }
-            }
-
-            /// <summary>
-            /// Signal the waiter that it got a work item.
-            /// </summary>
-            /// <returns>Return true on success</returns>
-            /// The method fails if Timeout() preceded its call
-            public bool Signal(WorkItem workItem)
-            {
-                lock(this)
-                {
-                    if (!_isTimedout)
-                    {
-                        _workItem = workItem;
-                        _isSignaled = true;
-                        _waitHandle.Set();
-                        return true;
-                    }
-                }
-                return false;
-            }
-
-            /// <summary>
-            /// Mark the wait entry that it has been timed out
-            /// </summary>
-            /// <returns>Return true on success</returns>
-            /// The method fails if Signal() preceded its call
-            public bool Timeout()
-            {
-                lock(this)
+                        // Linked list members
+                        internal WaiterEntry _nextWaiterEntry = null;
+                        internal WaiterEntry _prevWaiterEntry = null;
+
+                        #endregion
+
+                        #region Construction
+
+                        public WaiterEntry()
+                        {
+                                Reset();
+                        }
+                                                
+                        #endregion
+
+                        #region Public methods
+
+                        public WaitHandle WaitHandle
+                        {
+                                get { return _waitHandle; }
+                        }
+
+                        public WorkItem WorkItem
+                        {
+                                get
+                                {
+                                        return _workItem;
+                                }
+                        }
+
+                        /// <summary>
+                        /// Signal the waiter that it got a work item.
+                        /// </summary>
+                        /// <returns>Return true on success</returns>
+                        /// The method fails if Timeout() preceded its call
+                        public bool Signal(WorkItem workItem)
+                        {
+                                lock(this)
+                                {
+                                        if (!_isTimedout)
+                                        {
+                                                _workItem = workItem;
+                                                _isSignaled = true;
+                                                _waitHandle.Set();
+                                                return true;
+                                        }
+                                }
+                                return false;
+                        }
+
+                        /// <summary>
+                        /// Mark the wait entry that it has been timed out
+                        /// </summary>
+                        /// <returns>Return true on success</returns>
+                        /// The method fails if Signal() preceded its call
+                        public bool Timeout()
+                        {
+                                lock(this)
+                                {
+                                        // Time out can happen only if the waiter wasn't marked as
+                                        // signaled
+                                        if (!_isSignaled)
+                                        {
+                                                // We don't remove the waiter from the queue, the DequeueWorkItem 
+                        // method skips _waiters that were timed out.
+                                                _isTimedout = true;
+                                                return true;
+                                        }
+                                }
+                                return false;
+                        }
+
+                        /// <summary>
+                        /// Reset the wait entry so it can be used again
+                        /// </summary>
+                        public void Reset()
+                        {
+                                _workItem = null;
+                                _isTimedout = false;
+                                _isSignaled = false;
+                                _waitHandle.Reset();
+                        }
+
+                        /// <summary>
+                        /// Free resources
+                        /// </summary>
+                        public void Close()
+                        {
+                                if (null != _waitHandle)
+                                {
+                                        _waitHandle.Close();
+                                        _waitHandle = null;
+                                }
+                        }
+
+                        #endregion
+
+                        #region IDisposable Members
+
+                        public void Dispose()
+                        {
+                lock (this)
                 {
-                    // Time out can happen only if the waiter wasn't marked as
-                    // signaled
-                    if (!_isSignaled)
+                    if (!_isDisposed)
                     {
-                        // We don't remove the waiter from the queue, the DequeueWorkItem 
-                        // method skips _waiters that were timed out.
-                        _isTimedout = true;
-                        return true;
+                        Close();
                     }
-                }
-                return false;
-            }
-
-            /// <summary>
-            /// Reset the wait entry so it can be used again
-            /// </summary>
-            public void Reset()
-            {
-                _workItem = null;
-                _isTimedout = false;
-                _isSignaled = false;
-                _waitHandle.Reset();
-            }
-
-            /// <summary>
-            /// Free resources
-            /// </summary>
-            public void Close()
-            {
-                if (null != _waitHandle)
-                {
-                    _waitHandle.Close();
-                    _waitHandle = null;
-                }
-            }
-
-            #endregion
-
-            #region IDisposable Members
-
-            public void Dispose()
-            {
-                if (!_isDisposed)
-                {
-                    Close();
                     _isDisposed = true;
                 }
             }
 
-            ~WaiterEntry()
-            {
-                Dispose();
-            }
+                        #endregion
+                }
 
-            #endregion
-        }
-
-        #endregion
+                #endregion
 
         #region IDisposable Members
 
@@ -574,14 +625,8 @@ namespace Amib.Threading.Internal
             if (!_isDisposed)
             {
                 Cleanup();
-                _isDisposed = true;
-                GC.SuppressFinalize(this);
             }
-        }
-
-        ~WorkItemsQueue()
-        {
-            Cleanup();
+            _isDisposed = true;
         }
 
         private void ValidateNotDisposed()
@@ -595,6 +640,6 @@ namespace Amib.Threading.Internal
         #endregion
     }
 
-    #endregion
+        #endregion
 }
 
diff --git a/bin/BulletXNA.dll b/bin/BulletXNA.dll
index bfaac4f..b3ddc32 100644
--- a/bin/BulletXNA.dll
+++ b/bin/BulletXNA.dll
diff --git a/bin/BulletXNA.pdb b/bin/BulletXNA.pdb
index ecab22f..ed3baad 100644
--- a/bin/BulletXNA.pdb
+++ b/bin/BulletXNA.pdb
diff --git a/bin/OpenMetaverse.Http.XML b/bin/OpenMetaverse.Http.XML
deleted file mode 100644
index 23173ae..0000000
--- a/bin/OpenMetaverse.Http.XML
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>OpenMetaverse.Http</name>
-    </assembly>
-    <members>
-        <member name="F:OpenMetaverse.Http.EventQueueServer.CONNECTION_TIMEOUT">
-            <summary>The number of milliseconds to wait before the connection times out
-            and an empty response is sent to the client. This value should be higher
-            than BATCH_WAIT_INTERVAL for the timeout to function properly</summary>
-        </member>
-        <member name="F:OpenMetaverse.Http.EventQueueServer.BATCH_WAIT_INTERVAL">
-            <summary>This interval defines the amount of time to wait, in milliseconds,
-            for new events to show up on the queue before sending a response to the 
-            client and completing the HTTP request. The interval also specifies the 
-            maximum time that can pass before the queue shuts down after Stop() or the
-            class destructor is called</summary>
-        </member>
-        <member name="F:OpenMetaverse.Http.EventQueueServer.MAX_EVENTS_PER_RESPONSE">
-            <summary>Since multiple events can be batched together and sent in the same
-            response, this prevents the event queue thread from infinitely dequeueing 
-            events and never sending a response if there is a constant stream of new 
-            events</summary>
-        </member>
-        <member name="T:OpenMetaverse.Http.Logger">
-            <summary>
-            Singleton logging class for the entire library
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.Http.Logger.Log">
-            <summary>log4net logging engine</summary>
-        </member>
-        <member name="F:OpenMetaverse.Http.log4netLogWriter.Instance">
-            <summary>
-            Singleton instance of this class
-            </summary>
-        </member>
-        <member name="T:OpenMetaverse.Http.CapsRequestCallback">
-            <summary>
-            Delegate for handling incoming HTTP requests through a capability
-            </summary>
-            <param name="context">Client context</param>
-            <param name="request">HTTP request</param>
-            <param name="response">HTTP response</param>
-            <param name="state">User-defined state object</param>
-        </member>
-        <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>
-    </members>
-</doc>
diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
index 30b9c7b..100916c 100755
--- a/bin/OpenMetaverse.Rendering.Meshmerizer.dll
+++ b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
diff --git a/bin/OpenMetaverse.StructuredData.XML b/bin/OpenMetaverse.StructuredData.XML
index d6c31df..789ad5b 100644
--- a/bin/OpenMetaverse.StructuredData.XML
+++ b/bin/OpenMetaverse.StructuredData.XML
@@ -1,63 +1,55 @@
 <?xml version="1.0"?>
 <doc>
     <assembly>
-        <name>/home/root/libomv-0.9.1-source/bin/OpenMetaverse.StructuredData</name>
+        <name>OpenMetaverse.StructuredData</name>
     </assembly>
     <members>
         <member name="T:OpenMetaverse.StructuredData.OSDType">
             <summary>
+            
             </summary>
         </member>
         <member name="F:OpenMetaverse.StructuredData.OSDType.Unknown">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.StructuredData.OSDType.Boolean">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.StructuredData.OSDType.Integer">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.StructuredData.OSDType.Real">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.StructuredData.OSDType.String">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.StructuredData.OSDType.UUID">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.StructuredData.OSDType.Date">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.StructuredData.OSDType.URI">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.StructuredData.OSDType.Binary">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.StructuredData.OSDType.Map">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.StructuredData.OSDType.Array">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="T:OpenMetaverse.StructuredData.OSDException">
             <summary>
+            
             </summary>
         </member>
         <member name="T:OpenMetaverse.StructuredData.OSD">
             <summary>
+            
             </summary>
         </member>
         <member name="M:OpenMetaverse.StructuredData.OSD.SerializeMembers(System.Object)">
@@ -81,50 +73,63 @@
         </member>
         <member name="T:OpenMetaverse.StructuredData.OSDBoolean">
             <summary>
+            
             </summary>
         </member>
         <member name="T:OpenMetaverse.StructuredData.OSDInteger">
             <summary>
+            
             </summary>
         </member>
         <member name="T:OpenMetaverse.StructuredData.OSDReal">
             <summary>
+            
             </summary>
         </member>
         <member name="T:OpenMetaverse.StructuredData.OSDString">
             <summary>
+            
             </summary>
         </member>
         <member name="T:OpenMetaverse.StructuredData.OSDUUID">
             <summary>
+            
             </summary>
         </member>
         <member name="T:OpenMetaverse.StructuredData.OSDDate">
             <summary>
+            
             </summary>
         </member>
         <member name="T:OpenMetaverse.StructuredData.OSDUri">
             <summary>
+            
             </summary>
         </member>
         <member name="T:OpenMetaverse.StructuredData.OSDBinary">
             <summary>
+            
             </summary>
         </member>
         <member name="T:OpenMetaverse.StructuredData.OSDMap">
             <summary>
+            
             </summary>
         </member>
         <member name="T:OpenMetaverse.StructuredData.OSDArray">
             <summary>
+            
             </summary>
         </member>
         <member name="T:OpenMetaverse.StructuredData.OSDParser">
             <summary>
+            
             </summary>
             <summary>
+            
             </summary>
             <summary>
+            
             </summary>
         </member>
         <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDBinary(System.Byte[])">
@@ -153,8 +158,7 @@
             Serializes OSD to binary format
             </summary>
             <param name="osd">OSD to serialize</param>
-            <param name="prependHeader">
-            </param>
+            <param name="prependHeader"></param>
             <returns>Serialized data</returns>
         </member>
         <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDBinaryStream(OpenMetaverse.StructuredData.OSD)">
@@ -169,209 +173,177 @@
             Serializes OSD to binary format
             </summary>
             <param name="data">OSD to serialize</param>
-            <param name="prependHeader">
-            </param>
+            <param name="prependHeader"></param>
             <returns>Serialized data</returns>
         </member>
         <member name="M:OpenMetaverse.StructuredData.OSDParser.SkipWhiteSpace(System.IO.Stream)">
             <summary>
+            
             </summary>
-            <param name="stream">
-            </param>
+            <param name="stream"></param>
         </member>
         <member name="M:OpenMetaverse.StructuredData.OSDParser.FindByte(System.IO.Stream,System.Byte)">
             <summary>
+            
             </summary>
-            <param name="stream">
-            </param>
-            <param name="toFind">
-            </param>
-            <returns>
-            </returns>
+            <param name="stream"></param>
+            <param name="toFind"></param>
+            <returns></returns>
         </member>
         <member name="M:OpenMetaverse.StructuredData.OSDParser.FindString(System.IO.Stream,System.String)">
             <summary>
+            
             </summary>
-            <param name="stream">
-            </param>
-            <param name="toFind">
-            </param>
-            <returns>
-            </returns>
+            <param name="stream"></param>
+            <param name="toFind"></param>
+            <returns></returns>
         </member>
         <member name="M:OpenMetaverse.StructuredData.OSDParser.ConsumeBytes(System.IO.Stream,System.Int32)">
             <summary>
+            
             </summary>
-            <param name="stream">
-            </param>
-            <param name="consumeBytes">
-            </param>
-            <returns>
-            </returns>
+            <param name="stream"></param>
+            <param name="consumeBytes"></param>
+            <returns></returns>
         </member>
         <member name="M:OpenMetaverse.StructuredData.OSDParser.NetworkToHostInt(System.Byte[])">
             <summary>
+            
             </summary>
-            <param name="binaryNetEnd">
-            </param>
-            <returns>
-            </returns>
+            <param name="binaryNetEnd"></param>
+            <returns></returns>
         </member>
         <member name="M:OpenMetaverse.StructuredData.OSDParser.NetworkToHostDouble(System.Byte[])">
             <summary>
+            
             </summary>
-            <param name="binaryNetEnd">
-            </param>
-            <returns>
-            </returns>
+            <param name="binaryNetEnd"></param>
+            <returns></returns>
         </member>
         <member name="M:OpenMetaverse.StructuredData.OSDParser.HostToNetworkIntBytes(System.Int32)">
             <summary>
+            
             </summary>
-            <param name="intHostEnd">
-            </param>
-            <returns>
-            </returns>
+            <param name="intHostEnd"></param>
+            <returns></returns>   
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDNotationElement(System.IO.StringReader)">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDXml(System.Byte[])">
             <summary>
+            
             </summary>
-            <param name="reader">
-            </param>
-            <returns>
-            </returns>
+            <param name="xmlData"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.PeekAndSkipWhitespace(System.IO.StringReader)">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDXml(System.String)">
             <summary>
+            
             </summary>
-            <param name="reader">
-            </param>
-            <returns>
-            </returns>
+            <param name="xmlData"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.ReadAndSkipWhitespace(System.IO.StringReader)">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDXml(System.Xml.XmlTextReader)">
             <summary>
+            
             </summary>
-            <param name="reader">
-            </param>
-            <returns>
-            </returns>
+            <param name="xmlData"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.GetLengthInBrackets(System.IO.StringReader)">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDXmlBytes(OpenMetaverse.StructuredData.OSD)">
             <summary>
+            
             </summary>
-            <param name="reader">
-            </param>
-            <returns>
-            </returns>
+            <param name="data"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.GetStringDelimitedBy(System.IO.StringReader,System.Char)">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDXmlString(OpenMetaverse.StructuredData.OSD)">
             <summary>
+            
             </summary>
-            <param name="reader">
-            </param>
-            <param name="delimiter">
-            </param>
-            <returns>
-            </returns>
+            <param name="data"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.BufferCharactersEqual(System.IO.StringReader,System.Char[],System.Int32)">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDXmlElement(System.Xml.XmlTextWriter,OpenMetaverse.StructuredData.OSD)">
             <summary>
+            
             </summary>
-            <param name="reader">
-            </param>
-            <param name="buffer">
-            </param>
-            <param name="offset">
-            </param>
-            <returns>
-            </returns>
+            <param name="writer"></param>
+            <param name="data"></param>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.UnescapeCharacter(System.String,System.Char)">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.TryValidateLLSDXml(System.Xml.XmlTextReader,System.String@)">
             <summary>
+            
             </summary>
-            <param name="s">
-            </param>
-            <param name="c">
-            </param>
-            <returns>
-            </returns>
+            <param name="xmlData"></param>
+            <param name="error"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.EscapeCharacter(System.String,System.Char)">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.ParseLLSDXmlElement(System.Xml.XmlTextReader)">
             <summary>
+            
             </summary>
-            <param name="s">
-            </param>
-            <param name="c">
-            </param>
-            <returns>
-            </returns>
+            <param name="reader"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDXml(System.Byte[])">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDNotationElement(System.IO.StringReader)">
             <summary>
+            
             </summary>
-            <param name="xmlData">
-            </param>
-            <returns>
-            </returns>
+            <param name="reader"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDXml(System.String)">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.PeekAndSkipWhitespace(System.IO.StringReader)">
             <summary>
+            
             </summary>
-            <param name="xmlData">
-            </param>
-            <returns>
-            </returns>
+            <param name="reader"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.DeserializeLLSDXml(System.Xml.XmlTextReader)">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.ReadAndSkipWhitespace(System.IO.StringReader)">
             <summary>
+            
             </summary>
-            <param name="xmlData">
-            </param>
-            <returns>
-            </returns>
+            <param name="reader"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDXmlBytes(OpenMetaverse.StructuredData.OSD)">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.GetLengthInBrackets(System.IO.StringReader)">
             <summary>
+            
             </summary>
-            <param name="data">
-            </param>
-            <returns>
-            </returns>
+            <param name="reader"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDXmlString(OpenMetaverse.StructuredData.OSD)">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.GetStringDelimitedBy(System.IO.StringReader,System.Char)">
             <summary>
+            
             </summary>
-            <param name="data">
-            </param>
-            <returns>
-            </returns>
+            <param name="reader"></param>
+            <param name="delimiter"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.SerializeLLSDXmlElement(System.Xml.XmlTextWriter,OpenMetaverse.StructuredData.OSD)">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.BufferCharactersEqual(System.IO.StringReader,System.Char[],System.Int32)">
             <summary>
+            
             </summary>
-            <param name="writer">
-            </param>
-            <param name="data">
-            </param>
+            <param name="reader"></param>
+            <param name="buffer"></param>
+            <param name="offset"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.TryValidateLLSDXml(System.Xml.XmlTextReader,System.String@)">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.UnescapeCharacter(System.String,System.Char)">
             <summary>
+            
             </summary>
-            <param name="xmlData">
-            </param>
-            <param name="error">
-            </param>
-            <returns>
-            </returns>
+            <param name="s"></param>
+            <param name="c"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.StructuredData.OSDParser.ParseLLSDXmlElement(System.Xml.XmlTextReader)">
+        <member name="M:OpenMetaverse.StructuredData.OSDParser.EscapeCharacter(System.String,System.Char)">
             <summary>
+            
             </summary>
-            <param name="reader">
-            </param>
-            <returns>
-            </returns>
+            <param name="s"></param>
+            <param name="c"></param>
+            <returns></returns>
         </member>
     </members>
 </doc>
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll
index c7216ce..bb16ed0 100755
--- a/bin/OpenMetaverse.StructuredData.dll
+++ b/bin/OpenMetaverse.StructuredData.dll
diff --git a/bin/OpenMetaverse.XML b/bin/OpenMetaverse.XML
index 81cc005..457cbe1 100644
--- a/bin/OpenMetaverse.XML
+++ b/bin/OpenMetaverse.XML
@@ -1,1829 +1,3048 @@
 <?xml version="1.0"?>
 <doc>
     <assembly>
-        <name>/home/root/libomv-0.9.1-source/bin/OpenMetaverse</name>
+        <name>OpenMetaverse</name>
     </assembly>
     <members>
-        <member name="T:OpenMetaverse.ScriptPermission">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.StartDaemon(System.String,System.String)">
             <summary>
-            Permission request flags, asked when a script wants to control an Avatar
+            Starts a thread that keeps the daemon running
             </summary>
+            <param name="path"></param>
+            <param name="args"></param>
         </member>
-        <member name="F:OpenMetaverse.ScriptPermission.None">
-            <summary>Placeholder for empty values, shouldn't ever see this</summary>
-        </member>
-        <member name="F:OpenMetaverse.ScriptPermission.Debit">
-            <summary>Script wants ability to take money from you</summary>
-        </member>
-        <member name="F:OpenMetaverse.ScriptPermission.TakeControls">
-            <summary>Script wants to take camera controls for you</summary>
-        </member>
-        <member name="F:OpenMetaverse.ScriptPermission.RemapControls">
-            <summary>Script wants to remap avatars controls</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>
-        <member name="F:OpenMetaverse.ScriptPermission.Attach">
-            <summary>Script wants to attach or detach the prim or primset to your avatar</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>
-        <member name="F:OpenMetaverse.ScriptPermission.ChangeLinks">
-            <summary>Script wants ability to link/delink with other prims</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>
-        <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="F:OpenMetaverse.ScriptPermission.TrackCamera">
-            <summary>Script wants to track avatars camera position and rotation </summary>
-        </member>
-        <member name="F:OpenMetaverse.ScriptPermission.ControlCamera">
-            <summary>Script wants to control your camera</summary>
-        </member>
-        <member name="T:OpenMetaverse.InstantMessageDialog">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.StopDaemon">
             <summary>
-            Special commands used in Instant Messages
+            Stops the daemon and the thread keeping it running
             </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>
-        <member name="F:OpenMetaverse.InstantMessageDialog.GroupNoticeRequested">
-            <summary>Unknown</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.FriendshipOffered">
-            <summary>An avatar is offering you friendship</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.FriendshipAccepted">
-            <summary>An avatar has accepted your friendship offer</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.FriendshipDeclined">
-            <summary>An avatar has declined your friendship offer</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.StartTyping">
-            <summary>Indicates that a user has started typing</summary>
-        </member>
-        <member name="F:OpenMetaverse.InstantMessageDialog.StopTyping">
-            <summary>Indicates that a user has stopped typing</summary>
-        </member>
-        <member name="T:OpenMetaverse.InstantMessageOnline">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.ConnectToDaemon(System.String,System.Int32)">
             <summary>
-            Flag in Instant Messages, whether the IM should be delivered to
-            offline avatars as well
+            
             </summary>
+            <param name="address"></param>
+            <param name="port"></param>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.InstantMessageOnline.Online">
-            <summary>Only deliver to online avatars</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>
-        <member name="T:OpenMetaverse.ChatType">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxGetCaptureDevices">
             <summary>
-            Conversion type to denote Chat Packet types in an easier-to-understand format
+            This is used to get a list of audio devices that can be used for capture (input) of voice.
             </summary>
+            <returns></returns>
         </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="M:OpenMetaverse.Voice.VoiceGateway.AuxGetRenderDevices">
             <summary>
-            Identifies the source of a chat message
+            This is used to get a list of audio devices that can be used for render (playback) of voice.
             </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>
-        <member name="T:OpenMetaverse.ChatAudibleLevel">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxSetRenderDevice(System.String)">
             <summary>
+            This command is used to select the render device.
             </summary>
+            <param name="RenderDeviceSpecifier">The name of the device as returned by the Aux.GetRenderDevices command.</param>
         </member>
-        <member name="F:OpenMetaverse.ChatAudibleLevel.Not">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxSetCaptureDevice(System.String)">
             <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="F:OpenMetaverse.ChatAudibleLevel.Barely">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxCaptureAudioStart(System.Int32)">
             <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="F:OpenMetaverse.ChatAudibleLevel.Fully">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxCaptureAudioStop">
             <summary>
+            This command is used to stop the audio capture process.
             </summary>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.EffectType">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxSetMicLevel(System.Int32)">
             <summary>
-            Effect type used in ViewerEffect packets
+            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="F:OpenMetaverse.EffectType.Text">
+        <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="F:OpenMetaverse.EffectType.Icon">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.SessionCreate(System.String,System.String,System.String,System.String,System.Boolean,System.Boolean,System.String)">
             <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.
             </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="F:OpenMetaverse.EffectType.Connector">
+        <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="F:OpenMetaverse.EffectType.FlexibleObject">
+        <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="F:OpenMetaverse.EffectType.AnimalControls">
+        <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="F:OpenMetaverse.EffectType.AnimationObject">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.SessionTerminate(System.String)">
             <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>
         </member>
-        <member name="F:OpenMetaverse.EffectType.Cloth">
+        <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="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">
+        <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="F:OpenMetaverse.EffectType.Point">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.Start">
             <summary>
+            Start up the Voice service.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.EffectType.Trail">
+        <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="F:OpenMetaverse.EffectType.Sphere">
-            <summary>Create a swirl of particles around an object</summary>
-        </member>
-        <member name="F:OpenMetaverse.EffectType.Spiral">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.Dispose">
             <summary>
+            Cleanup oject resources
             </summary>
         </member>
-        <member name="F:OpenMetaverse.EffectType.Edit">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.Network_EventQueueRunning(System.Object,OpenMetaverse.EventQueueRunningEventArgs)">
             <summary>
+            Request voice cap when changing regions
             </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="M:OpenMetaverse.Voice.VoiceGateway.connector_OnSessionStateChangeEvent(System.Object,OpenMetaverse.Voice.VoiceGateway.SessionStateChangeEventArgs)">
             <summary>
-            The action an avatar is doing when looking at something, used in
-            ViewerEffect packets for the LookAt effect
+            Handle a change in session state
             </summary>
         </member>
-        <member name="F:OpenMetaverse.LookAtType.None">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.CloseSession(System.String)">
             <summary>
+            Close a voice session
             </summary>
+            <param name="sessionHandle"></param>
         </member>
-        <member name="F:OpenMetaverse.LookAtType.Idle">
+        <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="F:OpenMetaverse.LookAtType.AutoListen">
+        <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="F:OpenMetaverse.LookAtType.FreeLook">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnDaemonRunning">
             <summary>
+            Daemon has started so connect to it.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.LookAtType.Respond">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnDaemonConnected">
             <summary>
+            The daemon TCP connection is open.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.LookAtType.Hover">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnConnectorCreateResponse(System.Object,OpenMetaverse.Voice.VoiceGateway.VoiceConnectorEventArgs)">
             <summary>
+            Handle creation of the Connector.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.LookAtType.Conversation">
-            <summary>Deprecated</summary>
-        </member>
-        <member name="F:OpenMetaverse.LookAtType.Select">
+        <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="F:OpenMetaverse.LookAtType.Focus">
+        <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="F:OpenMetaverse.LookAtType.Mouselook">
+        <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)">
             <summary>
+            Request info from a parcel capability Uri.
             </summary>
+            <param name="cap"></param>
         </member>
-        <member name="F:OpenMetaverse.LookAtType.Clear">
+        <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="T:OpenMetaverse.PointAtType">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.UpdatePosition(OpenMetaverse.AgentManager)">
             <summary>
-            The action an avatar is doing when pointing at something, used in
-            ViewerEffect packets for the PointAt effect
+            Tell Vivox where we are standing
             </summary>
+            <remarks>This has to be called when we move or turn.</remarks>
         </member>
-        <member name="F:OpenMetaverse.PointAtType.None">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.PosUpdating(System.Boolean)">
             <summary>
+            Start and stop updating out position.
             </summary>
+            <param name="go"></param>
         </member>
-        <member name="F:OpenMetaverse.PointAtType.Select">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.AccountLogin(System.String,System.String,System.String,System.String,System.String,System.Int32,System.Boolean)">
             <summary>
+            This is used to login a specific user account(s). It may only be called after
+            Connector initialization has completed successfully
             </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="F:OpenMetaverse.PointAtType.Grab">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.AccountLogout(System.String)">
             <summary>
+            This is used to logout a user session. It should only be called with a valid AccountHandle.
             </summary>
+            <param name="AccountHandle">Handle returned from successful Connector ‘login’ request</param>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.PointAtType.Clear">
+        <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="T:OpenMetaverse.MoneyTransactionType">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.ConnectorInitiateShutdown(System.String)">
             <summary>
-            Money transaction types
+            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="F:OpenMetaverse.MoneyTransactionType.None">
+        <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="F:OpenMetaverse.MoneyTransactionType.FailSimulatorTimeout">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.ConnectorMuteLocalSpeaker(System.String,System.Boolean)">
             <summary>
+            Mute or unmute the speaker
             </summary>
+            <param name="ConnectorHandle">Handle returned from successful Connector ‘create’ request</param>
+            <param name="Mute">true (mute) or false (unmute)</param>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.FailDataserverTimeout">
+        <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="F:OpenMetaverse.MoneyTransactionType.ObjectClaim">
+        <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="F:OpenMetaverse.MoneyTransactionType.LandClaim">
+        <member name="E:OpenMetaverse.Voice.VoiceGateway.OnVoiceResponse">
             <summary>
+            Event for most mundane request reposnses.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GroupCreate">
+        <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">
             <summary>
+            List of audio input devices
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectPublicClaim">
+        <member name="P:OpenMetaverse.Voice.VoiceGateway.PlaybackDevices">
             <summary>
+            List of audio output devices
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GroupJoin">
+        <member name="P:OpenMetaverse.Voice.VoiceGateway.TestMode">
             <summary>
+            Set audio test mode
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.TeleportCharge">
+        <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">
             <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="F:OpenMetaverse.MoneyTransactionType.UploadCharge">
+        <member name="M:OpenMetaverse.Voice.VoiceGateway.VoiceLoggingSettings.#ctor">
             <summary>
+            Constructor for default logging settings
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LandAuction">
+        <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.LoginStatus">
             <summary>
+            
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ClassifiedCharge">
+        <member name="F:OpenMetaverse.LoginStatus.Failed">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.LoginStatus.None">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.LoginStatus.ConnectingToLogin">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.LoginStatus.ReadingResponse">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.LoginStatus.ConnectingToSim">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.LoginStatus.Redirecting">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.LoginStatus.Success">
+            <summary></summary>
+        </member>
+        <member name="T:OpenMetaverse.LastExecStatus">
             <summary>
+            Status of the last application run.
+            Used for error reporting to the grid login service for statistical purposes.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectTax">
+        <member name="F:OpenMetaverse.LastExecStatus.Normal">
+            <summary> Application exited normally </summary>
+        </member>
+        <member name="F:OpenMetaverse.LastExecStatus.Froze">
+            <summary> Application froze </summary>
+        </member>
+        <member name="F:OpenMetaverse.LastExecStatus.ForcedCrash">
+            <summary> Application detected error and exited abnormally </summary>
+        </member>
+        <member name="F:OpenMetaverse.LastExecStatus.OtherCrash">
+            <summary> Other crash </summary>
+        </member>
+        <member name="F:OpenMetaverse.LastExecStatus.LogoutFroze">
+            <summary> Application froze during logout </summary>
+        </member>
+        <member name="F:OpenMetaverse.LastExecStatus.LogoutCrash">
+            <summary> Application crashed during logout </summary>
+        </member>
+        <member name="T:OpenMetaverse.LoginParams">
             <summary>
+            Login Request Parameters
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LandTax">
+        <member name="F:OpenMetaverse.LoginParams.URI">
+            <summary>The URL of the Login Server</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>
+        <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="F:OpenMetaverse.LoginParams.FirstName">
+            <summary>The Agents First name</summary>
+        </member>
+        <member name="F:OpenMetaverse.LoginParams.LastName">
+            <summary>The Agents Last name</summary>
+        </member>
+        <member name="F:OpenMetaverse.LoginParams.Password">
+            <summary>A md5 hashed password</summary>
+            <remarks>plaintext password will be automatically hashed</remarks>
+        </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>
+        <member name="F:OpenMetaverse.LoginParams.Channel">
+            <summary>A string containing the client software channel information</summary>
+            <example>Second Life Release</example>
+        </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>
+        <member name="F:OpenMetaverse.LoginParams.Platform">
+            <summary>A string containing the platform information the agent is running on</summary>
+        </member>
+        <member name="F:OpenMetaverse.LoginParams.MAC">
+            <summary>A string hash of the network cards Mac Address</summary>
+        </member>
+        <member name="F:OpenMetaverse.LoginParams.ViewerDigest">
+            <summary>Unknown or deprecated</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>
+        <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.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.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.LoginParams.ReadCritical">
+            <summary>Unknown</summary>
+        </member>
+        <member name="F:OpenMetaverse.LoginParams.LastExecEvent">
+            <summary>Status of the last application run sent to the grid login server for statistical purposes</summary>
+        </member>
+        <member name="F:OpenMetaverse.LoginParams.Options">
+            <summary>An array of string sent to the login server to enable various options</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>
+        <member name="M:OpenMetaverse.LoginParams.#ctor">
             <summary>
+            Default constuctor, initializes sane default values
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LightTax">
+        <member name="M:OpenMetaverse.LoginParams.#ctor(OpenMetaverse.GridClient,System.String,System.String,System.String,System.String,System.String)">
             <summary>
+            Instantiates new LoginParams object and fills in the values
             </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>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ParcelDirFee">
+        <member name="M:OpenMetaverse.LoginParams.#ctor(OpenMetaverse.GridClient,System.String,System.String,System.String,System.String,System.String,System.String)">
             <summary>
+            Instantiates new LoginParams object and fills in the values
             </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>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GroupTax">
+        <member name="T:OpenMetaverse.LoginResponseData">
             <summary>
+            The decoded data returned from the login server after a successful login
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ClassifiedRenew">
+        <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)">
             <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="F:OpenMetaverse.MoneyTransactionType.GiveInventory">
+        <member name="T:OpenMetaverse.NetworkManager">
             <summary>
+            Login Routines
             </summary>
-        </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectSale">
             <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="F:OpenMetaverse.MoneyTransactionType.Gift">
+        <member name="F:OpenMetaverse.NetworkManager.m_LoginProgress">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </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>
+        <member name="F:OpenMetaverse.NetworkManager.m_LoginProgressLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.NetworkManager.LoginSeedCapability">
+            <summary>Seed CAPS URL returned from the login server</summary>
+        </member>
+        <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.NetworkManager.AgentAppearanceServiceURL">
+            <summary>Server side baking service URL</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>
+        <member name="M:OpenMetaverse.NetworkManager.DefaultLoginParams(System.String,System.String,System.String,System.String,System.String)">
             <summary>
+            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="channel">Client application name (channel)</param>
+            <param name="version">Client application name + version</param>
+            <returns>A populated <seealso cref="T:OpenMetaverse.LoginParams"/> struct containing
+            sane defaults</returns>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LandSale">
+        <member name="M:OpenMetaverse.NetworkManager.Login(System.String,System.String,System.String,System.String,System.String)">
             <summary>
+            Simplified login that takes the most common and required fields
             </summary>
+            <param name="firstName">Account first name</param>
+            <param name="lastName">Account last name</param>
+            <param name="password">Account password</param>
+            <param name="channel">Client application name (channel)</param>
+            <param name="version">Client application name + 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="F:OpenMetaverse.MoneyTransactionType.ReferBonus">
+        <member name="M:OpenMetaverse.NetworkManager.Login(System.String,System.String,System.String,System.String,System.String,System.String)">
             <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
             </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="channel">Client application name (channel)</param>
+            <param name="start">Starting location URI that can be built with
+            StartLocation()</param>
+            <param name="version">Client application name + 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="F:OpenMetaverse.MoneyTransactionType.InventorySale">
+        <member name="M:OpenMetaverse.NetworkManager.Login(OpenMetaverse.LoginParams)">
             <summary>
+            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="F:OpenMetaverse.MoneyTransactionType.RefundPurchase">
+        <member name="M:OpenMetaverse.NetworkManager.StartLocation(System.String,System.Int32,System.Int32,System.Int32)">
             <summary>
+            Build a start location URI for passing to the Login function
             </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="F:OpenMetaverse.MoneyTransactionType.LandPassSale">
+        <member name="M:OpenMetaverse.NetworkManager.RemoteLoginHandler(OpenMetaverse.LoginResponseData,OpenMetaverse.LoginParams)">
             <summary>
+            LoginParams and the initial login XmlRpcRequest were made on a remote machine.
+            This method now initializes libomv with the results.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.DwellBonus">
+        <member name="M:OpenMetaverse.NetworkManager.LoginReplyXmlRpcHandler(Nwc.XmlRpc.XmlRpcResponse,OpenMetaverse.LoginParams)">
             <summary>
+            Handles response from XML-RPC login replies
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.PayObject">
+        <member name="M:OpenMetaverse.NetworkManager.LoginReplyXmlRpcHandler(OpenMetaverse.LoginResponseData,OpenMetaverse.LoginParams)">
             <summary>
+            Handles response from XML-RPC login replies with already parsed LoginResponseData
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectPays">
+        <member name="M:OpenMetaverse.NetworkManager.LoginReplyLLSDHandler(OpenMetaverse.Http.CapsClient,OpenMetaverse.StructuredData.OSD,System.Exception)">
             <summary>
+            Handle response from LLSD login replies
             </summary>
+            <param name="client"></param>
+            <param name="result"></param>
+            <param name="error"></param>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GroupLandDeed">
+        <member name="M:OpenMetaverse.NetworkManager.GetPlatform">
             <summary>
+            Get current OS
             </summary>
+            <returns>Either "Win" or "Linux"</returns>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GroupObjectDeed">
+        <member name="M:OpenMetaverse.NetworkManager.GetMAC">
             <summary>
+            Get clients default Mac Address
             </summary>
+            <returns>A string containing the first found Mac Address</returns>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GroupLiability">
+        <member name="F:OpenMetaverse.NetworkManager.m_PacketSent">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </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>
+        <member name="F:OpenMetaverse.NetworkManager.m_PacketSentLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.NetworkManager.m_LoggedOut">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </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>
+        <member name="F:OpenMetaverse.NetworkManager.m_LoggedOutLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.NetworkManager.m_SimConnecting">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </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>
+        <member name="F:OpenMetaverse.NetworkManager.m_SimConnectingLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.NetworkManager.m_SimConnected">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </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>
+        <member name="F:OpenMetaverse.NetworkManager.m_SimConnectedLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.NetworkManager.m_SimDisconnected">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </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>
+        <member name="F:OpenMetaverse.NetworkManager.m_SimDisconnectedLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.NetworkManager.m_Disconnected">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </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>
+        <member name="F:OpenMetaverse.NetworkManager.m_DisconnectedLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.NetworkManager.m_SimChanged">
+            <summary>The event subscribers, null of no subscribers</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>
+        <member name="F:OpenMetaverse.NetworkManager.m_SimChangedLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.NetworkManager.m_EventQueueRunning">
+            <summary>The event subscribers, null of no subscribers</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>
+        <member name="F:OpenMetaverse.NetworkManager.m_EventQueueRunningLock">
+            <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>
+        <member name="F:OpenMetaverse.NetworkManager.CapsEvents">
+            <summary>Handlers for incoming capability events</summary>
+        </member>
+        <member name="F:OpenMetaverse.NetworkManager.PacketEvents">
+            <summary>Handlers for incoming packets</summary>
+        </member>
+        <member name="F:OpenMetaverse.NetworkManager.PacketInbox">
+            <summary>Incoming packets that are awaiting handling</summary>
+        </member>
+        <member name="F:OpenMetaverse.NetworkManager.PacketOutbox">
+            <summary>Outgoing packets that are awaiting handling</summary>
+        </member>
+        <member name="M:OpenMetaverse.NetworkManager.#ctor(OpenMetaverse.GridClient)">
             <summary>
+            Default constructor
             </summary>
+            <param name="client">Reference to the GridClient object</param>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.GroupDividend">
+        <member name="M:OpenMetaverse.NetworkManager.RegisterCallback(OpenMetaverse.Packets.PacketType,System.EventHandler{OpenMetaverse.PacketReceivedEventArgs})">
             <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
             </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="F:OpenMetaverse.MoneyTransactionType.GroupMembershipDues">
+        <member name="M:OpenMetaverse.NetworkManager.RegisterCallback(OpenMetaverse.Packets.PacketType,System.EventHandler{OpenMetaverse.PacketReceivedEventArgs},System.Boolean)">
             <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
             </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="F:OpenMetaverse.MoneyTransactionType.ObjectRelease">
+        <member name="M:OpenMetaverse.NetworkManager.UnregisterCallback(OpenMetaverse.Packets.PacketType,System.EventHandler{OpenMetaverse.PacketReceivedEventArgs})">
             <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
             </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="F:OpenMetaverse.MoneyTransactionType.LandRelease">
+        <member name="M:OpenMetaverse.NetworkManager.RegisterEventCallback(System.String,OpenMetaverse.Caps.EventQueueCallback)">
             <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>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectDelete">
+        <member name="M:OpenMetaverse.NetworkManager.UnregisterEventCallback(System.String,OpenMetaverse.Caps.EventQueueCallback)">
             <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
             </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="F:OpenMetaverse.MoneyTransactionType.ObjectPublicDecay">
+        <member name="M:OpenMetaverse.NetworkManager.SendPacket(OpenMetaverse.Packets.Packet)">
             <summary>
+            Send a packet to the simulator the avatar is currently occupying
             </summary>
+            <param name="packet">Packet to send</param>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectPublicDelete">
+        <member name="M:OpenMetaverse.NetworkManager.SendPacket(OpenMetaverse.Packets.Packet,OpenMetaverse.Simulator)">
             <summary>
+            Send a packet to a specified simulator
             </summary>
+            <param name="packet">Packet to send</param>
+            <param name="simulator">Simulator to send the packet to</param>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.LindenAdjustment">
+        <member name="M:OpenMetaverse.NetworkManager.Connect(System.Net.IPAddress,System.UInt16,System.UInt64,System.Boolean,System.String)">
             <summary>
+            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="F:OpenMetaverse.MoneyTransactionType.LindenGrant">
+        <member name="M:OpenMetaverse.NetworkManager.Connect(System.Net.IPEndPoint,System.UInt64,System.Boolean,System.String)">
             <summary>
+            Connect to a simulator
             </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="F:OpenMetaverse.MoneyTransactionType.LindenPenalty">
+        <member name="M:OpenMetaverse.NetworkManager.Logout">
             <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
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.EventFee">
+        <member name="M:OpenMetaverse.NetworkManager.RequestLogout">
             <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
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.EventPrize">
+        <member name="M:OpenMetaverse.NetworkManager.DisconnectSim(OpenMetaverse.Simulator,System.Boolean)">
             <summary>
+            Close a connection to the given simulator
             </summary>
+            <param name="simulator"></param>
+            <param name="sendCloseCircuit"></param>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.StipendBasic">
+        <member name="M:OpenMetaverse.NetworkManager.Shutdown(OpenMetaverse.NetworkManager.DisconnectType)">
             <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>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.StipendDeveloper">
+        <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="F:OpenMetaverse.MoneyTransactionType.StipendAlways">
+        <member name="M:OpenMetaverse.NetworkManager.FindSimulator(System.Net.IPEndPoint)">
             <summary>
+            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="F:OpenMetaverse.MoneyTransactionType.StipendDaily">
+        <member name="M:OpenMetaverse.NetworkManager.RaiseConnectedEvent(OpenMetaverse.Simulator)">
             <summary>
+            Fire an event when an event queue connects for capabilities
             </summary>
+            <param name="simulator">Simulator the event queue is attached to</param>
         </member>
-        <member name="F:OpenMetaverse.MoneyTransactionType.StipendRating">
+        <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="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="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.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.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.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="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="E:OpenMetaverse.NetworkManager.LoginProgress">
+            <summary>Raised when the simulator sends us data containing
+            ...</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>
+        <member name="P:OpenMetaverse.NetworkManager.LoginStatusCode">
+            <summary>Current state of logging in</summary>
+        </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>
+        <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="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="E:OpenMetaverse.NetworkManager.PacketSent">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
+        </member>
+        <member name="E:OpenMetaverse.NetworkManager.LoggedOut">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
+        </member>
+        <member name="E:OpenMetaverse.NetworkManager.SimConnecting">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
+        </member>
+        <member name="E:OpenMetaverse.NetworkManager.SimConnected">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
+        </member>
+        <member name="E:OpenMetaverse.NetworkManager.SimDisconnected">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
+        </member>
+        <member name="E:OpenMetaverse.NetworkManager.Disconnected">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
+        </member>
+        <member name="E:OpenMetaverse.NetworkManager.SimChanged">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
+        </member>
+        <member name="E:OpenMetaverse.NetworkManager.EventQueueRunning">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
+        </member>
+        <member name="P:OpenMetaverse.NetworkManager.CircuitCode">
+            <summary>Unique identifier associated with our connections to
+            simulators</summary>
+        </member>
+        <member name="P:OpenMetaverse.NetworkManager.CurrentSim">
+            <summary>The simulator that the logged in avatar is currently 
+            occupying</summary>
+        </member>
+        <member name="P:OpenMetaverse.NetworkManager.Connected">
+            <summary>Shows whether the network layer is logged in to the
+            grid or not</summary>
+        </member>
+        <member name="P:OpenMetaverse.NetworkManager.InboxCount">
+            <summary>Number of packets in the incoming queue</summary>
+        </member>
+        <member name="P:OpenMetaverse.NetworkManager.OutboxCount">
+            <summary>Number of packets in the outgoing queue</summary>
+        </member>
+        <member name="T:OpenMetaverse.NetworkManager.LoginResponseCallback">
             <summary>
+            
             </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.MoneyTransactionType.StipendDelta">
+        <member name="T:OpenMetaverse.NetworkManager.DisconnectType">
             <summary>
+            Explains why a simulator or the grid disconnected from us
             </summary>
         </member>
-        <member name="T:OpenMetaverse.TransactionFlags">
+        <member name="F:OpenMetaverse.NetworkManager.DisconnectType.ClientInitiated">
+            <summary>The client requested the logout or simulator disconnect</summary>
+        </member>
+        <member name="F:OpenMetaverse.NetworkManager.DisconnectType.ServerInitiated">
+            <summary>The server notified us that it is disconnecting</summary>
+        </member>
+        <member name="F:OpenMetaverse.NetworkManager.DisconnectType.NetworkTimeout">
+            <summary>Either a socket was closed or network traffic timed out</summary>
+        </member>
+        <member name="F:OpenMetaverse.NetworkManager.DisconnectType.SimShutdown">
+            <summary>The last active simulator shut down</summary>
+        </member>
+        <member name="T:OpenMetaverse.NetworkManager.IncomingPacket">
             <summary>
+            Holds a simulator reference and a decoded packet, these structs are put in
+            the packet inbox for event handling
             </summary>
         </member>
-        <member name="F:OpenMetaverse.TransactionFlags.None">
+        <member name="F:OpenMetaverse.NetworkManager.IncomingPacket.Simulator">
+            <summary>Reference to the simulator that this packet came from</summary>
+        </member>
+        <member name="F:OpenMetaverse.NetworkManager.IncomingPacket.Packet">
+            <summary>Packet that needs to be processed</summary>
+        </member>
+        <member name="T:OpenMetaverse.NetworkManager.OutgoingPacket">
             <summary>
+            Holds a simulator reference and a serialized packet, these structs are put in
+            the packet outbox for sending
             </summary>
         </member>
-        <member name="F:OpenMetaverse.TransactionFlags.SourceGroup">
+        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.Simulator">
+            <summary>Reference to the simulator this packet is destined for</summary>
+        </member>
+        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.Buffer">
+            <summary>Packet that needs to be sent</summary>
+        </member>
+        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.SequenceNumber">
+            <summary>Sequence number of the wrapped packet</summary>
+        </member>
+        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.ResendCount">
+            <summary>Number of times this packet has been resent</summary>
+        </member>
+        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.TickCount">
+            <summary>Environment.TickCount when this packet was last sent over the wire</summary>
+        </member>
+        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.Type">
+            <summary>Type of the packet</summary>
+        </member>
+        <member name="T:OpenMetaverse.PacketEventDictionary">
             <summary>
+            Registers, unregisters, and fires events generated by incoming packets
             </summary>
         </member>
-        <member name="F:OpenMetaverse.TransactionFlags.DestGroup">
+        <member name="F:OpenMetaverse.PacketEventDictionary.Client">
+            <summary>Reference to the GridClient object</summary>
+        </member>
+        <member name="M:OpenMetaverse.PacketEventDictionary.#ctor(OpenMetaverse.GridClient)">
             <summary>
+            Default constructor
             </summary>
+            <param name="client"></param>
         </member>
-        <member name="F:OpenMetaverse.TransactionFlags.OwnerGroup">
+        <member name="M:OpenMetaverse.PacketEventDictionary.RegisterEvent(OpenMetaverse.Packets.PacketType,System.EventHandler{OpenMetaverse.PacketReceivedEventArgs},System.Boolean)">
             <summary>
+            Register an event handler
             </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>
         </member>
-        <member name="F:OpenMetaverse.TransactionFlags.SimultaneousContribution">
+        <member name="M:OpenMetaverse.PacketEventDictionary.UnregisterEvent(OpenMetaverse.Packets.PacketType,System.EventHandler{OpenMetaverse.PacketReceivedEventArgs})">
             <summary>
+            Unregister an event handler
             </summary>
+            <param name="packetType">Packet type to unregister the handler for</param>
+            <param name="eventHandler">Callback to be unregistered</param>
         </member>
-        <member name="F:OpenMetaverse.TransactionFlags.ContributionRemoval">
+        <member name="M:OpenMetaverse.PacketEventDictionary.RaiseEvent(OpenMetaverse.Packets.PacketType,OpenMetaverse.Packets.Packet,OpenMetaverse.Simulator)">
             <summary>
+            Fire the events registered for this packet type
             </summary>
+            <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="T:OpenMetaverse.MeanCollisionType">
+        <member name="T:OpenMetaverse.PacketEventDictionary.PacketCallbackWrapper">
             <summary>
+            Object that is passed to worker threads in the ThreadPool for
+            firing packet callbacks
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MeanCollisionType.None">
+        <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">
             <summary>
+            Registers, unregisters, and fires events generated by the Capabilities
+            event queue
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MeanCollisionType.Bump">
+        <member name="F:OpenMetaverse.CapsEventDictionary.Client">
+            <summary>Reference to the GridClient object</summary>
+        </member>
+        <member name="M:OpenMetaverse.CapsEventDictionary.#ctor(OpenMetaverse.GridClient)">
             <summary>
+            Default constructor
             </summary>
+            <param name="client">Reference to the GridClient object</param>
         </member>
-        <member name="F:OpenMetaverse.MeanCollisionType.LLPushObject">
+        <member name="M:OpenMetaverse.CapsEventDictionary.RegisterEvent(System.String,OpenMetaverse.Caps.EventQueueCallback)">
             <summary>
+            Register an new event handler for a capabilities event sent via the EventQueue
             </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>
         </member>
-        <member name="F:OpenMetaverse.MeanCollisionType.SelectedObjectCollide">
+        <member name="M:OpenMetaverse.CapsEventDictionary.UnregisterEvent(System.String,OpenMetaverse.Caps.EventQueueCallback)">
             <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>
         </member>
-        <member name="F:OpenMetaverse.MeanCollisionType.ScriptedObjectCollide">
+        <member name="M:OpenMetaverse.CapsEventDictionary.RaiseEvent(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <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>
         </member>
-        <member name="F:OpenMetaverse.MeanCollisionType.PhysicalObjectCollide">
+        <member name="M:OpenMetaverse.CapsEventDictionary.BeginRaiseEvent(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <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>
         </member>
-        <member name="T:OpenMetaverse.ScriptControlChange">
+        <member name="T:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper">
             <summary>
-            Flags sent when a script takes or releases a control
+            Object that is passed to worker threads in the ThreadPool for
+            firing CAPS callbacks
             </summary>
-            <remarks>NOTE: (need to verify) These might be a subset of the ControlFlags enum in Movement,</remarks>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.None">
-            <summary>No Flags set</summary>
+        <member name="F:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper.Callback">
+            <summary>Callback to fire for this packet</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.Forward">
-            <summary>Forward (W or up Arrow)</summary>
+        <member name="F:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper.CapsEvent">
+            <summary>Name of the CAPS event</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.Back">
-            <summary>Back (S or down arrow)</summary>
+        <member name="F:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper.Message">
+            <summary>Strongly typed decoded data</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.Left">
-            <summary>Move left (shift+A or left arrow)</summary>
+        <member name="F:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper.Simulator">
+            <summary>Reference to the simulator that generated this event</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.Right">
-            <summary>Move right (shift+D or right arrow)</summary>
+        <member name="T:OpenMetaverse.DownloadRequest">
+            <summary>
+            Represends individual HTTP Download request
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.Up">
-            <summary>Up (E or PgUp)</summary>
+        <member name="F:OpenMetaverse.DownloadRequest.Address">
+            <summary>URI of the item to fetch</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.Down">
-            <summary>Down (C or PgDown)</summary>
+        <member name="F:OpenMetaverse.DownloadRequest.MillisecondsTimeout">
+            <summary>Timout specified in milliseconds</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.RotateLeft">
-            <summary>Rotate left (A or left arrow)</summary>
+        <member name="F:OpenMetaverse.DownloadRequest.DownloadProgressCallback">
+            <summary>Download progress callback</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.RotateRight">
-            <summary>Rotate right (D or right arrow)</summary>
+        <member name="F:OpenMetaverse.DownloadRequest.CompletedCallback">
+            <summary>Download completed callback</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.LeftButton">
-            <summary>Left Mouse Button</summary>
+        <member name="F:OpenMetaverse.DownloadRequest.ContentType">
+            <summary>Accept the following content type</summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptControlChange.MouseLookLeftButton">
-            <summary>Left Mouse button in MouseLook</summary>
+        <member name="F:OpenMetaverse.DownloadRequest.Retries">
+            <summary>How many times will this request be retried</summary>
         </member>
-        <member name="T:OpenMetaverse.AgentFlags">
+        <member name="F:OpenMetaverse.DownloadRequest.Attempt">
+            <summary>Current fetch attempt</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">
             <summary>
-            Currently only used to hide your group title
+            Manages async HTTP downloads with a limit on maximum
+            concurrent downloads
             </summary>
         </member>
-        <member name="F:OpenMetaverse.AgentFlags.None">
-            <summary>No flags set</summary>
+        <member name="M:OpenMetaverse.DownloadManager.#ctor">
+            <summary>Default constructor</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentFlags.HideTitle">
-            <summary>Hide your group title</summary>
+        <member name="M:OpenMetaverse.DownloadManager.Dispose">
+            <summary>Cleanup method</summary>
         </member>
-        <member name="T:OpenMetaverse.AgentState">
+        <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="T:OpenMetaverse.BinBVHAnimationReader">
             <summary>
-            Action state of the avatar, which can currently be typing and
-            editing
+            Reads in a byte array of an Animation Asset created by the SecondLife(tm) client.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.AgentState.None">
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.rotationkeys">
             <summary>
+            Rotation Keyframe count (used internally)
             </summary>
         </member>
-        <member name="F:OpenMetaverse.AgentState.Typing">
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.positionkeys">
             <summary>
+            Position Keyframe count (used internally)
             </summary>
         </member>
-        <member name="F:OpenMetaverse.AgentState.Editing">
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.Priority">
             <summary>
+            Animation Priority
             </summary>
         </member>
-        <member name="T:OpenMetaverse.TeleportStatus">
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.Length">
             <summary>
-            Current teleport status
+            The animation length in seconds.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportStatus.None">
-            <summary>Unknown status</summary>
-        </member>
-        <member name="F:OpenMetaverse.TeleportStatus.Start">
-            <summary>Teleport initialized</summary>
-        </member>
-        <member name="F:OpenMetaverse.TeleportStatus.Progress">
-            <summary>Teleport in progress</summary>
-        </member>
-        <member name="F:OpenMetaverse.TeleportStatus.Failed">
-            <summary>Teleport failed</summary>
-        </member>
-        <member name="F:OpenMetaverse.TeleportStatus.Finished">
-            <summary>Teleport completed</summary>
-        </member>
-        <member name="F:OpenMetaverse.TeleportStatus.Cancelled">
-            <summary>Teleport cancelled</summary>
-        </member>
-        <member name="T:OpenMetaverse.TeleportFlags">
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.ExpressionName">
             <summary>
+            Expression set in the client.  Null if [None] is selected
             </summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.Default">
-            <summary>No flags set, or teleport failed</summary>
-        </member>
-        <member name="F:OpenMetaverse.TeleportFlags.SetHomeToTarget">
-            <summary>Set when newbie leaves help island for first time</summary>
-        </member>
-        <member name="F:OpenMetaverse.TeleportFlags.SetLastToTarget">
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.InPoint">
             <summary>
+            The time in seconds to start the animation
             </summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ViaLure">
-            <summary>Via Lure</summary>
-        </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ViaLandmark">
-            <summary>Via Landmark</summary>
-        </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ViaLocation">
-            <summary>Via Location</summary>
-        </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ViaHome">
-            <summary>Via Home</summary>
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.OutPoint">
+            <summary>
+            The time in seconds to end the animation
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ViaTelehub">
-            <summary>Via Telehub</summary>
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.Loop">
+            <summary>
+            Loop the animation
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ViaLogin">
-            <summary>Via Login</summary>
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.EaseInTime">
+            <summary>
+            Meta data. Ease in Seconds.
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ViaGodlikeLure">
-            <summary>Linden Summoned</summary>
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.EaseOutTime">
+            <summary>
+            Meta data. Ease out seconds.
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.Godlike">
-            <summary>Linden Forced me</summary>
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.HandPose">
+            <summary>
+            Meta Data for the Hand Pose
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.NineOneOne">
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.JointCount">
             <summary>
+            Number of joints defined in the animation
             </summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.DisableCancel">
-            <summary>Agent Teleported Home via Script</summary>
+        <member name="F:OpenMetaverse.BinBVHAnimationReader.joints">
+            <summary>
+            Contains an array of joints
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.ViaRegionID">
+        <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.TeleportFlags.IsFlying">
+        <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="F:OpenMetaverse.TeleportFlags.ResetHome">
+        <member name="M:OpenMetaverse.BinBVHAnimationReader.readJoint(System.Byte[],System.Int32@)">
             <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="F:OpenMetaverse.TeleportFlags.ForceRedirect">
-            <summary>forced to new location for example when avatar is banned or ejected</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="M:OpenMetaverse.BinBVHAnimationReader.Equals(System.Object)">
+            <summary> 
+            Determines whether the specified <see cref="T:System.Object"/> is equal to the current <see cref="T:System.Object"/>. 
+            </summary> 
+            <returns> 
+            true if the specified <see cref="T:System.Object"/> is equal to the current <see cref="T:System.Object"/>; otherwise, false. 
+            </returns> 
+            <param name="obj">The <see cref="T:System.Object"/> to compare with the current <see cref="T:System.Object"/>.  
+                            </param><exception cref="T:System.NullReferenceException">The <paramref name="obj"/> parameter is null. 
+                            </exception><filterpriority>2</filterpriority> 
+        </member>
+        <member name="M:OpenMetaverse.BinBVHAnimationReader.GetHashCode">
+            <summary>
+            Serves as a hash function for a particular type.  
+            </summary> 
+            <returns> 
+            A hash code for the current <see cref="T:System.Object"/>. 
+            </returns> 
+            <filterpriority>2</filterpriority> 
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.FinishedViaLure">
-            <summary>Teleport Finished via a Lure</summary>
+        <member name="T:OpenMetaverse.binBVHJoint">
+            <summary> 
+            A Joint and it's associated meta data and keyframes
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.FinishedViaNewSim">
-            <summary>Finished, Sim Changed</summary>
+        <member name="M:OpenMetaverse.binBVHJoint.Equals(System.Object)">
+            <summary> 
+            Indicates whether this instance and a specified object are equal. 
+            </summary> 
+            <returns> 
+            true if <paramref name="obj"/> and this instance are the same type and represent the same value; otherwise, false. 
+            </returns> 
+            <param name="obj">Another object to compare to.  
+                            </param><filterpriority>2</filterpriority> 
+        </member>
+        <member name="M:OpenMetaverse.binBVHJoint.GetHashCode">
+            <summary> 
+            Returns the hash code for this instance. 
+            </summary> 
+            <returns> 
+            A 32-bit signed integer that is the hash code for this instance. 
+            </returns> 
+            <filterpriority>2</filterpriority> 
         </member>
-        <member name="F:OpenMetaverse.TeleportFlags.FinishedViaSameSim">
-            <summary>Finished, Same Sim</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.TeleportLureFlags">
+        <member name="F:OpenMetaverse.binBVHJoint.Priority">
             <summary>
+            Joint Animation Override?   Was the same as the Priority in testing.. 
             </summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportLureFlags.NormalLure">
+        <member name="F:OpenMetaverse.binBVHJoint.rotationkeys">
             <summary>
+            Array of Rotation Keyframes in order from earliest to latest
             </summary>
         </member>
-        <member name="F:OpenMetaverse.TeleportLureFlags.GodlikeLure">
+        <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.TeleportLureFlags.GodlikePursuit">
+        <member name="F:OpenMetaverse.binBVHJoint.Tag">
             <summary>
+            Custom application data that can be attached to a joint
             </summary>
         </member>
-        <member name="T:OpenMetaverse.ScriptSensorTypeFlags">
+        <member name="T:OpenMetaverse.binBVHJointKey">
             <summary>
+            A Joint Keyframe.  This is either a position or a rotation.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptSensorTypeFlags.Agent">
+        <member name="F:OpenMetaverse.binBVHJointKey.key_element">
             <summary>
+            Either a Vector3 position or a Vector3 Euler rotation
             </summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptSensorTypeFlags.Active">
+        <member name="T:OpenMetaverse.HandPose">
             <summary>
+            Poses set in the animation metadata for the hands.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.ScriptSensorTypeFlags.Passive">
+        <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="F:OpenMetaverse.AgentDisplayName.Updated">
+            <summary> Last updated timestamp </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="F:OpenMetaverse.ScriptSensorTypeFlags.Scripted">
+        <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.MuteType">
+        <member name="P:OpenMetaverse.AgentDisplayName.LegacyFullName">
+            <summary> Full name (legacy) </summary>
+        </member>
+        <member name="T:OpenMetaverse.AvatarGroup">
             <summary>
-            Type of mute entry
+            Holds group information for Avatars such as those you might find in a profile
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MuteType.ByName">
-            <summary>Object muted by name</summary>
+        <member name="F:OpenMetaverse.AvatarGroup.AcceptNotices">
+            <summary>true of Avatar accepts group notices</summary>
         </member>
-        <member name="F:OpenMetaverse.MuteType.Resident">
-            <summary>Muted residet</summary>
+        <member name="F:OpenMetaverse.AvatarGroup.GroupID">
+            <summary>Groups Key</summary>
         </member>
-        <member name="F:OpenMetaverse.MuteType.Object">
-            <summary>Object muted by UUID</summary>
+        <member name="F:OpenMetaverse.AvatarGroup.GroupInsigniaID">
+            <summary>Texture Key for groups insignia</summary>
         </member>
-        <member name="F:OpenMetaverse.MuteType.Group">
-            <summary>Muted group</summary>
+        <member name="F:OpenMetaverse.AvatarGroup.GroupName">
+            <summary>Name of the group</summary>
         </member>
-        <member name="F:OpenMetaverse.MuteType.External">
-            <summary>Muted external entry</summary>
+        <member name="F:OpenMetaverse.AvatarGroup.GroupPowers">
+            <summary>Powers avatar has in the group</summary>
         </member>
-        <member name="T:OpenMetaverse.MuteFlags">
-            <summary>
-            Flags of mute entry
-            </summary>
+        <member name="F:OpenMetaverse.AvatarGroup.GroupTitle">
+            <summary>Avatars Currently selected title</summary>
         </member>
-        <member name="F:OpenMetaverse.MuteFlags.Default">
-            <summary>No exceptions</summary>
+        <member name="F:OpenMetaverse.AvatarGroup.ListInProfile">
+            <summary>true of Avatar has chosen to list this in their profile</summary>
         </member>
-        <member name="F:OpenMetaverse.MuteFlags.TextChat">
-            <summary>Don't mute text chat</summary>
+        <member name="T:OpenMetaverse.Animation">
+            <summary>
+            Contains an animation currently being played by an agent
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.MuteFlags.VoiceChat">
-            <summary>Don't mute voice chat</summary>
+        <member name="F:OpenMetaverse.Animation.AnimationID">
+            <summary>The ID of the animation asset</summary>
         </member>
-        <member name="F:OpenMetaverse.MuteFlags.Particles">
-            <summary>Don't mute particles</summary>
+        <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.MuteFlags.ObjectSounds">
-            <summary>Don't mute sounds</summary>
+        <member name="F:OpenMetaverse.Animation.AnimationSourceObjectID">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MuteFlags.All">
-            <summary>Don't mute</summary>
+        <member name="T:OpenMetaverse.ProfilePick">
+            <summary>
+            Holds group information on an individual profile pick
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.InstantMessage">
+        <member name="T:OpenMetaverse.AvatarManager">
             <summary>
-            Instant Message
+            Retrieve friend status notifications, and retrieve avatar names and
+            profiles
             </summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.FromAgentID">
-            <summary>Key of sender</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarAnimation">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.FromAgentName">
-            <summary>Name of sender</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="F:OpenMetaverse.InstantMessage.ToAgentID">
-            <summary>Key of destination avatar</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarAnimationLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.ParentEstateID">
-            <summary>ID of originating estate</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarAppearance">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.RegionID">
-            <summary>Key of originating region</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="F:OpenMetaverse.InstantMessage.Position">
-            <summary>Coordinates in originating region</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarAppearanceLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.Dialog">
-            <summary>Instant message type</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_UUIDNameReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.GroupIM">
-            <summary>Group IM session toggle</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="F:OpenMetaverse.InstantMessage.IMSessionID">
-            <summary>Key of IM session, for Group Messages, the groups UUID</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_UUIDNameReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.Timestamp">
-            <summary>Timestamp of the instant message</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarInterestsReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.Message">
-            <summary>Instant message text</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="F:OpenMetaverse.InstantMessage.Offline">
-            <summary>Whether this message is held for offline avatars</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarInterestsReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.InstantMessage.BinaryBucket">
-            <summary>Context specific packed data</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPropertiesReply">
+            <summary>The event subscribers, null of no subscribers</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="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="T:OpenMetaverse.MuteEntry">
-            <summary>Represents muted object or resident</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPropertiesReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.MuteEntry.Type">
-            <summary>Type of the mute entry</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarGroupsReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.MuteEntry.ID">
-            <summary>UUID of the mute etnry</summary>
+        <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="F:OpenMetaverse.MuteEntry.Name">
-            <summary>Mute entry name</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarGroupsReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.MuteEntry.Flags">
-            <summary>Mute flags</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPickerReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.TransactionInfo">
-            <summary>Transaction detail sent with MoneyBalanceReply message</summary>
+        <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="F:OpenMetaverse.TransactionInfo.TransactionType">
-            <summary>Type of the transaction</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPickerReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.TransactionInfo.SourceID">
-            <summary>UUID of the transaction source</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffectPointAt">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.TransactionInfo.IsSourceGroup">
-            <summary>Is the transaction source a group</summary>
+        <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="F:OpenMetaverse.TransactionInfo.DestID">
-            <summary>UUID of the transaction destination</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffectPointAtLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.TransactionInfo.IsDestGroup">
-            <summary>Is transaction destination a group</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffectLookAt">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.TransactionInfo.Amount">
-            <summary>Transaction amount</summary>
+        <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="F:OpenMetaverse.TransactionInfo.ItemDescription">
-            <summary>Transaction description</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffectLookAtLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.AgentManager">
-            <summary>
-            Manager class for our own avatar
-            </summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffect">
+            <summary>The event subscribers, null of no subscribers</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.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="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 name="F:OpenMetaverse.AvatarManager.m_ViewerEffectLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.AgentManager.AgentMovement.#ctor(OpenMetaverse.GridClient)">
-            <summary>Default constructor</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPicksReply">
+            <summary>The event subscribers, null of no subscribers</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 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.AgentManager.AgentMovement.AgentCamera.#ctor">
-            <summary>
-            Default constructor
-            </summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPicksReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.Far">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_PickInfoReply">
+            <summary>The event subscribers, null of no subscribers</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 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="P:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.Position">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_PickInfoReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.AtAxis">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarClassifiedReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.LeftAxis">
-            <summary>
-            </summary>
+        <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="P:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.UpAxis">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_AvatarClassifiedReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.Camera">
-            <summary>Agent camera controls</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_ClassifiedInfoReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.Flags">
-            <summary>Currently only used for hiding your group title</summary>
+        <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="F:OpenMetaverse.AgentManager.AgentMovement.State">
-            <summary>Action state of the avatar, which can currently be
-            typing and editing</summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_ClassifiedInfoReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.BodyRotation">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_DisplayNameUpdate">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.HeadRotation">
-            <summary>
-            </summary>
+        <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="F:OpenMetaverse.AgentManager.AgentMovement.LastBodyRotation">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.AvatarManager.m_DisplayNameUpdateLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastHeadRotation">
+        <member name="M:OpenMetaverse.AvatarManager.#ctor(OpenMetaverse.GridClient)">
             <summary>
+            Represents other avatars
             </summary>
+            <param name="client"></param>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastCameraCenter">
+        <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>
+            Request a single avatar name
             </summary>
+            <param name="id">The avatar key to retrieve a name for</param>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.LastCameraXAxis">
+        <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.AgentManager.AgentMovement.LastCameraYAxis">
+        <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.AgentManager.AgentMovement.LastCameraZAxis">
+        <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.AgentManager.AgentMovement.LastFar">
+        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarProperties(OpenMetaverse.UUID)">
             <summary>
+            Start a request for Avatar Properties
             </summary>
+            <param name="avatarid"></param>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.AgentMovement.updateTimer">
-            <summary>Timer for sending AgentUpdate packets</summary>
-        </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">
+        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarNameSearch(System.String,OpenMetaverse.UUID)">
             <summary>
+            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="P:OpenMetaverse.AgentManager.AgentMovement.PitchNeg">
+        <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="P:OpenMetaverse.AgentManager.AgentMovement.YawPos">
+        <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="P:OpenMetaverse.AgentManager.AgentMovement.YawNeg">
+        <member name="M:OpenMetaverse.AvatarManager.RequestPickInfo(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
+            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="P:OpenMetaverse.AgentManager.AgentMovement.FastAt">
+        <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="P:OpenMetaverse.AgentManager.AgentMovement.FastLeft">
+        <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="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="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="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="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="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="P:OpenMetaverse.AgentManager.AgentMovement.FastUp">
+        <member name="M:OpenMetaverse.AvatarManager.AvatarGroupsReplyMessageHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <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.
             </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="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 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="P:OpenMetaverse.AgentManager.AgentMovement.StandUp">
-            <summary>Stand up from a sit</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="P:OpenMetaverse.AgentManager.AgentMovement.SitOnGround">
-            <summary>Tells simulator to sit agent on ground</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="P:OpenMetaverse.AgentManager.AgentMovement.Mouselook">
-            <summary>Place agent into mouselook mode</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="P:OpenMetaverse.AgentManager.AgentMovement.NudgeAtPos">
-            <summary>Nudge agent positive along the X axis</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="P:OpenMetaverse.AgentManager.AgentMovement.NudgeAtNeg">
-            <summary>Nudge agent negative along the X axis</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="P:OpenMetaverse.AgentManager.AgentMovement.NudgeLeftPos">
-            <summary>Nudge agent positive along the Y axis</summary>
+        <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="P:OpenMetaverse.AgentManager.AgentMovement.NudgeLeftNeg">
-            <summary>Nudge agent negative along the Y axis</summary>
+        <member name="E:OpenMetaverse.AvatarManager.AvatarAnimation">
+            <summary>Raised when the simulator sends us data containing
+            an agents animation playlist</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.NudgeUpPos">
-            <summary>Nudge agent positive along the Z axis</summary>
+        <member name="E:OpenMetaverse.AvatarManager.AvatarAppearance">
+            <summary>Raised when the simulator sends us data containing
+            the appearance information for an agent</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.NudgeUpNeg">
-            <summary>Nudge agent negative along the Z axis</summary>
+        <member name="E:OpenMetaverse.AvatarManager.UUIDNameReply">
+            <summary>Raised when the simulator sends us data containing
+            agent names/id values</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.TurnLeft">
-            <summary>
-            </summary>
+        <member name="E:OpenMetaverse.AvatarManager.AvatarInterestsReply">
+            <summary>Raised when the simulator sends us data containing
+            the interests listed in an agents profile</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.TurnRight">
-            <summary>
-            </summary>
+        <member name="E:OpenMetaverse.AvatarManager.AvatarPropertiesReply">
+            <summary>Raised when the simulator sends us data containing
+            profile property information for an agent</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.Away">
-            <summary>Tell simulator to mark agent as away</summary>
+        <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>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.LButtonDown">
-            <summary>
-            </summary>
+        <member name="E:OpenMetaverse.AvatarManager.AvatarPickerReply">
+            <summary>Raised when the simulator sends us data containing
+            name/id pair</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.LButtonUp">
-            <summary>
-            </summary>
+        <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>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.MLButtonDown">
-            <summary>
-            </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.AgentManager.AgentMovement.MLButtonUp">
-            <summary>
-            </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.AgentManager.AgentMovement.AlwaysRun">
-            <summary>
-            Returns "always run" value, or changes it by sending a SetAlwaysRunPacket
-            </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.AgentManager.AgentMovement.AgentControls">
-            <summary>The current value of the agent control flags</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.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 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="P:OpenMetaverse.AgentManager.AgentMovement.UpdateEnabled">
-            <summary>Gets or sets whether AgentUpdate packets are sent to
-            the current simulator</summary>
+        <member name="E:OpenMetaverse.AvatarManager.ClassifiedInfoReply">
+            <summary>Raised when the simulator sends us data containing
+            the details of a classified ad</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AutoResetControls">
-            <summary>Reset movement controls every time we send an update</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="M:OpenMetaverse.AgentManager.AgentMovement.UpdateFromHeading(System.Double,System.Boolean)">
+        <member name="T:OpenMetaverse.AvatarManager.DisplayNamesCallback">
             <summary>
-            Send an AgentUpdate with the camera set at the current agent
-            position and pointing towards the heading specified
+            Callback giving results when fetching display names
             </summary>
-            <param name="heading">Camera rotation in radians</param>
-            <param name="reliable">Whether to send the AgentUpdate reliable
-            or not</param>
+            <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="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 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.AgentManager.AgentMovement.SendUpdate">
+        <member name="M:OpenMetaverse.AvatarAnimationEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.Animation})">
             <summary>
-            Send new AgentUpdate packet to update our current camera
-            position and rotation
+            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="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 name="P:OpenMetaverse.AvatarAnimationEventArgs.AvatarID">
+            <summary>Get the ID of the agent</summary>
         </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 name="P:OpenMetaverse.AvatarAnimationEventArgs.Animations">
+            <summary>Get the list of animations to start</summary>
         </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 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="T:OpenMetaverse.AgentManager.ControlFlags">
+        <member name="M:OpenMetaverse.AvatarAppearanceEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.UUID,System.Boolean,OpenMetaverse.Primitive.TextureEntryFace,OpenMetaverse.Primitive.TextureEntryFace[],System.Collections.Generic.List{System.Byte},System.Byte,System.Int32,OpenMetaverse.AppearanceFlags)">
             <summary>
-            Used to specify movement actions for your agent
+            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="P:OpenMetaverse.AvatarAppearanceEventArgs.VisualParams"/> for the agent</param>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.NONE">
-            <summary>Empty flag</summary>
+        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.Simulator">
+            <summary>Get the Simulator this request is from of the agent</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_AT_POS">
-            <summary>Move Forward (SL Keybinding: W/Up Arrow)</summary>
+        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.AvatarID">
+            <summary>Get the ID of the agent</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_AT_NEG">
-            <summary>Move Backward (SL Keybinding: S/Down Arrow)</summary>
+        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.IsTrial">
+            <summary>true if the agent is a trial account</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_LEFT_POS">
-            <summary>Move Left (SL Keybinding: Shift-(A/Left Arrow))</summary>
+        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.DefaultTexture">
+            <summary>Get the default agent texture</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_LEFT_NEG">
-            <summary>Move Right (SL Keybinding: Shift-(D/Right Arrow))</summary>
+        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.FaceTextures">
+            <summary>Get the agents appearance layer textures</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_UP_POS">
-            <summary>Not Flying: Jump/Flying: Move Up (SL Keybinding: E)</summary>
+        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.VisualParams">
+            <summary>Get the <see cref="P:OpenMetaverse.AvatarAppearanceEventArgs.VisualParams"/> for the agent</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG">
-            <summary>Not Flying: Croutch/Flying: Move Down (SL Keybinding: C)</summary>
+        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.AppearanceVersion">
+            <summary>Version of the appearance system used.
+            Value greater than 0 indicates that server side baking is used</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_PITCH_POS">
-            <summary>Unused</summary>
+        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.COFVersion">
+            <summary>Version of the Current Outfit Folder the appearance is based on</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_PITCH_NEG">
-            <summary>Unused</summary>
+        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.AppearanceFlags">
+            <summary>Appearance flags, introduced with server side baking, currently unused</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_YAW_POS">
-            <summary>Unused</summary>
+        <member name="T:OpenMetaverse.AvatarInterestsReplyEventArgs">
+            <summary>Represents the interests from the profile of an agent</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_YAW_NEG">
-            <summary>Unused</summary>
+        <member name="P:OpenMetaverse.AvatarInterestsReplyEventArgs.AvatarID">
+            <summary>Get the ID of the agent</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 name="T:OpenMetaverse.AvatarPropertiesReplyEventArgs">
+            <summary>The properties of an agent</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 name="P:OpenMetaverse.AvatarPropertiesReplyEventArgs.AvatarID">
+            <summary>Get the ID of the agent</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 name="P:OpenMetaverse.AvatarGroupsReplyEventArgs.AvatarID">
+            <summary>Get the ID of the agent</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_FLY">
-            <summary>Fly</summary>
+        <member name="P:OpenMetaverse.AvatarPicksReplyEventArgs.AvatarID">
+            <summary>Get the ID of the agent</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_STOP">
+        <member name="P:OpenMetaverse.AvatarClassifiedReplyEventArgs.AvatarID">
+            <summary>Get the ID of the avatar</summary>
+        </member>
+        <member name="T:OpenMetaverse.DisplayNameUpdateEventArgs">
             <summary>
+            Event args class for display name notification messages
             </summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_FINISH_ANIM">
-            <summary>Finish our current animation</summary>
+        <member name="T:OpenMetaverse.Assets.AssetPrim">
+            <summary>
+            A linkset asset, containing a parent primitive and zero or more children
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP">
-            <summary>Stand up from the ground or a prim seat</summary>
+        <member name="T:OpenMetaverse.Assets.Asset">
+            <summary>
+            Base class for all Asset types
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_SIT_ON_GROUND">
-            <summary>Sit on the ground at our current location</summary>
+        <member name="F:OpenMetaverse.Assets.Asset.AssetData">
+            <summary>A byte array containing the raw asset data</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK">
-            <summary>Whether mouselook is currently enabled</summary>
+        <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.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 name="F:OpenMetaverse.Assets.Asset._AssetID">
+            <summary>A unique ID</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 name="M:OpenMetaverse.Assets.Asset.#ctor">
+            <summary>
+            Construct a new Asset object
+            </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 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="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 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="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 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="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 name="P:OpenMetaverse.Assets.Asset.AssetID">
+            <summary>The assets unique ID</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_TURN_LEFT">
+        <member name="P:OpenMetaverse.Assets.Asset.AssetType">
             <summary>
+            The "type" of asset, Notecard, Animation, etc
             </summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_TURN_RIGHT">
+        <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>
+            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="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 name="M:OpenMetaverse.Assets.AssetPrim.Encode">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_LBUTTON_DOWN">
+        <member name="M:OpenMetaverse.Assets.AssetPrim.Decode">
             <summary>
+            
             </summary>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_LBUTTON_UP">
+        <member name="P:OpenMetaverse.Assets.AssetPrim.AssetType">
+            <summary>Override the base classes AssetType</summary>
+        </member>
+        <member name="T:OpenMetaverse.Assets.AssetPrim.ProfileShape">
             <summary>
+            Only used internally for XML serialization/deserialization
             </summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_ML_LBUTTON_DOWN">
+        <member name="T:OpenMetaverse.Assets.PrimObject">
             <summary>
+            The deserialized form of a single primitive in a linkset asset
             </summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_ML_LBUTTON_UP">
+        <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="T:OpenMetaverse.AgentManager.AttachmentResourcesCallback">
+        <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="M:OpenMetaverse.EstateTools.#ctor(OpenMetaverse.GridClient)">
             <summary>
-            Called once attachment resource usage information has been collected
+            Constructor for EstateTools class
             </summary>
-            <param name="success">Indicates if operation was successfull</param>
-            <param name="info">Attachment resource usage information</param>
+            <param name="client"></param>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_Chat">
+        <member name="F:OpenMetaverse.EstateTools.m_TopCollidersReply">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ChatLock">
+        <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="F:OpenMetaverse.EstateTools.m_TopCollidersReply_Lock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ScriptDialog">
+        <member name="F:OpenMetaverse.EstateTools.m_TopScriptsReply">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ScriptDialogLock">
+        <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="F:OpenMetaverse.EstateTools.m_TopScriptsReply_Lock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ScriptQuestion">
+        <member name="F:OpenMetaverse.EstateTools.m_EstateUsersReply">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ScriptQuestionLock">
+        <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="F:OpenMetaverse.EstateTools.m_EstateUsersReply_Lock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_LoadURL">
+        <member name="F:OpenMetaverse.EstateTools.m_EstateGroupsReply">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_LoadUrlLock">
+        <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="F:OpenMetaverse.EstateTools.m_EstateGroupsReply_Lock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_Balance">
+        <member name="F:OpenMetaverse.EstateTools.m_EstateManagersReply">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_BalanceLock">
+        <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="F:OpenMetaverse.EstateTools.m_EstateManagersReply_Lock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_MoneyBalance">
+        <member name="F:OpenMetaverse.EstateTools.m_EstateBansReply">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_MoneyBalanceReplyLock">
+        <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="F:OpenMetaverse.EstateTools.m_EstateBansReply_Lock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_InstantMessage">
+        <member name="F:OpenMetaverse.EstateTools.m_EstateCovenantReply">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_InstantMessageLock">
+        <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="F:OpenMetaverse.EstateTools.m_EstateCovenantReply_Lock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_Teleport">
+        <member name="F:OpenMetaverse.EstateTools.m_EstateUpdateInfoReply">
             <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_TeleportLock">
+        <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="F:OpenMetaverse.EstateTools.m_EstateUpdateInfoReply_Lock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_AgentData">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <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="F:OpenMetaverse.AgentManager.m_AgentDataLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.EstateTools.RequestInfo">
+            <summary>Requests estate settings, including estate manager and access/ban lists</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_AnimationsChanged">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="M:OpenMetaverse.EstateTools.RequestTopScripts">
+            <summary>Requests the "Top Scripts" list for the current region</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_AnimationsChangedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.EstateTools.RequestTopColliders">
+            <summary>Requests the "Top Colliders" list for the current region</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_MeanCollision">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <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="F:OpenMetaverse.AgentManager.m_MeanCollisionLock">
-            <summary>Thread sync lock object</summary>
+        <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="F:OpenMetaverse.AgentManager.m_RegionCrossed">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="M:OpenMetaverse.EstateTools.EstateOwnerMessage(System.String,System.String)">
+            <summary></summary>
+            <param name="method"></param>
+            <param name="param"></param>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_RegionCrossedLock">
-            <summary>Thread sync lock object</summary>
+        <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="F:OpenMetaverse.AgentManager.m_GroupChatJoined">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <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="F:OpenMetaverse.AgentManager.m_GroupChatJoinedLock">
-            <summary>Thread sync lock object</summary>
+        <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="F:OpenMetaverse.AgentManager.m_AlertMessage">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <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="F:OpenMetaverse.AgentManager.m_AlertMessageLock">
-            <summary>Thread sync lock object</summary>
+        <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="F:OpenMetaverse.AgentManager.m_ScriptControl">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <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="F:OpenMetaverse.AgentManager.m_ScriptControlLock">
-            <summary>Thread sync lock object</summary>
+        <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="F:OpenMetaverse.AgentManager.m_CameraConstraint">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="M:OpenMetaverse.EstateTools.RestartRegion">
+            <summary>
+            Begin the region restart process
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_CameraConstraintLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.EstateTools.CancelRestart">
+            <summary>
+            Cancels a region restart
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ScriptSensorReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <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="F:OpenMetaverse.AgentManager.m_ScriptSensorReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="M:OpenMetaverse.EstateTools.SetRegionDebug(System.Boolean,System.Boolean,System.Boolean)">
+            <summary>Estate panel "Debug" tab settings</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_AvatarSitResponse">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <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="F:OpenMetaverse.AgentManager.m_AvatarSitResponseLock">
-            <summary>Thread sync lock object</summary>
+        <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="F:OpenMetaverse.AgentManager.m_ChatSessionMemberAdded">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="M:OpenMetaverse.EstateTools.RequestCovenant">
+            <summary>Requests the estate covenant</summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ChatSessionMemberAddedLock">
-            <summary>Thread sync lock object</summary>
+        <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="F:OpenMetaverse.AgentManager.m_ChatSessionMemberLeft">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="M:OpenMetaverse.EstateTools.TeleportHomeAllUsers">
+            <summary>
+            Teleports all users home in current Estate
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AgentManager.m_ChatSessionMemberLeftLock">
-            <summary>Thread sync lock object</summary>
+        <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="F:OpenMetaverse.AgentManager.m_SetDisplayNameReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <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="F:OpenMetaverse.AgentManager.m_SetDisplayNameReplyLock">
-            <summary>Thread sync lock object</summary>
+        <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="F:OpenMetaverse.AgentManager.m_MuteListUpdated">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <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="F:OpenMetaverse.AgentManager.m_MuteListUpdatedLock">
-            <summary>Thread sync lock object</summary>
+        <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="F:OpenMetaverse.AgentManager.Client">
-            <summary>Reference to the GridClient instance</summary>
+        <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="F:OpenMetaverse.AgentManager.Movement">
-            <summary>Used for movement and camera tracking</summary>
+        <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="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 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="F:OpenMetaverse.AgentManager.GroupChatSessions">
-            <summary>Dictionary containing current Group Chat sessions and members</summary>
+        <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="F:OpenMetaverse.AgentManager.MuteList">
-            <summary>Dictionary containing mute list keyead on mute name and key</summary>
+        <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.AgentManager.ChatFromSimulator">
-            <summary>Raised when a scripted object or agent within range sends a public message</summary>
+        <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.AgentManager.ScriptDialog">
-            <summary>Raised when a scripted object sends a dialog box containing possible
-            options an agent can respond to</summary>
+        <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.AgentManager.ScriptQuestion">
-            <summary>Raised when an object requests a change in the permissions an agent has permitted</summary>
+        <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.AgentManager.LoadURL">
-            <summary>Raised when a script requests an agent open the specified URL</summary>
+        <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.AgentManager.MoneyBalance">
-            <summary>Raised when an agents currency balance is updated</summary>
+        <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.AgentManager.MoneyBalanceReply">
-            <summary>Raised when a transaction occurs involving currency such as a land purchase</summary>
+        <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.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 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="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 name="T:OpenMetaverse.EstateTools.LandStatReportType">
+            <summary>Used in the ReportType field of a LandStatRequest</summary>
         </member>
-        <member name="E:OpenMetaverse.AgentManager.AgentDataReply">
-            <summary>Raised when a simulator sends agent specific information for our avatar.</summary>
+        <member name="T:OpenMetaverse.EstateTools.EstateAccessDelta">
+            <summary>Used by EstateOwnerMessage packets</summary>
         </member>
-        <member name="E:OpenMetaverse.AgentManager.AnimationsChanged">
-            <summary>Raised when our agents animation playlist changes</summary>
+        <member name="T:OpenMetaverse.EstateTools.EstateAccessReplyDelta">
+            <summary>Used by EstateOwnerMessage packets</summary>
         </member>
-        <member name="E:OpenMetaverse.AgentManager.MeanCollision">
-            <summary>Raised when an object or avatar forcefully collides with our agent</summary>
+        <member name="T:OpenMetaverse.EstateTools.EstateReturnFlags">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.AgentManager.RegionCrossed">
-            <summary>Raised when our agent crosses a region border into another region</summary>
+        <member name="F:OpenMetaverse.EstateTools.EstateReturnFlags.None">
+            <summary>No flags set</summary>
         </member>
-        <member name="E:OpenMetaverse.AgentManager.GroupChatJoined">
-            <summary>Raised when our agent succeeds or fails to join a group chat session</summary>
+        <member name="F:OpenMetaverse.EstateTools.EstateReturnFlags.ReturnScripted">
+            <summary>Only return targets scripted objects</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 name="F:OpenMetaverse.EstateTools.EstateReturnFlags.ReturnOnOthersLand">
+            <summary>Only return targets objects if on others land</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 name="F:OpenMetaverse.EstateTools.EstateReturnFlags.ReturnScriptedAndOnOthers">
+            <summary>Returns target's scripted objects and objects on other parcels</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 name="T:OpenMetaverse.EstateTools.GroundTextureSettings">
+            <summary>Ground texture settings for each corner of the region</summary>
         </member>
-        <member name="E:OpenMetaverse.AgentManager.ScriptSensorReply">
-            <summary>Raised when a script sensor reply is received from a simulator</summary>
+        <member name="T:OpenMetaverse.EstateTools.GroundTextureHeight">
+            <summary>Used by GroundTextureHeightSettings</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 name="T:OpenMetaverse.EstateTools.GroundTextureHeightSettings">
+            <summary>The high and low texture thresholds for each corner of the sim</summary>
         </member>
-        <member name="E:OpenMetaverse.AgentManager.ChatSessionMemberAdded">
-            <summary>Raised when an avatar enters a group chat session we are participating in</summary>
+        <member name="T:OpenMetaverse.TopCollidersReplyEventArgs">
+            <summary>Raised on LandStatReply when the report type is for "top colliders"</summary>
         </member>
-        <member name="E:OpenMetaverse.AgentManager.ChatSessionMemberLeft">
-            <summary>Raised when an agent exits a group chat session we are participating in</summary>
+        <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="E:OpenMetaverse.AgentManager.SetDisplayNameReply">
-            <summary>Raised when the simulator sends us data containing
-            the details of display name change</summary>
+        <member name="P:OpenMetaverse.TopCollidersReplyEventArgs.ObjectCount">
+            <summary>
+            The number of returned items in LandStatReply
+            </summary>
         </member>
-        <member name="E:OpenMetaverse.AgentManager.MuteListUpdated">
-            <summary>Raised when a scripted object or agent within range sends a public message</summary>
+        <member name="P:OpenMetaverse.TopCollidersReplyEventArgs.Tasks">
+            <summary>
+            A Dictionary of Object UUIDs to tasks returned in LandStatReply
+            </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 name="T:OpenMetaverse.TopScriptsReplyEventArgs">
+            <summary>Raised on LandStatReply when the report type is for "top Scripts"</summary>
         </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 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.AgentManager.SecureSessionID">
-            <summary>Shared secret <seealso cref="T:OpenMetaverse.UUID" /> that is never sent over the wire</summary>
+        <member name="P:OpenMetaverse.TopScriptsReplyEventArgs.ObjectCount">
+            <summary>
+            The number of scripts returned in LandStatReply
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.LocalID">
-            <summary>Your (client) avatar ID, local to the current region/sim</summary>
+        <member name="P:OpenMetaverse.TopScriptsReplyEventArgs.Tasks">
+            <summary>
+            A Dictionary of Object UUIDs to tasks returned in LandStatReply
+            </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 name="T:OpenMetaverse.EstateBansReplyEventArgs">
+            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.AgentAccess">
-            <summary>The access level of this agent, usually M or PG</summary>
+        <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.AgentManager.CollisionPlane">
-            <summary>The CollisionPlane of Agent</summary>
+        <member name="P:OpenMetaverse.EstateBansReplyEventArgs.EstateID">
+            <summary>
+            The identifier of the estate
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.Velocity">
-            <summary>An <seealso cref="T:OpenMetaverse.Vector3" /> representing the velocity of our agent</summary>
+        <member name="P:OpenMetaverse.EstateBansReplyEventArgs.Count">
+            <summary>
+            The number of returned itmes
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.Acceleration">
-            <summary>An <seealso cref="T:OpenMetaverse.Vector3" /> representing the acceleration of our agent</summary>
+        <member name="P:OpenMetaverse.EstateBansReplyEventArgs.Banned">
+            <summary>
+            List of UUIDs of Banned Users
+            </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 name="T:OpenMetaverse.EstateUsersReplyEventArgs">
+            <summary>Returned, along with other info, upon a successful .RequestInfo()</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 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.AgentManager.HomeLookAt">
-            <summary>LookAt point saved/restored with HomePosition</summary>
+        <member name="P:OpenMetaverse.EstateUsersReplyEventArgs.EstateID">
+            <summary>
+            The identifier of the estate
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.FirstName">
-            <summary>Avatar First Name (i.e. Philip)</summary>
+        <member name="P:OpenMetaverse.EstateUsersReplyEventArgs.Count">
+            <summary>
+            The number of returned items
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.LastName">
-            <summary>Avatar Last Name (i.e. Linden)</summary>
+        <member name="P:OpenMetaverse.EstateUsersReplyEventArgs.AllowedUsers">
+            <summary>
+            List of UUIDs of Allowed Users
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.Name">
-            <summary>Avatar Full Name (i.e. Philip Linden)</summary>
+        <member name="T:OpenMetaverse.EstateGroupsReplyEventArgs">
+            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.Health">
-            <summary>Gets the health of the agent</summary>
+        <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.AgentManager.Balance">
-            <summary>Gets the current balance of the agent</summary>
+        <member name="P:OpenMetaverse.EstateGroupsReplyEventArgs.EstateID">
+            <summary>
+            The identifier of the estate
+            </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 name="P:OpenMetaverse.EstateGroupsReplyEventArgs.Count">
+            <summary>
+            The number of returned items
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.ActiveGroup">
-            <summary>Gets the <seealso cref="T:OpenMetaverse.UUID" /> of the agents active group.</summary>
+        <member name="P:OpenMetaverse.EstateGroupsReplyEventArgs.AllowedGroups">
+            <summary>
+            List of UUIDs of Allowed Groups
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.ActiveGroupPowers">
-            <summary>Gets the Agents powers in the currently active group</summary>
+        <member name="T:OpenMetaverse.EstateManagersReplyEventArgs">
+            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.TeleportMessage">
-            <summary>Current status message for teleporting</summary>
+        <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.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 name="P:OpenMetaverse.EstateManagersReplyEventArgs.EstateID">
+            <summary>
+            The identifier of the estate
+            </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 name="P:OpenMetaverse.EstateManagersReplyEventArgs.Count">
+            <summary>
+            The number of returned items
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.SimPosition">
-            <summary>Current position of the agent in the simulator</summary>
+        <member name="P:OpenMetaverse.EstateManagersReplyEventArgs.Managers">
+            <summary>
+            List of UUIDs of the Estate's Managers
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.SimRotation">
+        <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>
-            A <seealso cref="T:OpenMetaverse.Quaternion" /> representing the agents current rotation
+            The Covenant
             </summary>
         </member>
-        <member name="P:OpenMetaverse.AgentManager.GlobalPosition">
-            <summary>Returns the global grid position of the avatar</summary>
+        <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.AgentManager">
+            <summary>
+            Manager class for our own avatar
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.AgentManager.m_Chat">
+            <summary>The event subscribers. null if no subcribers</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.m_SetDisplayNameReply">
+            <summary>The event subscribers, null of no subscribers</summary>
+        </member>
         <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>
+             <param name="e">A SetDisplayNameReplyEventArgs object containing
+             the data sent from the simulator</param>
+        </member>
+        <member name="F:OpenMetaverse.AgentManager.m_SetDisplayNameReplyLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.AgentManager.m_MuteListUpdated">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
         <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="F:OpenMetaverse.AgentManager.m_MuteListUpdatedLock">
+            <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>
+        <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="F:OpenMetaverse.AgentManager.MuteList">
+            <summary>Dictionary containing mute list keyead on mute name and key</summary>
+        </member>
+        <member name="F:OpenMetaverse.AgentManager.AgentStateStatus">
+            <summary>Various abilities and preferences sent by the grid</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>
         <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>
@@ -1837,15 +3056,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[])">
@@ -1877,8 +3096,7 @@
             <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)">
@@ -1886,96 +3104,84 @@
             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>
@@ -1984,13 +3190,12 @@
             <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">
@@ -2057,15 +3262,14 @@
             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>
@@ -2078,19 +3282,16 @@
             <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>
@@ -2104,9 +3305,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,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)" />
+            <seealso cref="F:OpenMetaverse.Simulator.ObjectsPrimitives"/>
+            <seealso cref="M:OpenMetaverse.AgentManager.Grab(System.UInt32)"/>
+            <seealso cref="M:OpenMetaverse.AgentManager.GrabUpdate(OpenMetaverse.UUID,OpenMetaverse.Vector3)"/>
         </member>
         <member name="M:OpenMetaverse.AgentManager.DeGrab(System.UInt32,OpenMetaverse.Vector3,OpenMetaverse.Vector3,System.Int32,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
             <summary>
@@ -2126,7 +3327,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>
@@ -2153,7 +3354,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>
@@ -2161,14 +3362,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>
@@ -2198,33 +3399,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>
@@ -2232,7 +3433,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>
@@ -2246,8 +3447,7 @@
             <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)">
@@ -2276,8 +3476,7 @@
             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>
@@ -2286,10 +3485,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="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>
@@ -2298,62 +3495,56 @@
             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>
@@ -2396,7 +3587,7 @@
             <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)">
@@ -2404,21 +3595,16 @@
             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>
@@ -2519,8 +3705,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>
@@ -2582,7 +3768,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.TeleportFailedEventHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <summary>
@@ -2622,7 +3808,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>
@@ -2636,28 +3822,23 @@
             </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>
@@ -2671,8 +3852,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>
@@ -2696,3348 +3877,4598 @@
             <param name="sender">The sender</param>
             <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="T:OpenMetaverse.ChatEventArgs">
+        <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="E:OpenMetaverse.AgentManager.SetDisplayNameReply">
+            <summary>Raised when the simulator sends us data containing
+            the details of display name change</summary>
+        </member>
+        <member name="E:OpenMetaverse.AgentManager.MuteListUpdated">
+            <summary>Raised when a scripted object or agent within range sends a public message</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="M:OpenMetaverse.ChatEventArgs.#ctor(OpenMetaverse.Simulator,System.String,OpenMetaverse.ChatAudibleLevel,OpenMetaverse.ChatType,OpenMetaverse.ChatSourceType,System.String,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.Vector3)">
+        <member name="P:OpenMetaverse.AgentManager.GlobalPosition">
+            <summary>Returns the global grid position of the avatar</summary>
+        </member>
+        <member name="T:OpenMetaverse.AgentManager.ControlFlags">
             <summary>
-            Construct a new instance of the ChatEventArgs object
+            Used to specify movement actions for your agent
             </summary>
-            <param name="simulator">Sim from which the message originates</param>
-            <param name="message">The message sent</param>
-            <param name="audible">The audible level of the message</param>
-            <param name="type">The type of message sent: whisper, shout, etc</param>
-            <param name="sourceType">The source type of the message sender</param>
-            <param name="fromName">The name of the agent or object sending the message</param>
-            <param name="sourceId">The ID of the agent or object sending the message</param>
-            <param name="ownerid">The ID of the object owner, or the agent ID sending the message</param>
-            <param name="position">The position of the agent or object sending the message</param>
         </member>
-        <member name="P:OpenMetaverse.ChatEventArgs.Simulator">
-            <summary>Get the simulator sending the message</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.NONE">
+            <summary>Empty flag</summary>
         </member>
-        <member name="P:OpenMetaverse.ChatEventArgs.Message">
-            <summary>Get the message sent</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_AT_POS">
+            <summary>Move Forward (SL Keybinding: W/Up Arrow)</summary>
         </member>
-        <member name="P:OpenMetaverse.ChatEventArgs.AudibleLevel">
-            <summary>Get the audible level of the message</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_AT_NEG">
+            <summary>Move Backward (SL Keybinding: S/Down Arrow)</summary>
         </member>
-        <member name="P:OpenMetaverse.ChatEventArgs.Type">
-            <summary>Get the type of message sent: whisper, shout, etc</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_LEFT_POS">
+            <summary>Move Left (SL Keybinding: Shift-(A/Left Arrow))</summary>
         </member>
-        <member name="P:OpenMetaverse.ChatEventArgs.SourceType">
-            <summary>Get the source type of the message sender</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_LEFT_NEG">
+            <summary>Move Right (SL Keybinding: Shift-(D/Right Arrow))</summary>
         </member>
-        <member name="P:OpenMetaverse.ChatEventArgs.FromName">
-            <summary>Get the name of the agent or object sending the message</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="P:OpenMetaverse.ChatEventArgs.SourceID">
-            <summary>Get the ID of the agent or object sending the message</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="P:OpenMetaverse.ChatEventArgs.OwnerID">
-            <summary>Get the ID of the object owner, or the agent ID sending the message</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_PITCH_POS">
+            <summary>Unused</summary>
         </member>
-        <member name="P:OpenMetaverse.ChatEventArgs.Position">
-            <summary>Get the position of the agent or object sending the message</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_PITCH_NEG">
+            <summary>Unused</summary>
         </member>
-        <member name="T:OpenMetaverse.ScriptDialogEventArgs">
-            <summary>Contains the data sent when a primitive opens a dialog with this agent</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_YAW_POS">
+            <summary>Unused</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},OpenMetaverse.UUID)">
-            <summary>
-            Construct a new instance of the ScriptDialogEventArgs
-            </summary>
-            <param name="message">The dialog message</param>
-            <param name="objectName">The name of the object that sent the dialog request</param>
-            <param name="imageID">The ID of the image to be displayed</param>
-            <param name="objectID">The ID of the primitive sending the dialog</param>
-            <param name="firstName">The first name of the senders owner</param>
-            <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 name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_YAW_NEG">
+            <summary>Unused</summary>
         </member>
-        <member name="P:OpenMetaverse.ScriptDialogEventArgs.Message">
-            <summary>Get the dialog message</summary>
+        <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="P:OpenMetaverse.ScriptDialogEventArgs.ObjectName">
-            <summary>Get the name of the object that sent the dialog request</summary>
+        <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="P:OpenMetaverse.ScriptDialogEventArgs.ImageID">
-            <summary>Get the ID of the image to be displayed</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="P:OpenMetaverse.ScriptDialogEventArgs.ObjectID">
-            <summary>Get the ID of the primitive sending the dialog</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_FLY">
+            <summary>Fly</summary>
         </member>
-        <member name="P:OpenMetaverse.ScriptDialogEventArgs.FirstName">
-            <summary>Get the first name of the senders owner</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_STOP">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.ScriptDialogEventArgs.LastName">
-            <summary>Get the last name of the senders owner</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_FINISH_ANIM">
+            <summary>Finish our current animation</summary>
         </member>
-        <member name="P:OpenMetaverse.ScriptDialogEventArgs.Channel">
-            <summary>Get the communication channel the dialog was sent on, responses
-            should also send responses on this same channel</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="P:OpenMetaverse.ScriptDialogEventArgs.ButtonLabels">
-            <summary>Get the string labels containing the options presented in this dialog</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="P:OpenMetaverse.ScriptDialogEventArgs.OwnerID">
-            <summary>UUID of the scritped object owner</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK">
+            <summary>Whether mouselook is currently enabled</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>
+        <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="M:OpenMetaverse.ScriptQuestionEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,System.String,OpenMetaverse.ScriptPermission)">
-            <summary>
-            Construct a new instance of the ScriptQuestionEventArgs
-            </summary>
-            <param name="simulator">The simulator containing the object sending the request</param>
-            <param name="taskID">The ID of the script making the request</param>
-            <param name="itemID">The ID of the primitive containing the script making the request</param>
-            <param name="objectName">The name of the primitive making the request</param>
-            <param name="objectOwner">The name of the owner of the object making the request</param>
-            <param name="questions">The permissions being requested</param>
+        <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="P:OpenMetaverse.ScriptQuestionEventArgs.Simulator">
-            <summary>Get the simulator containing the object sending the request</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="P:OpenMetaverse.ScriptQuestionEventArgs.TaskID">
-            <summary>Get the ID of the script making the request</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="P:OpenMetaverse.ScriptQuestionEventArgs.ItemID">
-            <summary>Get the ID of the primitive containing the script making the request</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="P:OpenMetaverse.ScriptQuestionEventArgs.ObjectName">
-            <summary>Get the name of the primitive making the request</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="P:OpenMetaverse.ScriptQuestionEventArgs.ObjectOwnerName">
-            <summary>Get the name of the owner of the object making the request</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_TURN_LEFT">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.ScriptQuestionEventArgs.Questions">
-            <summary>Get the permissions being requested</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_TURN_RIGHT">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.LoadUrlEventArgs">
-            <summary>Contains the data sent when a primitive sends a request
-            to an agent to open the specified URL</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="M:OpenMetaverse.LoadUrlEventArgs.#ctor(System.String,OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean,System.String,System.String)">
-            <summary>
-            Construct a new instance of the LoadUrlEventArgs
-            </summary>
-            <param name="objectName">The name of the object sending the request</param>
-            <param name="objectID">The ID of the object sending the request</param>
-            <param name="ownerID">The ID of the owner of the object sending the request</param>
-            <param name="ownerIsGroup">True if the object is owned by a group</param>
-            <param name="message">The message sent with the request</param>
-            <param name="URL">The URL the object sent</param>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_LBUTTON_DOWN">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.LoadUrlEventArgs.ObjectName">
-            <summary>Get the name of the object sending the request</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_LBUTTON_UP">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.LoadUrlEventArgs.ObjectID">
-            <summary>Get the ID of the object sending the request</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_ML_LBUTTON_DOWN">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.LoadUrlEventArgs.OwnerID">
-            <summary>Get the ID of the owner of the object sending the request</summary>
+        <member name="F:OpenMetaverse.AgentManager.ControlFlags.AGENT_CONTROL_ML_LBUTTON_UP">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.LoadUrlEventArgs.OwnerIsGroup">
-            <summary>True if the object is owned by a group</summary>
+        <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="P:OpenMetaverse.LoadUrlEventArgs.Message">
-            <summary>Get the message sent with the request</summary>
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.Camera">
+            <summary>Agent camera controls</summary>
         </member>
-        <member name="P:OpenMetaverse.LoadUrlEventArgs.URL">
-            <summary>Get the URL the object sent</summary>
+        <member name="F:OpenMetaverse.AgentManager.AgentMovement.Flags">
+            <summary>Currently only used for hiding your group title</summary>
         </member>
-        <member name="T:OpenMetaverse.InstantMessageEventArgs">
-            <summary>The date received from an ImprovedInstantMessage</summary>
+        <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.InstantMessageEventArgs.#ctor(OpenMetaverse.InstantMessage,OpenMetaverse.Simulator)">
+        <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>
-            Construct a new instance of the InstantMessageEventArgs object
+            Send an AgentUpdate with the camera set at the current agent
+            position and pointing towards the heading specified
             </summary>
-            <param name="im">the InstantMessage object</param>
-            <param name="simulator">the simulator where the InstantMessage origniated</param>
+            <param name="heading">Camera rotation in radians</param>
+            <param name="reliable">Whether to send the AgentUpdate reliable
+            or not</param>
         </member>
-        <member name="P:OpenMetaverse.InstantMessageEventArgs.IM">
-            <summary>Get the InstantMessage object</summary>
+        <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="P:OpenMetaverse.InstantMessageEventArgs.Simulator">
-            <summary>Get the simulator where the InstantMessage origniated</summary>
+        <member name="M:OpenMetaverse.AgentManager.AgentMovement.TurnToward(OpenMetaverse.Vector3,System.Boolean)">
+            <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>
+            <param name="sendUpdate">whether to send update or not</param>
         </member>
-        <member name="T:OpenMetaverse.BalanceEventArgs">
-            <summary>Contains the currency balance</summary>
+        <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.BalanceEventArgs.#ctor(System.Int32)">
+        <member name="M:OpenMetaverse.AgentManager.AgentMovement.SendUpdate(System.Boolean)">
             <summary>
-            Construct a new BalanceEventArgs object
+            Send new AgentUpdate packet to update our current camera 
+            position and rotation
             </summary>
-            <param name="balance">The currenct balance</param>
+            <param name="reliable">Whether to require server acknowledgement
+            of this packet</param>
         </member>
-        <member name="P:OpenMetaverse.BalanceEventArgs.Balance">
+        <member name="M:OpenMetaverse.AgentManager.AgentMovement.SendUpdate(System.Boolean,OpenMetaverse.Simulator)">
             <summary>
-            Get the currenct balance
+            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="T:OpenMetaverse.MoneyBalanceReplyEventArgs">
-            <summary>Contains the transaction summary when an item is purchased,
-            money is given, or land is purchased</summary>
+        <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.MoneyBalanceReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Boolean,System.Int32,System.Int32,System.Int32,System.String,OpenMetaverse.TransactionInfo)">
+        <member name="M:OpenMetaverse.AgentManager.AgentMovement.SetFOVVerticalAngle(System.Single)">
             <summary>
-            Construct a new instance of the MoneyBalanceReplyEventArgs object
+            Sends update of Field of Vision vertical angle to the simulator
             </summary>
-            <param name="transactionID">The ID of the transaction</param>
-            <param name="transactionSuccess">True of the transaction was successful</param>
-            <param name="balance">The current currency balance</param>
-            <param name="metersCredit">The meters credited</param>
-            <param name="metersCommitted">The meters comitted</param>
-            <param name="description">A brief description of the transaction</param>
+            <param name="angle">Angle in radians</param>
         </member>
-        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.TransactionID">
-            <summary>Get the ID of the transaction</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AtPos">
+            <summary>Move agent positive along the X axis</summary>
         </member>
-        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.Success">
-            <summary>True of the transaction was successful</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AtNeg">
+            <summary>Move agent negative along the X axis</summary>
         </member>
-        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.Balance">
-            <summary>Get the remaining currency balance</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.LeftPos">
+            <summary>Move agent positive along the Y axis</summary>
         </member>
-        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.MetersCredit">
-            <summary>Get the meters credited</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.LeftNeg">
+            <summary>Move agent negative along the Y axis</summary>
         </member>
-        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.MetersCommitted">
-            <summary>Get the meters comitted</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.UpPos">
+            <summary>Move agent positive along the Z axis</summary>
         </member>
-        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.Description">
-            <summary>Get the description of the transaction</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.UpNeg">
+            <summary>Move agent negative along the Z axis</summary>
         </member>
-        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.TransactionInfo">
-            <summary>Detailed transaction information</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.PitchPos">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.AgentDataReplyEventArgs">
-            <summary>Data sent from the simulator containing information about your agent and active group information</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.PitchNeg">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.AgentDataReplyEventArgs.#ctor(System.String,System.String,OpenMetaverse.UUID,System.String,OpenMetaverse.GroupPowers,System.String)">
-            <summary>
-            Construct a new instance of the AgentDataReplyEventArgs object
-            </summary>
-            <param name="firstName">The agents first name</param>
-            <param name="lastName">The agents last name</param>
-            <param name="activeGroupID">The agents active group ID</param>
-            <param name="groupTitle">The group title of the agents active group</param>
-            <param name="groupPowers">The combined group powers the agent has in the active group</param>
-            <param name="groupName">The name of the group the agent has currently active</param>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.YawPos">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.FirstName">
-            <summary>Get the agents first name</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.YawNeg">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.LastName">
-            <summary>Get the agents last name</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.FastAt">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.ActiveGroupID">
-            <summary>Get the active group ID of your agent</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.FastLeft">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.GroupTitle">
-            <summary>Get the active groups title of your agent</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.FastUp">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.GroupPowers">
-            <summary>Get the combined group powers of your agent</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.Fly">
+            <summary>Causes simulator to make agent fly</summary>
         </member>
-        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.GroupName">
-            <summary>Get the active group name of your agent</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.Stop">
+            <summary>Stop movement</summary>
         </member>
-        <member name="T:OpenMetaverse.AnimationsChangedEventArgs">
-            <summary>Data sent by the simulator to indicate the active/changed animations
-            applied to your agent</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.FinishAnim">
+            <summary>Finish animation</summary>
         </member>
-        <member name="M:OpenMetaverse.AnimationsChangedEventArgs.#ctor(OpenMetaverse.InternalDictionary{OpenMetaverse.UUID,System.Int32})">
+        <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>
-            Construct a new instance of the AnimationsChangedEventArgs class
+            Returns "always run" value, or changes it by sending a SetAlwaysRunPacket
             </summary>
-            <param name="agentAnimations">The dictionary that contains the changed animations</param>
         </member>
-        <member name="P:OpenMetaverse.AnimationsChangedEventArgs.Animations">
-            <summary>Get the dictionary that contains the changed animations</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentControls">
+            <summary>The current value of the agent control flags</summary>
         </member>
-        <member name="T:OpenMetaverse.MeanCollisionEventArgs">
+        <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>
-            Data sent from a simulator indicating a collision with your agent
+            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="M:OpenMetaverse.MeanCollisionEventArgs.#ctor(OpenMetaverse.MeanCollisionType,OpenMetaverse.UUID,OpenMetaverse.UUID,System.Single,System.DateTime)">
+        <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>
-            Construct a new instance of the MeanCollisionEventArgs class
+            Default constructor
             </summary>
-            <param name="type">The type of collision that occurred</param>
-            <param name="perp">The ID of the agent or object that perpetrated the agression</param>
-            <param name="victim">The ID of the Victim</param>
-            <param name="magnitude">The strength of the collision</param>
-            <param name="time">The Time the collision occurred</param>
         </member>
-        <member name="P:OpenMetaverse.MeanCollisionEventArgs.Type">
-            <summary>Get the Type of collision</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.Position">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.MeanCollisionEventArgs.Aggressor">
-            <summary>Get the ID of the agent or object that collided with your agent</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.AtAxis">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.MeanCollisionEventArgs.Victim">
-            <summary>Get the ID of the agent that was attacked</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.LeftAxis">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.MeanCollisionEventArgs.Magnitude">
-            <summary>A value indicating the strength of the collision</summary>
+        <member name="P:OpenMetaverse.AgentManager.AgentMovement.AgentCamera.UpAxis">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.MeanCollisionEventArgs.Time">
-            <summary>Get the time the collision occurred</summary>
+        <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.RegionCrossedEventArgs">
-            <summary>Data sent to your agent when it crosses region boundaries</summary>
+        <member name="T:OpenMetaverse.Assets.AssetClothing">
+            <summary>
+            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="M:OpenMetaverse.RegionCrossedEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.Simulator)">
+        <member name="T:OpenMetaverse.Assets.AssetWearable">
             <summary>
-            Construct a new instance of the RegionCrossedEventArgs class
+            Represents a Wearable Asset, Clothing, Hair, Skin, Etc
             </summary>
-            <param name="oldSim">The simulator your agent just left</param>
-            <param name="newSim">The simulator your agent is now in</param>
         </member>
-        <member name="P:OpenMetaverse.RegionCrossedEventArgs.OldSimulator">
-            <summary>Get the simulator your agent just left</summary>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.Name">
+            <summary>A string containing the name of the asset</summary>
         </member>
-        <member name="P:OpenMetaverse.RegionCrossedEventArgs.NewSimulator">
-            <summary>Get the simulator your agent is now in</summary>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.Description">
+            <summary>A string containing a short description of the asset</summary>
         </member>
-        <member name="T:OpenMetaverse.GroupChatJoinedEventArgs">
-            <summary>Data sent from the simulator when your agent joins a group chat session</summary>
+        <member name="F:OpenMetaverse.Assets.AssetWearable.WearableType">
+            <summary>The Assets WearableType</summary>
         </member>
-        <member name="M:OpenMetaverse.GroupChatJoinedEventArgs.#ctor(OpenMetaverse.UUID,System.String,OpenMetaverse.UUID,System.Boolean)">
+        <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="F:OpenMetaverse.Assets.AssetWearable.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.#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="M:OpenMetaverse.Assets.AssetWearable.Decode">
             <summary>
-            Construct a new instance of the GroupChatJoinedEventArgs class
+            Decode an assets byte encoded data to a string
             </summary>
-            <param name="groupChatSessionID">The ID of the session</param>
-            <param name="sessionName">The name of the session</param>
-            <param name="tmpSessionID">A temporary session id used for establishing new sessions</param>
-            <param name="success">True of your agent successfully joined the session</param>
-        </member>
-        <member name="P:OpenMetaverse.GroupChatJoinedEventArgs.SessionID">
-            <summary>Get the ID of the group chat session</summary>
+            <returns>true if the asset data was decoded successfully</returns>
         </member>
-        <member name="P:OpenMetaverse.GroupChatJoinedEventArgs.SessionName">
-            <summary>Get the name of the session</summary>
+        <member name="M:OpenMetaverse.Assets.AssetWearable.Encode">
+            <summary>
+            Encode the assets string represantion into a format consumable by the asset server
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.GroupChatJoinedEventArgs.TmpSessionID">
-            <summary>Get the temporary session ID used for establishing new sessions</summary>
+        <member name="M:OpenMetaverse.Assets.AssetClothing.#ctor">
+            <summary>Initializes a new instance of an AssetScriptBinary object</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupChatJoinedEventArgs.Success">
-            <summary>True if your agent successfully joined the session</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="T:OpenMetaverse.AlertMessageEventArgs">
-            <summary>Data sent by the simulator containing urgent messages</summary>
+        <member name="P:OpenMetaverse.Assets.AssetClothing.AssetType">
+            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="M:OpenMetaverse.AlertMessageEventArgs.#ctor(System.String)">
+        <member name="T:OpenMetaverse.PacketFrequency">
             <summary>
-            Construct a new instance of the AlertMessageEventArgs class
+            
             </summary>
-            <param name="message">The alert message</param>
         </member>
-        <member name="P:OpenMetaverse.AlertMessageEventArgs.Message">
-            <summary>Get the alert message</summary>
+        <member name="F:OpenMetaverse.PacketFrequency.Low">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.ScriptControlEventArgs">
-            <summary>Data sent by a script requesting to take or release specified controls to your agent</summary>
+        <member name="F:OpenMetaverse.PacketFrequency.Medium">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.ScriptControlEventArgs.#ctor(OpenMetaverse.ScriptControlChange,System.Boolean,System.Boolean)">
+        <member name="F:OpenMetaverse.PacketFrequency.High">
+            <summary></summary>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MalformedDataException">
             <summary>
-            Construct a new instance of the ScriptControlEventArgs class
+            Thrown when a packet could not be successfully deserialized
             </summary>
-            <param name="controls">The controls the script is attempting to take or release to the agent</param>
-            <param name="pass">True if the script is passing controls back to the agent</param>
-            <param name="take">True if the script is requesting controls be released to the script</param>
         </member>
-        <member name="P:OpenMetaverse.ScriptControlEventArgs.Controls">
-            <summary>Get the controls the script is attempting to take or release to the agent</summary>
+        <member name="M:OpenMetaverse.Packets.MalformedDataException.#ctor">
+            <summary>
+            Default constructor
+            </summary>
         </member>
-        <member name="P:OpenMetaverse.ScriptControlEventArgs.Pass">
-            <summary>True if the script is passing controls back to the agent</summary>
+        <member name="M:OpenMetaverse.Packets.MalformedDataException.#ctor(System.String)">
+            <summary>
+            Constructor that takes an additional error message
+            </summary>
+            <param name="Message">An error message to attach to this exception</param>
         </member>
-        <member name="P:OpenMetaverse.ScriptControlEventArgs.Take">
-            <summary>True if the script is requesting controls be released to the script</summary>
+        <member name="T:OpenMetaverse.Packets.Header">
+            <summary>
+            The header of a message template packet. Holds packet flags, sequence
+            number, packet ID, and any ACKs that will be appended at the end of
+            the packet
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.CameraConstraintEventArgs">
+        <member name="M:OpenMetaverse.Packets.Header.AcksToBytes(System.Byte[],System.Int32@)">
             <summary>
-            Data sent from the simulator to an agent to indicate its view limits
+            Convert the AckList to a byte array, used for packet serializing
             </summary>
+            <param name="bytes">Reference to the target byte array</param>
+            <param name="i">Beginning position to start writing to in the byte
+            array, will be updated with the ending position of the ACK list</param>
         </member>
-        <member name="M:OpenMetaverse.CameraConstraintEventArgs.#ctor(OpenMetaverse.Vector4)">
+        <member name="M:OpenMetaverse.Packets.Header.BuildHeader(System.Byte[],System.Int32@,System.Int32@)">
             <summary>
-            Construct a new instance of the CameraConstraintEventArgs class
+            
             </summary>
-            <param name="collidePlane">The collision plane</param>
+            <param name="bytes"></param>
+            <param name="pos"></param>
+            <param name="packetEnd"></param>
+            <returns></returns>
         </member>
-        <member name="P:OpenMetaverse.CameraConstraintEventArgs.CollidePlane">
-            <summary>Get the collision plane</summary>
+        <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>
         </member>
-        <member name="T:OpenMetaverse.ScriptSensorReplyEventArgs">
+        <member name="T:OpenMetaverse.Packets.PacketBlock">
             <summary>
-            Data containing script sensor requests which allow an agent to know the specific details
-            of a primitive sending script sensor requests
+            A block of data in a packet. Packets are composed of one or more blocks,
+            each block containing one or more fields
             </summary>
         </member>
-        <member name="M:OpenMetaverse.ScriptSensorReplyEventArgs.#ctor(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.Vector3,System.Single,OpenMetaverse.Quaternion,OpenMetaverse.ScriptSensorTypeFlags,OpenMetaverse.Vector3)">
+        <member name="M:OpenMetaverse.Packets.PacketBlock.FromBytes(System.Byte[],System.Int32@)">
             <summary>
-            Construct a new instance of the ScriptSensorReplyEventArgs
+            Create a block from a byte array
             </summary>
-            <param name="requestorID">The ID of the primitive sending the sensor</param>
-            <param name="groupID">The ID of the group associated with the primitive</param>
-            <param name="name">The name of the primitive sending the sensor</param>
-            <param name="objectID">The ID of the primitive sending the sensor</param>
-            <param name="ownerID">The ID of the owner of the primitive sending the sensor</param>
-            <param name="position">The position of the primitive sending the sensor</param>
-            <param name="range">The range the primitive specified to scan</param>
-            <param name="rotation">The rotation of the primitive sending the sensor</param>
-            <param name="type">The type of sensor the primitive sent</param>
-            <param name="velocity">The velocity of the primitive sending the sensor</param>
+            <param name="bytes">Byte array containing the serialized block</param>
+            <param name="i">Starting position of the block in the byte array.
+            This will point to the data after the end of the block when the
+            call returns</param>
         </member>
-        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.RequestorID">
-            <summary>Get the ID of the primitive sending the sensor</summary>
+        <member name="M:OpenMetaverse.Packets.PacketBlock.ToBytes(System.Byte[],System.Int32@)">
+            <summary>
+            Serialize this block into a byte array
+            </summary>
+            <param name="bytes">Byte array to serialize this block into</param>
+            <param name="i">Starting position in the byte array to serialize to.
+            This will point to the position directly after the end of the
+            serialized block when the call returns</param>
         </member>
-        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.GroupID">
-            <summary>Get the ID of the group associated with the primitive</summary>
+        <member name="P:OpenMetaverse.Packets.PacketBlock.Length">
+            <summary>Current length of the data in this packet</summary>
         </member>
-        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Name">
-            <summary>Get the name of the primitive sending the sensor</summary>
+        <member name="F:OpenMetaverse.Packets.PacketType.Default">
+            <summary>A generic value, not an actual packet type</summary>
         </member>
-        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.ObjectID">
-            <summary>Get the ID of the primitive sending the sensor</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="P:OpenMetaverse.ScriptSensorReplyEventArgs.OwnerID">
-            <summary>Get the ID of the owner of the primitive sending the sensor</summary>
+        <member name="T:OpenMetaverse.Packets.TestMessagePacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Position">
-            <summary>Get the position of the primitive sending the sensor</summary>
+        <member name="T:OpenMetaverse.Packets.TestMessagePacket.TestBlock1Block">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Range">
-            <summary>Get the range the primitive specified to scan</summary>
+        <member name="T:OpenMetaverse.Packets.TestMessagePacket.NeighborBlockBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Rotation">
-            <summary>Get the rotation of the primitive sending the sensor</summary>
+        <member name="T:OpenMetaverse.Packets.UseCircuitCodePacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Type">
-            <summary>Get the type of sensor the primitive sent</summary>
+        <member name="T:OpenMetaverse.Packets.UseCircuitCodePacket.CircuitCodeBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Velocity">
-            <summary>Get the velocity of the primitive sending the sensor</summary>
+        <member name="T:OpenMetaverse.Packets.TelehubInfoPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.AvatarSitResponseEventArgs">
-            <summary>Contains the response data returned from the simulator in response to a <see cref="!:RequestSit" /></summary>
+        <member name="T:OpenMetaverse.Packets.TelehubInfoPacket.TelehubBlockBlock">
+            <exclude/>
         </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>
+        <member name="T:OpenMetaverse.Packets.TelehubInfoPacket.SpawnPointBlockBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.ObjectID">
-            <summary>Get the ID of the primitive the agent will be sitting on</summary>
+        <member name="T:OpenMetaverse.Packets.EconomyDataRequestPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.Autopilot">
-            <summary>True if the simulator Autopilot functions were involved</summary>
+        <member name="T:OpenMetaverse.Packets.EconomyDataPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.CameraAtOffset">
-            <summary>Get the camera offset of the agent when seated</summary>
+        <member name="T:OpenMetaverse.Packets.EconomyDataPacket.InfoBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.CameraEyeOffset">
-            <summary>Get the camera eye offset of the agent when seated</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPickerRequestPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.ForceMouselook">
-            <summary>True of the agent will be in mouselook mode when seated</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPickerRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.SitPosition">
-            <summary>Get the position of the agent when seated</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPickerRequestPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.SitRotation">
-            <summary>Get the rotation of the agent when seated</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPickerReplyPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.ChatSessionMemberAddedEventArgs">
-            <summary>Data sent when an agent joins a chat session your agent is currently participating in</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPickerReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.ChatSessionMemberAddedEventArgs.#ctor(OpenMetaverse.UUID,OpenMetaverse.UUID)">
-            <summary>
-            Construct a new instance of the ChatSessionMemberAddedEventArgs object
-            </summary>
-            <param name="sessionID">The ID of the chat session</param>
-            <param name="agentID">The ID of the agent joining</param>
+        <member name="T:OpenMetaverse.Packets.AvatarPickerReplyPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ChatSessionMemberAddedEventArgs.SessionID">
-            <summary>Get the ID of the chat session</summary>
+        <member name="T:OpenMetaverse.Packets.PlacesQueryPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ChatSessionMemberAddedEventArgs.AgentID">
-            <summary>Get the ID of the agent that joined</summary>
+        <member name="T:OpenMetaverse.Packets.PlacesQueryPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.ChatSessionMemberLeftEventArgs">
-            <summary>Data sent when an agent exits a chat session your agent is currently participating in</summary>
+        <member name="T:OpenMetaverse.Packets.PlacesQueryPacket.TransactionDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.ChatSessionMemberLeftEventArgs.#ctor(OpenMetaverse.UUID,OpenMetaverse.UUID)">
-            <summary>
-            Construct a new instance of the ChatSessionMemberLeftEventArgs object
-            </summary>
-            <param name="sessionID">The ID of the chat session</param>
-            <param name="agentID">The ID of the Agent that left</param>
+        <member name="T:OpenMetaverse.Packets.PlacesQueryPacket.QueryDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ChatSessionMemberLeftEventArgs.SessionID">
-            <summary>Get the ID of the chat session</summary>
+        <member name="T:OpenMetaverse.Packets.PlacesReplyPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ChatSessionMemberLeftEventArgs.AgentID">
-            <summary>Get the ID of the agent that left</summary>
+        <member name="T:OpenMetaverse.Packets.PlacesReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.SetDisplayNameReplyEventArgs">
-            <summary>Event arguments with the result of setting display name operation</summary>
+        <member name="T:OpenMetaverse.Packets.PlacesReplyPacket.TransactionDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.SetDisplayNameReplyEventArgs.#ctor(System.Int32,System.String,OpenMetaverse.AgentDisplayName)">
-            <summary>Default constructor</summary>
+        <member name="T:OpenMetaverse.Packets.PlacesReplyPacket.QueryDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.SetDisplayNameReplyEventArgs.Status">
-            <summary>Status code, 200 indicates settign display name was successful</summary>
+        <member name="T:OpenMetaverse.Packets.DirFindQueryPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.SetDisplayNameReplyEventArgs.Reason">
-            <summary>Textual description of the status</summary>
+        <member name="T:OpenMetaverse.Packets.DirFindQueryPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.SetDisplayNameReplyEventArgs.DisplayName">
-            <summary>Details of the newly set display name</summary>
+        <member name="T:OpenMetaverse.Packets.DirFindQueryPacket.QueryDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.AgentThrottle">
-            <summary>
-            Throttles the network traffic for various different traffic types.
-            Access this class through GridClient.Throttle
-            </summary>
+        <member name="T:OpenMetaverse.Packets.DirPlacesQueryPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentThrottle.#ctor(OpenMetaverse.GridClient)">
-            <summary>
-            Default constructor, uses a default high total of 1500 KBps (1536000)
-            </summary>
+        <member name="T:OpenMetaverse.Packets.DirPlacesQueryPacket.AgentDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.DirPlacesQueryPacket.QueryDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentThrottle.Resend">
-            <summary>Maximum bits per second for resending unacknowledged packets</summary>
+        <member name="T:OpenMetaverse.Packets.DirPlacesReplyPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentThrottle.Land">
-            <summary>Maximum bits per second for LayerData terrain</summary>
+        <member name="T:OpenMetaverse.Packets.DirPlacesReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentThrottle.Wind">
-            <summary>Maximum bits per second for LayerData wind data</summary>
+        <member name="T:OpenMetaverse.Packets.DirPlacesReplyPacket.QueryDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentThrottle.Cloud">
-            <summary>Maximum bits per second for LayerData clouds</summary>
+        <member name="T:OpenMetaverse.Packets.DirPlacesReplyPacket.QueryRepliesBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentThrottle.Task">
-            <summary>Unknown, includes object data</summary>
+        <member name="T:OpenMetaverse.Packets.DirPlacesReplyPacket.StatusDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentThrottle.Texture">
-            <summary>Maximum bits per second for textures</summary>
+        <member name="T:OpenMetaverse.Packets.DirPeopleReplyPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentThrottle.Asset">
-            <summary>Maximum bits per second for downloaded assets</summary>
+        <member name="T:OpenMetaverse.Packets.DirPeopleReplyPacket.AgentDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.DirPeopleReplyPacket.QueryDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentThrottle.Set">
-            <summary>
-            Send an AgentThrottle packet to the current server using the
-            current values
-            </summary>
+        <member name="T:OpenMetaverse.Packets.DirPeopleReplyPacket.QueryRepliesBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentThrottle.Set(OpenMetaverse.Simulator)">
-            <summary>
-            Send an AgentThrottle packet to the specified server using the
-            current values
-            </summary>
+        <member name="T:OpenMetaverse.Packets.DirEventsReplyPacket">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.DirEventsReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Animations">
-            <summary>
-            Static pre-defined animations available to all agents
-            </summary>
+        <member name="T:OpenMetaverse.Packets.DirEventsReplyPacket.QueryDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.AFRAID">
-            <summary>Agent with afraid expression on face</summary>
+        <member name="T:OpenMetaverse.Packets.DirEventsReplyPacket.QueryRepliesBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.AIM_BAZOOKA_R">
-            <summary>Agent aiming a bazooka (right handed)</summary>
+        <member name="T:OpenMetaverse.Packets.DirEventsReplyPacket.StatusDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.AIM_BOW_L">
-            <summary>Agent aiming a bow (left handed)</summary>
+        <member name="T:OpenMetaverse.Packets.DirGroupsReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.AIM_HANDGUN_R">
-            <summary>Agent aiming a hand gun (right handed)</summary>
+        <member name="T:OpenMetaverse.Packets.DirGroupsReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.AIM_RIFLE_R">
-            <summary>Agent aiming a rifle (right handed)</summary>
+        <member name="T:OpenMetaverse.Packets.DirGroupsReplyPacket.QueryDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.ANGRY">
-            <summary>Agent with angry expression on face</summary>
+        <member name="T:OpenMetaverse.Packets.DirGroupsReplyPacket.QueryRepliesBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.AWAY">
-            <summary>Agent hunched over (away)</summary>
+        <member name="T:OpenMetaverse.Packets.DirClassifiedQueryPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.BACKFLIP">
-            <summary>Agent doing a backflip</summary>
+        <member name="T:OpenMetaverse.Packets.DirClassifiedQueryPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.BELLY_LAUGH">
-            <summary>Agent laughing while holding belly</summary>
+        <member name="T:OpenMetaverse.Packets.DirClassifiedQueryPacket.QueryDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.BLOW_KISS">
-            <summary>Agent blowing a kiss</summary>
+        <member name="T:OpenMetaverse.Packets.DirClassifiedReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.BORED">
-            <summary>Agent with bored expression on face</summary>
+        <member name="T:OpenMetaverse.Packets.DirClassifiedReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.BOW">
-            <summary>Agent bowing to audience</summary>
+        <member name="T:OpenMetaverse.Packets.DirClassifiedReplyPacket.QueryDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.BRUSH">
-            <summary>Agent brushing himself/herself off</summary>
+        <member name="T:OpenMetaverse.Packets.DirClassifiedReplyPacket.QueryRepliesBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.BUSY">
-            <summary>Agent in busy mode</summary>
+        <member name="T:OpenMetaverse.Packets.DirClassifiedReplyPacket.StatusDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.CLAP">
-            <summary>Agent clapping hands</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarClassifiedReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.COURTBOW">
-            <summary>Agent doing a curtsey bow</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarClassifiedReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.CROUCH">
-            <summary>Agent crouching</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarClassifiedReplyPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.CROUCHWALK">
-            <summary>Agent crouching while walking</summary>
+        <member name="T:OpenMetaverse.Packets.ClassifiedInfoRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.CRY">
-            <summary>Agent crying</summary>
+        <member name="T:OpenMetaverse.Packets.ClassifiedInfoRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.CUSTOMIZE">
-            <summary>Agent unanimated with arms out (e.g. setting appearance)</summary>
+        <member name="T:OpenMetaverse.Packets.ClassifiedInfoRequestPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.CUSTOMIZE_DONE">
-            <summary>Agent re-animated after set appearance finished</summary>
+        <member name="T:OpenMetaverse.Packets.ClassifiedInfoReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.DANCE1">
-            <summary>Agent dancing</summary>
+        <member name="T:OpenMetaverse.Packets.ClassifiedInfoReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.DANCE2">
-            <summary>Agent dancing</summary>
+        <member name="T:OpenMetaverse.Packets.ClassifiedInfoReplyPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.DANCE3">
-            <summary>Agent dancing</summary>
+        <member name="T:OpenMetaverse.Packets.ClassifiedInfoUpdatePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.DANCE4">
-            <summary>Agent dancing</summary>
+        <member name="T:OpenMetaverse.Packets.ClassifiedInfoUpdatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.DANCE5">
-            <summary>Agent dancing</summary>
+        <member name="T:OpenMetaverse.Packets.ClassifiedInfoUpdatePacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.DANCE6">
-            <summary>Agent dancing</summary>
+        <member name="T:OpenMetaverse.Packets.ClassifiedDeletePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.DANCE7">
-            <summary>Agent dancing</summary>
+        <member name="T:OpenMetaverse.Packets.ClassifiedDeletePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.DANCE8">
-            <summary>Agent dancing</summary>
+        <member name="T:OpenMetaverse.Packets.ClassifiedDeletePacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.DEAD">
-            <summary>Agent on ground unanimated</summary>
+        <member name="T:OpenMetaverse.Packets.ClassifiedGodDeletePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.DRINK">
-            <summary>Agent boozing it up</summary>
+        <member name="T:OpenMetaverse.Packets.ClassifiedGodDeletePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.EMBARRASSED">
-            <summary>Agent with embarassed expression on face</summary>
+        <member name="T:OpenMetaverse.Packets.ClassifiedGodDeletePacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_AFRAID">
-            <summary>Agent with afraid expression on face</summary>
+        <member name="T:OpenMetaverse.Packets.DirLandQueryPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_ANGER">
-            <summary>Agent with angry expression on face</summary>
+        <member name="T:OpenMetaverse.Packets.DirLandQueryPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_BORED">
-            <summary>Agent with bored expression on face</summary>
+        <member name="T:OpenMetaverse.Packets.DirLandQueryPacket.QueryDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_CRY">
-            <summary>Agent crying</summary>
+        <member name="T:OpenMetaverse.Packets.DirLandReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_DISDAIN">
-            <summary>Agent showing disdain (dislike) for something</summary>
+        <member name="T:OpenMetaverse.Packets.DirLandReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_EMBARRASSED">
-            <summary>Agent with embarassed expression on face</summary>
+        <member name="T:OpenMetaverse.Packets.DirLandReplyPacket.QueryDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_FROWN">
-            <summary>Agent with frowning expression on face</summary>
+        <member name="T:OpenMetaverse.Packets.DirLandReplyPacket.QueryRepliesBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_KISS">
-            <summary>Agent with kissy face</summary>
+        <member name="T:OpenMetaverse.Packets.DirPopularQueryPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_LAUGH">
-            <summary>Agent expressing laughgter</summary>
+        <member name="T:OpenMetaverse.Packets.DirPopularQueryPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_OPEN_MOUTH">
-            <summary>Agent with open mouth</summary>
+        <member name="T:OpenMetaverse.Packets.DirPopularQueryPacket.QueryDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_REPULSED">
-            <summary>Agent with repulsed expression on face</summary>
+        <member name="T:OpenMetaverse.Packets.DirPopularReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_SAD">
-            <summary>Agent expressing sadness</summary>
+        <member name="T:OpenMetaverse.Packets.DirPopularReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_SHRUG">
-            <summary>Agent shrugging shoulders</summary>
+        <member name="T:OpenMetaverse.Packets.DirPopularReplyPacket.QueryDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_SMILE">
-            <summary>Agent with a smile</summary>
+        <member name="T:OpenMetaverse.Packets.DirPopularReplyPacket.QueryRepliesBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_SURPRISE">
-            <summary>Agent expressing surprise</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelInfoRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_TONGUE_OUT">
-            <summary>Agent sticking tongue out</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelInfoRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_TOOTHSMILE">
-            <summary>Agent with big toothy smile</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelInfoRequestPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_WINK">
-            <summary>Agent winking</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelInfoReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.EXPRESS_WORRY">
-            <summary>Agent expressing worry</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelInfoReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.FALLDOWN">
-            <summary>Agent falling down</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelInfoReplyPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.FEMALE_WALK">
-            <summary>Agent walking (feminine version)</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelObjectOwnersRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.FINGER_WAG">
-            <summary>Agent wagging finger (disapproval)</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelObjectOwnersRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.FIST_PUMP">
-            <summary>I'm not sure I want to know</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelObjectOwnersRequestPacket.ParcelDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.FLY">
-            <summary>Agent in superman position</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelObjectOwnersReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.FLYSLOW">
-            <summary>Agent in superman position</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelObjectOwnersReplyPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.HELLO">
-            <summary>Agent greeting another</summary>
+        <member name="T:OpenMetaverse.Packets.GroupNoticesListRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.HOLD_BAZOOKA_R">
-            <summary>Agent holding bazooka (right handed)</summary>
+        <member name="T:OpenMetaverse.Packets.GroupNoticesListRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.HOLD_BOW_L">
-            <summary>Agent holding a bow (left handed)</summary>
+        <member name="T:OpenMetaverse.Packets.GroupNoticesListRequestPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.HOLD_HANDGUN_R">
-            <summary>Agent holding a handgun (right handed)</summary>
+        <member name="T:OpenMetaverse.Packets.GroupNoticesListReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.HOLD_RIFLE_R">
-            <summary>Agent holding a rifle (right handed)</summary>
+        <member name="T:OpenMetaverse.Packets.GroupNoticesListReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.HOLD_THROW_R">
-            <summary>Agent throwing an object (right handed)</summary>
+        <member name="T:OpenMetaverse.Packets.GroupNoticesListReplyPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.HOVER">
-            <summary>Agent in static hover</summary>
+        <member name="T:OpenMetaverse.Packets.GroupNoticeRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.HOVER_DOWN">
-            <summary>Agent hovering downward</summary>
+        <member name="T:OpenMetaverse.Packets.GroupNoticeRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.HOVER_UP">
-            <summary>Agent hovering upward</summary>
+        <member name="T:OpenMetaverse.Packets.GroupNoticeRequestPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.IMPATIENT">
-            <summary>Agent being impatient</summary>
+        <member name="T:OpenMetaverse.Packets.TeleportRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.JUMP">
-            <summary>Agent jumping</summary>
+        <member name="T:OpenMetaverse.Packets.TeleportRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.JUMP_FOR_JOY">
-            <summary>Agent jumping with fervor</summary>
+        <member name="T:OpenMetaverse.Packets.TeleportRequestPacket.InfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.KISS_MY_BUTT">
-            <summary>Agent point to lips then rear end</summary>
+        <member name="T:OpenMetaverse.Packets.TeleportLocationRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.LAND">
-            <summary>Agent landing from jump, finished flight, etc</summary>
+        <member name="T:OpenMetaverse.Packets.TeleportLocationRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.LAUGH_SHORT">
-            <summary>Agent laughing</summary>
+        <member name="T:OpenMetaverse.Packets.TeleportLocationRequestPacket.InfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.MEDIUM_LAND">
-            <summary>Agent landing from jump, finished flight, etc</summary>
+        <member name="T:OpenMetaverse.Packets.TeleportLocalPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.MOTORCYCLE_SIT">
-            <summary>Agent sitting on a motorcycle</summary>
+        <member name="T:OpenMetaverse.Packets.TeleportLocalPacket.InfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.MUSCLE_BEACH">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.TeleportLandmarkRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.NO">
-            <summary>Agent moving head side to side</summary>
+        <member name="T:OpenMetaverse.Packets.TeleportLandmarkRequestPacket.InfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.NO_UNHAPPY">
-            <summary>Agent moving head side to side with unhappy expression</summary>
+        <member name="T:OpenMetaverse.Packets.TeleportProgressPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.NYAH_NYAH">
-            <summary>Agent taunting another</summary>
+        <member name="T:OpenMetaverse.Packets.TeleportProgressPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.ONETWO_PUNCH">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.TeleportProgressPacket.InfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.PEACE">
-            <summary>Agent giving peace sign</summary>
+        <member name="T:OpenMetaverse.Packets.TeleportFinishPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.POINT_ME">
-            <summary>Agent pointing at self</summary>
+        <member name="T:OpenMetaverse.Packets.TeleportFinishPacket.InfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.POINT_YOU">
-            <summary>Agent pointing at another</summary>
+        <member name="T:OpenMetaverse.Packets.StartLurePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.PRE_JUMP">
-            <summary>Agent preparing for jump (bending knees)</summary>
+        <member name="T:OpenMetaverse.Packets.StartLurePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.PUNCH_LEFT">
-            <summary>Agent punching with left hand</summary>
+        <member name="T:OpenMetaverse.Packets.StartLurePacket.InfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.PUNCH_RIGHT">
-            <summary>Agent punching with right hand</summary>
+        <member name="T:OpenMetaverse.Packets.StartLurePacket.TargetDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.REPULSED">
-            <summary>Agent acting repulsed</summary>
+        <member name="T:OpenMetaverse.Packets.TeleportLureRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.ROUNDHOUSE_KICK">
-            <summary>Agent trying to be Chuck Norris</summary>
+        <member name="T:OpenMetaverse.Packets.TeleportLureRequestPacket.InfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.RPS_COUNTDOWN">
-            <summary>Rocks, Paper, Scissors 1, 2, 3</summary>
+        <member name="T:OpenMetaverse.Packets.TeleportCancelPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.RPS_PAPER">
-            <summary>Agent with hand flat over other hand</summary>
+        <member name="T:OpenMetaverse.Packets.TeleportCancelPacket.InfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.RPS_ROCK">
-            <summary>Agent with fist over other hand</summary>
+        <member name="T:OpenMetaverse.Packets.TeleportStartPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.RPS_SCISSORS">
-            <summary>Agent with two fingers spread over other hand</summary>
+        <member name="T:OpenMetaverse.Packets.TeleportStartPacket.InfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.RUN">
-            <summary>Agent running</summary>
+        <member name="T:OpenMetaverse.Packets.TeleportFailedPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.SAD">
-            <summary>Agent appearing sad</summary>
+        <member name="T:OpenMetaverse.Packets.TeleportFailedPacket.InfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.SALUTE">
-            <summary>Agent saluting</summary>
+        <member name="T:OpenMetaverse.Packets.TeleportFailedPacket.AlertInfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.SHOOT_BOW_L">
-            <summary>Agent shooting bow (left handed)</summary>
+        <member name="T:OpenMetaverse.Packets.UndoPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.SHOUT">
-            <summary>Agent cupping mouth as if shouting</summary>
+        <member name="T:OpenMetaverse.Packets.UndoPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.SHRUG">
-            <summary>Agent shrugging shoulders</summary>
+        <member name="T:OpenMetaverse.Packets.UndoPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.SIT">
-            <summary>Agent in sit position</summary>
+        <member name="T:OpenMetaverse.Packets.RedoPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.SIT_FEMALE">
-            <summary>Agent in sit position (feminine)</summary>
+        <member name="T:OpenMetaverse.Packets.RedoPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.SIT_GENERIC">
-            <summary>Agent in sit position (generic)</summary>
+        <member name="T:OpenMetaverse.Packets.RedoPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.SIT_GROUND">
-            <summary>Agent sitting on ground</summary>
+        <member name="T:OpenMetaverse.Packets.UndoLandPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.SIT_GROUND_staticRAINED">
-            <summary>Agent sitting on ground</summary>
+        <member name="T:OpenMetaverse.Packets.UndoLandPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.SIT_TO_STAND">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.AgentPausePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.SLEEP">
-            <summary>Agent sleeping on side</summary>
+        <member name="T:OpenMetaverse.Packets.AgentPausePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.SMOKE_IDLE">
-            <summary>Agent smoking</summary>
+        <member name="T:OpenMetaverse.Packets.AgentResumePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.SMOKE_INHALE">
-            <summary>Agent inhaling smoke</summary>
+        <member name="T:OpenMetaverse.Packets.AgentResumePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.SMOKE_THROW_DOWN">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ChatFromViewerPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.SNAPSHOT">
-            <summary>Agent taking a picture</summary>
+        <member name="T:OpenMetaverse.Packets.ChatFromViewerPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.STAND">
-            <summary>Agent standing</summary>
+        <member name="T:OpenMetaverse.Packets.ChatFromViewerPacket.ChatDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.STANDUP">
-            <summary>Agent standing up</summary>
+        <member name="T:OpenMetaverse.Packets.AgentThrottlePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.STAND_1">
-            <summary>Agent standing</summary>
+        <member name="T:OpenMetaverse.Packets.AgentThrottlePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.STAND_2">
-            <summary>Agent standing</summary>
+        <member name="T:OpenMetaverse.Packets.AgentThrottlePacket.ThrottleBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.STAND_3">
-            <summary>Agent standing</summary>
+        <member name="T:OpenMetaverse.Packets.AgentFOVPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.STAND_4">
-            <summary>Agent standing</summary>
+        <member name="T:OpenMetaverse.Packets.AgentFOVPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.STRETCH">
-            <summary>Agent stretching</summary>
+        <member name="T:OpenMetaverse.Packets.AgentFOVPacket.FOVBlockBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.STRIDE">
-            <summary>Agent in stride (fast walk)</summary>
+        <member name="T:OpenMetaverse.Packets.AgentHeightWidthPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.SURF">
-            <summary>Agent surfing</summary>
+        <member name="T:OpenMetaverse.Packets.AgentHeightWidthPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.SURPRISE">
-            <summary>Agent acting surprised</summary>
+        <member name="T:OpenMetaverse.Packets.AgentHeightWidthPacket.HeightWidthBlockBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.SWORD_STRIKE">
-            <summary>Agent striking with a sword</summary>
+        <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.TALK">
-            <summary>Agent talking (lips moving)</summary>
+        <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.TANTRUM">
-            <summary>Agent throwing a tantrum</summary>
+        <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket.WearableDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.THROW_R">
-            <summary>Agent throwing an object (right handed)</summary>
+        <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.TRYON_SHIRT">
-            <summary>Agent trying on a shirt</summary>
+        <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket.VisualParamBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.TURNLEFT">
-            <summary>Agent turning to the left</summary>
+        <member name="T:OpenMetaverse.Packets.AgentQuitCopyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.TURNRIGHT">
-            <summary>Agent turning to the right</summary>
+        <member name="T:OpenMetaverse.Packets.AgentQuitCopyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.TYPE">
-            <summary>Agent typing</summary>
+        <member name="T:OpenMetaverse.Packets.AgentQuitCopyPacket.FuseBlockBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.WALK">
-            <summary>Agent walking</summary>
+        <member name="T:OpenMetaverse.Packets.ImageNotInDatabasePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.WHISPER">
-            <summary>Agent whispering</summary>
+        <member name="T:OpenMetaverse.Packets.ImageNotInDatabasePacket.ImageIDBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.WHISTLE">
-            <summary>Agent whispering with fingers in mouth</summary>
+        <member name="T:OpenMetaverse.Packets.RebakeAvatarTexturesPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.WINK">
-            <summary>Agent winking</summary>
+        <member name="T:OpenMetaverse.Packets.RebakeAvatarTexturesPacket.TextureDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.WINK_HOLLYWOOD">
-            <summary>Agent winking</summary>
+        <member name="T:OpenMetaverse.Packets.SetAlwaysRunPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.WORRY">
-            <summary>Agent worried</summary>
+        <member name="T:OpenMetaverse.Packets.SetAlwaysRunPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.YES">
-            <summary>Agent nodding yes</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDeletePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.YES_HAPPY">
-            <summary>Agent nodding yes with happy face</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDeletePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animations.YOGA_FLOAT">
-            <summary>Agent floating with legs and arms crossed</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDeletePacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ObjectDuplicatePacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.AvatarTextureIndex">
-            <summary>
-            Index of TextureEntry slots for avatar appearances
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDuplicatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.BakeType">
-            <summary>
-            Bake layers for avatar appearance
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDuplicatePacket.SharedDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.#ctor(OpenMetaverse.GridClient)">
-            <summary>
-            Default constructor
-            </summary>
-            <param name="client">A reference to our agent</param>
+        <member name="T:OpenMetaverse.Packets.ObjectDuplicatePacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.AppearanceManager.WearableData">
-            <summary>
-            Contains information about a wearable inventory item
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDuplicateOnRayPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WearableData.ItemID">
-            <summary>Inventory ItemID of the wearable</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDuplicateOnRayPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WearableData.AssetID">
-            <summary>AssetID of the wearable asset</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectDuplicateOnRayPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WearableData.WearableType">
-            <summary>WearableType of the wearable</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectScalePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WearableData.AssetType">
-            <summary>AssetType of the wearable</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectScalePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WearableData.Asset">
-            <summary>Asset data for the wearable</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectScalePacket.ObjectDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ObjectRotationPacket">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ObjectRotationPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.TextureData.TextureID">
-            <summary>A texture AssetID</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectRotationPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.TextureData.Texture">
-            <summary>Asset data for the texture</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectFlagUpdatePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.TextureData.AlphaMasks">
-            <summary>Collection of alpha masks that needs applying</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectFlagUpdatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.TextureData.Color">
-            <summary>Tint that should be applied to the texture</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectFlagUpdatePacket.ExtraPhysicsBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.TextureData.TextureIndex">
-            <summary>Where on avatar does this texture belong</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectClickActionPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.MAX_CONCURRENT_DOWNLOADS">
-            <summary>Maximum number of concurrent downloads for wearable assets and textures</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectClickActionPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.MAX_CONCURRENT_UPLOADS">
-            <summary>Maximum number of concurrent uploads for baked textures</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectClickActionPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.INVENTORY_TIMEOUT">
-            <summary>Timeout for fetching inventory listings</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectImagePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WEARABLE_TIMEOUT">
-            <summary>Timeout for fetching a single wearable, or receiving a single packet response</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectImagePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.TEXTURE_TIMEOUT">
-            <summary>Timeout for fetching a single texture</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectImagePacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.UPLOAD_TIMEOUT">
-            <summary>Timeout for uploading a single baked texture</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectMaterialPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.UPLOAD_RETRIES">
-            <summary>Number of times to retry bake upload</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectMaterialPacket.AgentDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ObjectMaterialPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WEARABLE_COUNT">
-            <summary>Total number of wearables for each avatar</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectShapePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.BAKED_TEXTURE_COUNT">
-            <summary>Total number of baked textures on each avatar</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectShapePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WEARABLES_PER_LAYER">
-            <summary>Total number of wearables per bake layer</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectShapePacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.BakeIndexToTextureIndex">
-            <summary>Mapping between BakeType and AvatarTextureIndex</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectExtraParamsPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.WEARABLE_BAKE_MAP">
-            <summary>Map of what wearables are included in each bake</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectExtraParamsPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.BAKED_TEXTURE_HASH">
-            <summary>Magic values to finalize the cache check hashes for each
-            bake</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectExtraParamsPacket.ObjectDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ObjectOwnerPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.m_AgentWearablesReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectOwnerPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.m_AgentWearablesLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectOwnerPacket.HeaderDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.m_AgentCachedBakesReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectOwnerPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.m_AgentCachedBakesLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectGroupPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.m_AppearanceSet">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectGroupPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.m_AppearanceSetLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectGroupPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.m_RebakeAvatarReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectBuyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.m_RebakeAvatarLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectBuyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.MyVisualParameters">
-            <summary>Visual parameters last sent to the sim</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectBuyPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.MyTextures">
-            <summary>Textures about this client sent to the sim</summary>
+        <member name="T:OpenMetaverse.Packets.BuyObjectInventoryPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.Wearables">
-            <summary>A cache of wearables currently being worn</summary>
+        <member name="T:OpenMetaverse.Packets.BuyObjectInventoryPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.Textures">
-            <summary>A cache of textures currently being worn</summary>
+        <member name="T:OpenMetaverse.Packets.BuyObjectInventoryPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.CacheCheckSerialNum">
-            <summary>Incrementing serial number for AgentCachedTexture packets</summary>
+        <member name="T:OpenMetaverse.Packets.DerezContainerPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.SetAppearanceSerialNum">
-            <summary>Incrementing serial number for AgentSetAppearance packets</summary>
+        <member name="T:OpenMetaverse.Packets.DerezContainerPacket.DataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ObjectPermissionsPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.Client">
-            <summary>Reference to our agent</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectPermissionsPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.RebakeScheduleTimer">
-            <summary>
-            Timer used for delaying rebake on changing outfit
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ObjectPermissionsPacket.HeaderDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AppearanceManager.AppearanceThread">
-            <summary>
-            Main appearance thread
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ObjectPermissionsPacket.ObjectDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ObjectSaleInfoPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ObjectSaleInfoPacket.AgentDataBlock">
+            <exclude/>
         </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>
-        <member name="E:OpenMetaverse.AppearanceManager.RebakeAvatarRequested">
-            <summary>
-            Triggered when the simulator requests the agent rebake its appearance.
-            </summary>
-            <seealso cref="!:RebakeAvatarRequest" />
+        <member name="T:OpenMetaverse.Packets.ObjectSaleInfoPacket.ObjectDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ObjectNamePacket">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ObjectNamePacket.AgentDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ObjectNamePacket.ObjectDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ObjectDescriptionPacket">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ObjectDescriptionPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ObjectDescriptionPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.SetPreviousAppearance(System.Boolean)">
-            <summary>
-            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 name="T:OpenMetaverse.Packets.ObjectCategoryPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.RequestSetAppearance">
-            <summary>
-            Starts the appearance setting thread
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ObjectCategoryPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.RequestSetAppearance(System.Boolean)">
-            <summary>
-            Starts the appearance setting thread
-            </summary>
-            <param name="forceRebake">True to force rebaking, otherwise false</param>
+        <member name="T:OpenMetaverse.Packets.ObjectCategoryPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.RequestAgentWearables">
-            <summary>
-            Ask the server what textures our agent is currently wearing
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ObjectSelectPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.RequestCachedBakes">
-            <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 name="T:OpenMetaverse.Packets.ObjectSelectPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ObjectSelectPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ObjectDeselectPacket">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ObjectDeselectPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ObjectDeselectPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ObjectAttachPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.ReplaceOutfit(System.Collections.Generic.List{OpenMetaverse.InventoryItem})">
-            <summary>
-            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 name="T:OpenMetaverse.Packets.ObjectAttachPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.ReplaceOutfit(System.Collections.Generic.List{OpenMetaverse.InventoryItem},System.Boolean)">
-            <summary>
-            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 name="T:OpenMetaverse.Packets.ObjectAttachPacket.ObjectDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ObjectDetachPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ObjectDetachPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ObjectDetachPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ObjectDropPacket">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ObjectDropPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ObjectDropPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ObjectLinkPacket">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ObjectLinkPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.SendAgentIsNowWearing">
-            <summary>
-            Inform the sim which wearables are part of our current outfit
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ObjectLinkPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ObjectDelinkPacket">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ObjectDelinkPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AppearanceManager.GetAgentWearables">
-            <summary>
-            Blocking method to populate the Wearables dictionary
-            </summary>
-            <returns>True on success, otherwise false</returns>
+        <member name="T:OpenMetaverse.Packets.ObjectDelinkPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ObjectGrabPacket">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ObjectGrabPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ObjectGrabPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ObjectGrabPacket.SurfaceInfoBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ObjectGrabUpdatePacket">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ObjectGrabUpdatePacket.AgentDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ObjectGrabUpdatePacket.ObjectDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ObjectGrabUpdatePacket.SurfaceInfoBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ObjectDeGrabPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ObjectDeGrabPacket.AgentDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ObjectDeGrabPacket.ObjectDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ObjectDeGrabPacket.SurfaceInfoBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ObjectSpinStartPacket">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ObjectSpinStartPacket.AgentDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ObjectSpinStartPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.AgentWearablesReplyEventArgs">
-            <summary>Contains the Event data returned from the data server from an AgentWearablesRequest</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectSpinUpdatePacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentWearablesReplyEventArgs.#ctor">
-            <summary>Construct a new instance of the AgentWearablesReplyEventArgs class</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectSpinUpdatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.AgentCachedBakesReplyEventArgs">
-            <summary>Contains the Event data returned from the data server from an AgentCachedTextureResponse</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectSpinUpdatePacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentCachedBakesReplyEventArgs.#ctor">
-            <summary>Construct a new instance of the AgentCachedBakesReplyEventArgs class</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectSpinStopPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.AppearanceSetEventArgs">
-            <summary>Contains the Event data returned from an AppearanceSetRequest</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectSpinStopPacket.AgentDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ObjectSpinStopPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AppearanceSetEventArgs.Success">
-            <summary>Indicates whether appearance setting was successful</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectExportSelectedPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.RebakeAvatarTexturesEventArgs">
-            <summary>Contains the Event data returned from the data server from an RebakeAvatarTextures</summary>
+        <member name="T:OpenMetaverse.Packets.ObjectExportSelectedPacket.AgentDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ObjectExportSelectedPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.RebakeAvatarTexturesEventArgs.TextureID">
-            <summary>The ID of the Texture Layer to bake</summary>
+        <member name="T:OpenMetaverse.Packets.ModifyLandPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.AssetCache">
-            <summary>
-            Class that handles the local asset cache
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ModifyLandPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.#ctor(OpenMetaverse.GridClient)">
-            <summary>
-            Default constructor
-            </summary>
-            <param name="client">A reference to the GridClient object</param>
+        <member name="T:OpenMetaverse.Packets.ModifyLandPacket.ModifyBlockBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.AssetCache.SortFilesByAccesTimeHelper">
-            <summary>
-            Helper class for sorting files by their last accessed time
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ModifyLandPacket.ParcelDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ModifyLandPacket.ModifyBlockExtendedBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AssetCache.AutoPruneInterval">
-            <summary>
-            How long (in ms) between cache checks (default is 5 min.)
-            </summary>
+        <member name="T:OpenMetaverse.Packets.VelocityInterpolateOnPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.DestroyTimer">
-            <summary>
-            Disposes cleanup timer
-            </summary>
+        <member name="T:OpenMetaverse.Packets.VelocityInterpolateOnPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.SetupTimer">
-            <summary>
-            Only create timer when needed
-            </summary>
+        <member name="T:OpenMetaverse.Packets.VelocityInterpolateOffPacket">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.VelocityInterpolateOffPacket.AgentDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.StateSavePacket">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.StateSavePacket.AgentDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.StateSavePacket.DataBlockBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ReportAutosaveCrashPacket">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ReportAutosaveCrashPacket.AutosaveDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.SimWideDeletesPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.Clear">
-            <summary>
-            Wipes out entire cache
-            </summary>
+        <member name="T:OpenMetaverse.Packets.SimWideDeletesPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.Prune">
-            <summary>
-            Brings cache size to the 90% of the max size
-            </summary>
+        <member name="T:OpenMetaverse.Packets.SimWideDeletesPacket.DataBlockBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.BeginPrune">
-            <summary>
-            Asynchronously brings cache size to the 90% of the max size
-            </summary>
+        <member name="T:OpenMetaverse.Packets.TrackAgentPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.GetFileSize(System.IO.FileInfo[])">
-            <summary>
-            Adds up file sizes passes in a FileInfo array
-            </summary>
+        <member name="T:OpenMetaverse.Packets.TrackAgentPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.Operational">
-            <summary>
-            Checks whether caching is enabled
-            </summary>
+        <member name="T:OpenMetaverse.Packets.TrackAgentPacket.TargetDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AssetCache.cleanerTimer_Elapsed(System.Object,System.Timers.ElapsedEventArgs)">
-            <summary>
-            Periodically prune the cache
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ViewerStatsPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.StatusCode">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.DownloadTotalsBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.StatusCode.OK">
-            <summary>OK</summary>
+        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.NetStatsBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.StatusCode.Done">
-            <summary>Transfer completed</summary>
+        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.FailStatsBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.StatusCode.Skip">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.MiscStatsBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.StatusCode.Abort">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ScriptAnswerYesPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.StatusCode.Error">
-            <summary>Unknown error occurred</summary>
+        <member name="T:OpenMetaverse.Packets.ScriptAnswerYesPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.StatusCode.UnknownSource">
-            <summary>Equivalent to a 404 error</summary>
+        <member name="T:OpenMetaverse.Packets.ScriptAnswerYesPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.StatusCode.InsufficientPermissions">
-            <summary>Client does not have permission for that resource</summary>
+        <member name="T:OpenMetaverse.Packets.UserReportPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.StatusCode.Unknown">
-            <summary>Unknown status</summary>
+        <member name="T:OpenMetaverse.Packets.UserReportPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.ChannelType">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.UserReportPacket.ReportDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ChannelType.Unknown">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.AlertMessagePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ChannelType.Misc">
-            <summary>Unknown</summary>
+        <member name="T:OpenMetaverse.Packets.AlertMessagePacket.AlertDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ChannelType.Asset">
-            <summary>Virtually all asset transfers use this channel</summary>
+        <member name="T:OpenMetaverse.Packets.AlertMessagePacket.AlertInfoBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.SourceType">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.AgentAlertMessagePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.SourceType.Unknown">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.AgentAlertMessagePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.SourceType.Asset">
-            <summary>Asset from the asset server</summary>
+        <member name="T:OpenMetaverse.Packets.AgentAlertMessagePacket.AlertDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.SourceType.SimInventoryItem">
-            <summary>Inventory item</summary>
+        <member name="T:OpenMetaverse.Packets.MeanCollisionAlertPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.SourceType.SimEstate">
-            <summary>Estate asset, such as an estate covenant</summary>
+        <member name="T:OpenMetaverse.Packets.MeanCollisionAlertPacket.MeanCollisionBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.TargetType">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ViewerFrozenMessagePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TargetType.Unknown">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ViewerFrozenMessagePacket.FrozenDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TargetType.File">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.HealthMessagePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.TargetType.VFile">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.HealthMessagePacket.HealthDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.ImageType">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ChatFromSimulatorPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ImageType.Normal">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ChatFromSimulatorPacket.ChatDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.ImageType.Baked">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.SimStatsPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.ImageCodec">
-            <summary>
-            Image file format
-            </summary>
+        <member name="T:OpenMetaverse.Packets.SimStatsPacket.RegionBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Transfer">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.SimStatsPacket.StatBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.Transfer.TimeSinceLastPacket">
-            <summary>Number of milliseconds passed since the last transfer
-            packet was received</summary>
+        <member name="T:OpenMetaverse.Packets.SimStatsPacket.PidStatBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.AssetDownload">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.SimStatsPacket.RegionInfoBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.XferDownload">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.RequestRegionInfoPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.ImageDownload">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.RequestRegionInfoPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.AssetUpload">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.RegionInfoPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.ImageRequest">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.RegionInfoPacket.AgentDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.RegionInfoPacket.RegionInfoBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.AssetManager">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.RegionInfoPacket.RegionInfo2Block">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.#ctor(OpenMetaverse.GridClient)">
-            <summary>
-            Default constructor
-            </summary>
-            <param name="client">A reference to the GridClient object</param>
+        <member name="T:OpenMetaverse.Packets.RegionInfoPacket.RegionInfo3Block">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.GodUpdateRegionInfoPacket">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.GodUpdateRegionInfoPacket.AgentDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.GodUpdateRegionInfoPacket.RegionInfoBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.GodUpdateRegionInfoPacket.RegionInfo2Block">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_XferReceivedEvent">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Packets.RegionHandshakePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_XferReceivedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.RegionHandshakePacket.RegionInfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_AssetUploadedEvent">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Packets.RegionHandshakePacket.RegionInfo2Block">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_AssetUploadedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.RegionHandshakePacket.RegionInfo3Block">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_UploadProgressEvent">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Packets.RegionHandshakePacket.RegionInfo4Block">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_UploadProgressLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.RegionHandshakeReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_InitiateDownloadEvent">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Packets.RegionHandshakeReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_InitiateDownloadLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.RegionHandshakeReplyPacket.RegionInfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_ImageReceiveProgressEvent">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="T:OpenMetaverse.Packets.SimulatorViewerTimeMessagePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.m_ImageReceiveProgressLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.SimulatorViewerTimeMessagePacket.TimeInfoBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AssetManager.Cache">
-            <summary>Texture download cache</summary>
+        <member name="T:OpenMetaverse.Packets.EnableSimulatorPacket">
+            <exclude/>
         </member>
-        <member name="E:OpenMetaverse.AssetManager.XferReceived">
-            <summary>Raised when the simulator responds sends </summary>
+        <member name="T:OpenMetaverse.Packets.EnableSimulatorPacket.SimulatorInfoBlock">
+            <exclude/>
         </member>
-        <member name="E:OpenMetaverse.AssetManager.AssetUploaded">
-            <summary>Raised during upload completes</summary>
+        <member name="T:OpenMetaverse.Packets.DisableSimulatorPacket">
+            <exclude/>
         </member>
-        <member name="E:OpenMetaverse.AssetManager.UploadProgress">
-            <summary>Raised during upload with progres update</summary>
+        <member name="T:OpenMetaverse.Packets.TransferRequestPacket">
+            <exclude/>
         </member>
-        <member name="E:OpenMetaverse.AssetManager.InitiateDownload">
-            <summary>Fired when the simulator sends an InitiateDownloadPacket, used to download terrain .raw files</summary>
+        <member name="T:OpenMetaverse.Packets.TransferRequestPacket.TransferInfoBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.TransferInfoPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.TransferInfoPacket.TransferInfoBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.TransferAbortPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.TransferAbortPacket.TransferInfoBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.RequestXferPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.RequestXferPacket.XferIDBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestAsset(OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean,OpenMetaverse.AssetManager.AssetReceivedCallback)">
-            <summary>
-            Request an asset download
-            </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>
+        <member name="T:OpenMetaverse.Packets.AbortXferPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestAsset(OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean,OpenMetaverse.SourceType,OpenMetaverse.AssetManager.AssetReceivedCallback)">
-            <summary>
-            Request an asset download
-            </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>
+        <member name="T:OpenMetaverse.Packets.AbortXferPacket.XferIDBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestAsset(OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean,OpenMetaverse.SourceType,OpenMetaverse.UUID,OpenMetaverse.AssetManager.AssetReceivedCallback)">
-            <summary>
-            Request an asset download
-            </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 name="T:OpenMetaverse.Packets.AvatarAppearancePacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestAssetXfer(System.String,System.Boolean,System.Boolean,OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean)">
-            <summary>
-            Request an asset download through the almost deprecated Xfer system
-            </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 name="T:OpenMetaverse.Packets.AvatarAppearancePacket.SenderBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestInventoryAsset(OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean,OpenMetaverse.AssetManager.AssetReceivedCallback)">
-            <summary>
-            </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 name="T:OpenMetaverse.Packets.AvatarAppearancePacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.SetPendingAssetUploadData(OpenMetaverse.AssetUpload)">
-            <summary>
-            Used to force asset data into the PendingUpload property, ie: for raw terrain uploads
-            </summary>
-            <param name="assetData">An AssetUpload object containing the data to upload to the simulator</param>
+        <member name="T:OpenMetaverse.Packets.AvatarAppearancePacket.VisualParamBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestUpload(OpenMetaverse.Assets.Asset,System.Boolean)">
-            <summary>
-            Request an asset be uploaded to the simulator
-            </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>
+        <member name="T:OpenMetaverse.Packets.AvatarAppearancePacket.AppearanceDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestUpload(OpenMetaverse.AssetType,System.Byte[],System.Boolean)">
-            <summary>
-            Request an asset be uploaded to the simulator
-            </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>
+        <member name="T:OpenMetaverse.Packets.SetFollowCamPropertiesPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestUpload(OpenMetaverse.UUID@,OpenMetaverse.AssetType,System.Byte[],System.Boolean)">
-            <summary>
-            Request an asset be uploaded to the simulator
-            </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>
+        <member name="T:OpenMetaverse.Packets.SetFollowCamPropertiesPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestUpload(OpenMetaverse.UUID@,OpenMetaverse.AssetType,System.Byte[],System.Boolean,OpenMetaverse.UUID)">
-            <summary>
-            Initiate an asset upload
-            </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>
+        <member name="T:OpenMetaverse.Packets.SetFollowCamPropertiesPacket.CameraPropertyBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ClearFollowCamPropertiesPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestImage(OpenMetaverse.UUID,OpenMetaverse.TextureDownloadCallback)">
-            <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
-            </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 name="T:OpenMetaverse.Packets.ClearFollowCamPropertiesPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestImage(OpenMetaverse.UUID,OpenMetaverse.ImageType,OpenMetaverse.TextureDownloadCallback)">
-            <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
-            </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>
+        <member name="T:OpenMetaverse.Packets.RequestPayPricePacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestImage(OpenMetaverse.UUID,OpenMetaverse.ImageType,OpenMetaverse.TextureDownloadCallback,System.Boolean)">
-            <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
-            </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>
+        <member name="T:OpenMetaverse.Packets.RequestPayPricePacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestImageCancel(OpenMetaverse.UUID)">
-            <summary>
-            Cancel a texture request
-            </summary>
-            <param name="textureID">The texture assets <see cref="T:OpenMetaverse.UUID" /></param>
+        <member name="T:OpenMetaverse.Packets.PayPriceReplyPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.RequestMesh(OpenMetaverse.UUID,OpenMetaverse.AssetManager.MeshDownloadCallback)">
-            <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 name="T:OpenMetaverse.Packets.PayPriceReplyPacket.ObjectDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AssetManager.FireImageProgressEvent(OpenMetaverse.UUID,System.Int32,System.Int32)">
-            <summary>
-            Lets TexturePipeline class fire the progress event
-            </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>
+        <member name="T:OpenMetaverse.Packets.PayPriceReplyPacket.ButtonDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.KickUserPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.KickUserPacket.TargetBlockBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.KickUserPacket.UserInfoBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.GodKickUserPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.GodKickUserPacket.UserInfoBlock">
+            <exclude/>
         </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.Packets.EjectUserPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.EjectUserPacket.AgentDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.EjectUserPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.XferReceivedEventArgs.Xfer">
-            <summary>Xfer data</summary>
+        <member name="T:OpenMetaverse.Packets.FreezeUserPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AssetUploadEventArgs.Upload">
-            <summary>Upload data</summary>
+        <member name="T:OpenMetaverse.Packets.FreezeUserPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.InitiateDownloadEventArgs.SimFileName">
-            <summary>Filename used on the simulator</summary>
+        <member name="T:OpenMetaverse.Packets.FreezeUserPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.InitiateDownloadEventArgs.ViewerFileName">
-            <summary>Filename used by the client</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPropertiesRequestPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ImageReceiveProgressEventArgs.ImageID">
-            <summary>UUID of the image that is in progress</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPropertiesRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ImageReceiveProgressEventArgs.Received">
-            <summary>Number of bytes received so far</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPropertiesReplyPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.ImageReceiveProgressEventArgs.Total">
-            <summary>Image size in bytes</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPropertiesReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.ProfileFlags">
-            <summary>
-            Avatar profile flags
-            </summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPropertiesReplyPacket.PropertiesDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Avatar">
-            <summary>
-            Represents an avatar (other than your own)
-            </summary>
+        <member name="T:OpenMetaverse.Packets.AvatarInterestsReplyPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.Avatar.#ctor">
-            <summary>
-            Default constructor
-            </summary>
+        <member name="T:OpenMetaverse.Packets.AvatarInterestsReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Avatar.Statistics">
-            <summary>
-            Positive and negative ratings
-            </summary>
+        <member name="T:OpenMetaverse.Packets.AvatarInterestsReplyPacket.PropertiesDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Statistics.BehaviorPositive">
-            <summary>Positive ratings for Behavior</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarGroupsReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Statistics.BehaviorNegative">
-            <summary>Negative ratings for Behavior</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarGroupsReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Statistics.AppearancePositive">
-            <summary>Positive ratings for Appearance</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarGroupsReplyPacket.GroupDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Statistics.AppearanceNegative">
-            <summary>Negative ratings for Appearance</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarGroupsReplyPacket.NewGroupDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Statistics.BuildingPositive">
-            <summary>Positive ratings for Building</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPropertiesUpdatePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Statistics.BuildingNegative">
-            <summary>Negative ratings for Building</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPropertiesUpdatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Statistics.GivenPositive">
-            <summary>Positive ratings given by this avatar</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPropertiesUpdatePacket.PropertiesDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Statistics.GivenNegative">
-            <summary>Negative ratings given by this avatar</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarInterestsUpdatePacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Avatar.AvatarProperties">
-            <summary>
-            Avatar properties including about text, profile URL, image IDs and
-            publishing settings
-            </summary>
+        <member name="T:OpenMetaverse.Packets.AvatarInterestsUpdatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.FirstLifeText">
-            <summary>First Life about text</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarInterestsUpdatePacket.PropertiesDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.FirstLifeImage">
-            <summary>First Life image ID</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarNotesReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.Partner">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.AvatarNotesReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.AboutText">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.AvatarNotesReplyPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.BornOn">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.AvatarNotesUpdatePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.CharterMember">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.AvatarNotesUpdatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.ProfileImage">
-            <summary>Profile image ID</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarNotesUpdatePacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.Flags">
-            <summary>Flags of the profile</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPicksReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Avatar.AvatarProperties.ProfileURL">
-            <summary>Web URL for this profile</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPicksReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.Avatar.AvatarProperties.AllowPublish">
-            <summary>Should this profile be published on the web</summary>
+        <member name="T:OpenMetaverse.Packets.AvatarPicksReplyPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.Avatar.AvatarProperties.Online">
-            <summary>Avatar Online Status</summary>
+        <member name="T:OpenMetaverse.Packets.EventInfoRequestPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.Avatar.AvatarProperties.MaturePublish">
-            <summary>Is this a mature profile</summary>
+        <member name="T:OpenMetaverse.Packets.EventInfoRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.Avatar.AvatarProperties.Identified">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.EventInfoRequestPacket.EventDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.Avatar.AvatarProperties.Transacted">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.EventInfoReplyPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Avatar.Interests">
-            <summary>
-            Avatar interests including spoken languages, skills, and "want to"
-            choices
-            </summary>
+        <member name="T:OpenMetaverse.Packets.EventInfoReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Interests.LanguagesText">
-            <summary>Languages profile field</summary>
+        <member name="T:OpenMetaverse.Packets.EventInfoReplyPacket.EventDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Interests.SkillsMask">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.EventNotificationAddRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Interests.SkillsText">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.EventNotificationAddRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Interests.WantToMask">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.EventNotificationAddRequestPacket.EventDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Interests.WantToText">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.EventNotificationRemoveRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Avatar.Groups">
-            <summary>Groups that this avatar is a member of</summary>
+        <member name="T:OpenMetaverse.Packets.EventNotificationRemoveRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Avatar.ProfileStatistics">
-            <summary>Positive and negative ratings</summary>
+        <member name="T:OpenMetaverse.Packets.EventNotificationRemoveRequestPacket.EventDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Avatar.ProfileProperties">
-            <summary>Avatar properties including about text, profile URL, image IDs and
-            publishing settings</summary>
+        <member name="T:OpenMetaverse.Packets.EventGodDeletePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Avatar.ProfileInterests">
-            <summary>Avatar interests including spoken languages, skills, and "want to"
-            choices</summary>
+        <member name="T:OpenMetaverse.Packets.EventGodDeletePacket.AgentDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.EventGodDeletePacket.EventDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Avatar.VisualParameters">
-            <summary>
-            Contains the visual parameters describing the deformation of the avatar
-            </summary>
+        <member name="T:OpenMetaverse.Packets.EventGodDeletePacket.QueryDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.Avatar.FirstName">
-            <summary>First name</summary>
+        <member name="T:OpenMetaverse.Packets.PickInfoReplyPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.Avatar.LastName">
-            <summary>Last name</summary>
+        <member name="T:OpenMetaverse.Packets.PickInfoReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.Avatar.Name">
-            <summary>Full name</summary>
+        <member name="T:OpenMetaverse.Packets.PickInfoReplyPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.Avatar.GroupName">
-            <summary>Active group</summary>
+        <member name="T:OpenMetaverse.Packets.PickInfoUpdatePacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.AgentDisplayName">
-            <summary> Information about agents display name </summary>
+        <member name="T:OpenMetaverse.Packets.PickInfoUpdatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentDisplayName.ID">
-            <summary> Agent UUID </summary>
+        <member name="T:OpenMetaverse.Packets.PickInfoUpdatePacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentDisplayName.UserName">
-            <summary> Username </summary>
+        <member name="T:OpenMetaverse.Packets.PickDeletePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentDisplayName.DisplayName">
-            <summary> Display name </summary>
+        <member name="T:OpenMetaverse.Packets.PickDeletePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentDisplayName.LegacyFirstName">
-            <summary> First name (legacy) </summary>
+        <member name="T:OpenMetaverse.Packets.PickDeletePacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentDisplayName.LegacyLastName">
-            <summary> Last name (legacy) </summary>
+        <member name="T:OpenMetaverse.Packets.PickGodDeletePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentDisplayName.IsDefaultDisplayName">
-            <summary> Is display name default display name </summary>
+        <member name="T:OpenMetaverse.Packets.PickGodDeletePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AgentDisplayName.NextUpdate">
-            <summary> Cache display name until </summary>
+        <member name="T:OpenMetaverse.Packets.PickGodDeletePacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AgentDisplayName.LegacyFullName">
-            <summary> Full name (legacy) </summary>
+        <member name="T:OpenMetaverse.Packets.ScriptQuestionPacket">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ScriptQuestionPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AgentDisplayName.GetOSD">
-            <summary>
-            Return object as OSD map
-            </summary>
-            <returns>OSD containing agent's display name data</returns>
+        <member name="T:OpenMetaverse.Packets.ScriptControlChangePacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.AvatarGroup">
-            <summary>
-            Holds group information for Avatars such as those you might find in a profile
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ScriptControlChangePacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarGroup.AcceptNotices">
-            <summary>true of Avatar accepts group notices</summary>
+        <member name="T:OpenMetaverse.Packets.ScriptDialogPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarGroup.GroupID">
-            <summary>Groups Key</summary>
+        <member name="T:OpenMetaverse.Packets.ScriptDialogPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarGroup.GroupInsigniaID">
-            <summary>Texture Key for groups insignia</summary>
+        <member name="T:OpenMetaverse.Packets.ScriptDialogPacket.ButtonsBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarGroup.GroupName">
-            <summary>Name of the group</summary>
+        <member name="T:OpenMetaverse.Packets.ScriptDialogPacket.OwnerDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarGroup.GroupPowers">
-            <summary>Powers avatar has in the group</summary>
+        <member name="T:OpenMetaverse.Packets.ScriptDialogReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarGroup.GroupTitle">
-            <summary>Avatars Currently selected title</summary>
+        <member name="T:OpenMetaverse.Packets.ScriptDialogReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarGroup.ListInProfile">
-            <summary>true of Avatar has chosen to list this in their profile</summary>
+        <member name="T:OpenMetaverse.Packets.ScriptDialogReplyPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.Animation">
-            <summary>
-            Contains an animation currently being played by an agent
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ForceScriptControlReleasePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animation.AnimationID">
-            <summary>The ID of the animation asset</summary>
+        <member name="T:OpenMetaverse.Packets.ForceScriptControlReleasePacket.AgentDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.RevokePermissionsPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.Animation.AnimationSourceObjectID">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.Packets.RevokePermissionsPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.ProfilePick">
-            <summary>
-            Holds group information on an individual profile pick
-            </summary>
+        <member name="T:OpenMetaverse.Packets.RevokePermissionsPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.AvatarManager">
-            <summary>
-            Retrieve friend status notifications, and retrieve avatar names and
-            profiles
-            </summary>
+        <member name="T:OpenMetaverse.Packets.LoadURLPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.#ctor(OpenMetaverse.GridClient)">
-            <summary>
-            Represents other avatars
-            </summary>
-            <param name="client">
-            </param>
+        <member name="T:OpenMetaverse.Packets.LoadURLPacket.DataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ScriptTeleportRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarAnimation">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.Packets.ScriptTeleportRequestPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarAnimationLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelOverlayPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarAppearance">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelOverlayPacket.ParcelDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarAppearanceLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestByIDPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_UUIDNameReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestByIDPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_UUIDNameReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestByIDPacket.ParcelDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarInterestsReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelPropertiesUpdatePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarInterestsReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelPropertiesUpdatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPropertiesReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelPropertiesUpdatePacket.ParcelDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPropertiesReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarGroupsReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarGroupsReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket.ParcelDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPickerReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket.TaskIDsBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPickerReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket.OwnerIDsBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffectPointAt">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelSetOtherCleanTimePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffectPointAtLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelSetOtherCleanTimePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffectLookAt">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelSetOtherCleanTimePacket.ParcelDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffectLookAtLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffect">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_ViewerEffectLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket.ParcelDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPicksReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket.TaskIDsBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarPicksReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket.OwnerIDsBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_PickInfoReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelSelectObjectsPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_PickInfoReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelSelectObjectsPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarClassifiedReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelSelectObjectsPacket.ParcelDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_AvatarClassifiedReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelSelectObjectsPacket.ReturnIDsBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_ClassifiedInfoReply">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.Packets.EstateCovenantRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_ClassifiedInfoReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.EstateCovenantRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_DisplayNameUpdate">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <member name="T:OpenMetaverse.Packets.EstateCovenantReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.AvatarManager.m_DisplayNameUpdateLock">
-            <summary>Thread sync lock object</summary>
+        <member name="T:OpenMetaverse.Packets.EstateCovenantReplyPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.AvatarAnimation">
-            <summary>Raised when the simulator sends us data containing
-            an agents animation playlist</summary>
+        <member name="T:OpenMetaverse.Packets.ForceObjectSelectPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ForceObjectSelectPacket.HeaderBlock">
+            <exclude/>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.UUIDNameReply">
-            <summary>Raised when the simulator sends us data containing
-            agent names/id values</summary>
+        <member name="T:OpenMetaverse.Packets.ForceObjectSelectPacket.DataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ParcelBuyPassPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ParcelBuyPassPacket.AgentDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ParcelBuyPassPacket.ParcelDataBlock">
+            <exclude/>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.AvatarPickerReply">
-            <summary>Raised when the simulator sends us data containing
-            name/id pair</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelDeedToGroupPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ParcelDeedToGroupPacket.AgentDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ParcelDeedToGroupPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.ViewerEffect">
-            <summary>Raised when the simulator sends us data containing
-            an agents viewer effect information</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelReclaimPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ParcelReclaimPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.PickInfoReply">
-            <summary>Raised when the simulator sends us data containing
-            the Pick details</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelReclaimPacket.DataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ParcelClaimPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ParcelClaimPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="E:OpenMetaverse.AvatarManager.DisplayNameUpdate">
-            <summary>Raised when the simulator sends us data containing
-            the details of display name change</summary>
+        <member name="T:OpenMetaverse.Packets.ParcelClaimPacket.DataBlock">
+            <exclude/>
         </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.Packets.ParcelClaimPacket.ParcelDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ParcelJoinPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ParcelJoinPacket.AgentDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ParcelJoinPacket.ParcelDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ParcelDividePacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ParcelDividePacket.AgentDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ParcelDividePacket.ParcelDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ParcelReleasePacket">
+            <exclude/>
         </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.Packets.ParcelReleasePacket.AgentDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ParcelReleasePacket.DataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ParcelBuyPacket">
+            <exclude/>
         </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.Packets.ParcelBuyPacket.AgentDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ParcelBuyPacket.DataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ParcelBuyPacket.ParcelDataBlock">
+            <exclude/>
         </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 name="T:OpenMetaverse.Packets.ParcelGodForceOwnerPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ParcelGodForceOwnerPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarName(OpenMetaverse.UUID)">
-            <summary>
-            Request a single avatar name
-            </summary>
-            <param name="id">The avatar key to retrieve a name for</param>
+        <member name="T:OpenMetaverse.Packets.ParcelGodForceOwnerPacket.DataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ParcelAccessListRequestPacket">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ParcelAccessListRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ParcelAccessListRequestPacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarProperties(OpenMetaverse.UUID)">
-            <summary>
-            Start a request for Avatar Properties
-            </summary>
-            <param name="avatarid">
-            </param>
+        <member name="T:OpenMetaverse.Packets.ParcelAccessListReplyPacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.RequestAvatarNameSearch(System.String,OpenMetaverse.UUID)">
-            <summary>
-            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 name="T:OpenMetaverse.Packets.ParcelAccessListReplyPacket.DataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ParcelAccessListReplyPacket.ListBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ParcelAccessListUpdatePacket">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.RequestPickInfo(OpenMetaverse.UUID,OpenMetaverse.UUID)">
-            <summary>
-            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 name="T:OpenMetaverse.Packets.ParcelAccessListUpdatePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ParcelAccessListUpdatePacket.DataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ParcelAccessListUpdatePacket.ListBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ParcelDwellRequestPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ParcelDwellRequestPacket.AgentDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ParcelDwellRequestPacket.DataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ParcelDwellReplyPacket">
+            <exclude/>
         </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="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 name="T:OpenMetaverse.Packets.ParcelDwellReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AvatarManager.AvatarGroupsReplyMessageHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
-            <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.
-            </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 name="T:OpenMetaverse.Packets.ParcelDwellReplyPacket.DataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ParcelGodMarkAsContentPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ParcelGodMarkAsContentPacket.AgentDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ParcelGodMarkAsContentPacket.ParcelDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ViewerStartAuctionPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ViewerStartAuctionPacket.AgentDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.ViewerStartAuctionPacket.ParcelDataBlock">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.UUIDNameRequestPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.UUIDNameRequestPacket.UUIDNameBlockBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.AvatarAnimationEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.Animation})">
-            <summary>
-            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 name="T:OpenMetaverse.Packets.UUIDNameReplyPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AvatarAnimationEventArgs.AvatarID">
-            <summary>Get the ID of the agent</summary>
+        <member name="T:OpenMetaverse.Packets.UUIDNameReplyPacket.UUIDNameBlockBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AvatarAnimationEventArgs.Animations">
-            <summary>Get the list of animations to start</summary>
+        <member name="T:OpenMetaverse.Packets.UUIDGroupNameRequestPacket">
+            <exclude/>
         </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="T:OpenMetaverse.Packets.UUIDGroupNameRequestPacket.UUIDNameBlockBlock">
+            <exclude/>
         </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>
-            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 name="T:OpenMetaverse.Packets.UUIDGroupNameReplyPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.Simulator">
-            <summary>Get the Simulator this request is from of the agent</summary>
+        <member name="T:OpenMetaverse.Packets.UUIDGroupNameReplyPacket.UUIDNameBlockBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.AvatarID">
-            <summary>Get the ID of the agent</summary>
+        <member name="T:OpenMetaverse.Packets.ChildAgentDyingPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.IsTrial">
-            <summary>true if the agent is a trial account</summary>
+        <member name="T:OpenMetaverse.Packets.ChildAgentDyingPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.DefaultTexture">
-            <summary>Get the default agent texture</summary>
+        <member name="T:OpenMetaverse.Packets.ChildAgentUnknownPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.FaceTextures">
-            <summary>Get the agents appearance layer textures</summary>
+        <member name="T:OpenMetaverse.Packets.ChildAgentUnknownPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AvatarAppearanceEventArgs.VisualParams">
-            <summary>Get the <see cref="T:OpenMetaverse.VisualParams" /> for the agent</summary>
+        <member name="T:OpenMetaverse.Packets.GetScriptRunningPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.AvatarInterestsReplyEventArgs">
-            <summary>Represents the interests from the profile of an agent</summary>
+        <member name="T:OpenMetaverse.Packets.GetScriptRunningPacket.ScriptBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AvatarInterestsReplyEventArgs.AvatarID">
-            <summary>Get the ID of the agent</summary>
+        <member name="T:OpenMetaverse.Packets.ScriptRunningReplyPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.AvatarPropertiesReplyEventArgs">
-            <summary>The properties of an agent</summary>
+        <member name="T:OpenMetaverse.Packets.ScriptRunningReplyPacket.ScriptBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AvatarPropertiesReplyEventArgs.AvatarID">
-            <summary>Get the ID of the agent</summary>
+        <member name="T:OpenMetaverse.Packets.SetScriptRunningPacket">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AvatarGroupsReplyEventArgs.AvatarID">
-            <summary>Get the ID of the agent</summary>
+        <member name="T:OpenMetaverse.Packets.SetScriptRunningPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AvatarPicksReplyEventArgs.AvatarID">
-            <summary>Get the ID of the agent</summary>
+        <member name="T:OpenMetaverse.Packets.SetScriptRunningPacket.ScriptBlock">
+            <exclude/>
         </member>
-        <member name="P:OpenMetaverse.AvatarClassifiedReplyEventArgs.AvatarID">
-            <summary>Get the ID of the avatar</summary>
+        <member name="T:OpenMetaverse.Packets.ScriptResetPacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.DisplayNameUpdateEventArgs">
-            <summary>
-            Event args class for display name notification messages
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ScriptResetPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.BinBVHAnimationReader">
-            <summary>
-            Reads in a byte array of an Animation Asset created by the SecondLife(tm) client.
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ScriptResetPacket.ScriptBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ScriptSensorRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.rotationkeys">
-            <summary>
-            Rotation Keyframe count (used internally)
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ScriptSensorRequestPacket.RequesterBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.positionkeys">
-            <summary>
-            Position Keyframe count (used internally)
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ScriptSensorReplyPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.Priority">
-            <summary>
-            Animation Priority
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ScriptSensorReplyPacket.RequesterBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.Length">
-            <summary>
-            The animation length in seconds.
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ScriptSensorReplyPacket.SensedDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.ExpressionName">
-            <summary>
-            Expression set in the client.  Null if [None] is selected
-            </summary>
+        <member name="T:OpenMetaverse.Packets.CompleteAgentMovementPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.InPoint">
-            <summary>
-            The time in seconds to start the animation
-            </summary>
+        <member name="T:OpenMetaverse.Packets.CompleteAgentMovementPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.OutPoint">
-            <summary>
-            The time in seconds to end the animation
-            </summary>
+        <member name="T:OpenMetaverse.Packets.AgentMovementCompletePacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.Loop">
-            <summary>
-            Loop the animation
-            </summary>
+        <member name="T:OpenMetaverse.Packets.AgentMovementCompletePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.EaseInTime">
-            <summary>
-            Meta data. Ease in Seconds.
-            </summary>
+        <member name="T:OpenMetaverse.Packets.AgentMovementCompletePacket.DataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.EaseOutTime">
-            <summary>
-            Meta data. Ease out seconds.
-            </summary>
+        <member name="T:OpenMetaverse.Packets.AgentMovementCompletePacket.SimDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.HandPose">
-            <summary>
-            Meta Data for the Hand Pose
-            </summary>
+        <member name="T:OpenMetaverse.Packets.LogoutRequestPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.JointCount">
-            <summary>
-            Number of joints defined in the animation
-            </summary>
+        <member name="T:OpenMetaverse.Packets.LogoutRequestPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.BinBVHAnimationReader.joints">
-            <summary>
-            Contains an array of joints
-            </summary>
+        <member name="T:OpenMetaverse.Packets.LogoutReplyPacket">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.LogoutReplyPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="M:OpenMetaverse.BinBVHAnimationReader.readJoint(System.Byte[],System.Int32@)">
-            <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 name="T:OpenMetaverse.Packets.LogoutReplyPacket.InventoryDataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.ImprovedInstantMessagePacket">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.binBVHJoint">
-            <summary>
-            A Joint and it's associated meta data and keyframes
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ImprovedInstantMessagePacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.binBVHJoint.Name">
-            <summary>
-            Name of the Joint.  Matches the avatar_skeleton.xml in client distros
-            </summary>
+        <member name="T:OpenMetaverse.Packets.ImprovedInstantMessagePacket.MessageBlockBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.binBVHJoint.Priority">
-            <summary>
-            Joint Animation Override?   Was the same as the Priority in testing..
-            </summary>
+        <member name="T:OpenMetaverse.Packets.RetrieveInstantMessagesPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.binBVHJoint.rotationkeys">
-            <summary>
-            Array of Rotation Keyframes in order from earliest to latest
-            </summary>
+        <member name="T:OpenMetaverse.Packets.RetrieveInstantMessagesPacket.AgentDataBlock">
+            <exclude/>
         </member>
-        <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 name="T:OpenMetaverse.Packets.FindAgentPacket">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.binBVHJoint.Tag">
-            <summary>
-            Custom application data that can be attached to a joint
-            </summary>
+        <member name="T:OpenMetaverse.Packets.FindAgentPacket.AgentBlockBlock">
+            <exclude/>
         </member>
-        <member name="T:OpenMetaverse.binBVHJointKey">
-            <summary>
-            A Joint Keyframe.  This is either a position or a rotation.
-            </summary>
+        <member name="T:OpenMetaverse.Packets.FindAgentPacket.LocationBlockBlock">
+            <exclude/>
         </member>
-        <member name="F:OpenMetaverse.binBVHJointKey.key_element">
+        <member name="T:OpenMetaverse.Packets.RequestGodlikePowersPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RequestGodlikePowersPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RequestGodlikePowersPacket.RequestBlockBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GrantGodlikePowersPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GrantGodlikePowersPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GrantGodlikePowersPacket.GrantDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GodlikeMessagePacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GodlikeMessagePacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GodlikeMessagePacket.MethodDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GodlikeMessagePacket.ParamListBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.EstateOwnerMessagePacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.EstateOwnerMessagePacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.EstateOwnerMessagePacket.MethodDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.EstateOwnerMessagePacket.ParamListBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GenericMessagePacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GenericMessagePacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GenericMessagePacket.MethodDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GenericMessagePacket.ParamListBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MuteListRequestPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MuteListRequestPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MuteListRequestPacket.MuteDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.UpdateMuteListEntryPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.UpdateMuteListEntryPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.UpdateMuteListEntryPacket.MuteDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RemoveMuteListEntryPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RemoveMuteListEntryPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RemoveMuteListEntryPacket.MuteDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CopyInventoryFromNotecardPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CopyInventoryFromNotecardPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CopyInventoryFromNotecardPacket.NotecardDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CopyInventoryFromNotecardPacket.InventoryDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.UpdateInventoryItemPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.UpdateInventoryItemPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.UpdateInventoryItemPacket.InventoryDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.UpdateCreateInventoryItemPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.UpdateCreateInventoryItemPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.UpdateCreateInventoryItemPacket.InventoryDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MoveInventoryItemPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MoveInventoryItemPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MoveInventoryItemPacket.InventoryDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CopyInventoryItemPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CopyInventoryItemPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CopyInventoryItemPacket.InventoryDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RemoveInventoryItemPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RemoveInventoryItemPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RemoveInventoryItemPacket.InventoryDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ChangeInventoryItemFlagsPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ChangeInventoryItemFlagsPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ChangeInventoryItemFlagsPacket.InventoryDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.SaveAssetIntoInventoryPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.SaveAssetIntoInventoryPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.SaveAssetIntoInventoryPacket.InventoryDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CreateInventoryFolderPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CreateInventoryFolderPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CreateInventoryFolderPacket.FolderDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.UpdateInventoryFolderPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.UpdateInventoryFolderPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.UpdateInventoryFolderPacket.FolderDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MoveInventoryFolderPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MoveInventoryFolderPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MoveInventoryFolderPacket.InventoryDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RemoveInventoryFolderPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RemoveInventoryFolderPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RemoveInventoryFolderPacket.FolderDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.FetchInventoryDescendentsPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.FetchInventoryDescendentsPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.FetchInventoryDescendentsPacket.InventoryDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.InventoryDescendentsPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.InventoryDescendentsPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.InventoryDescendentsPacket.FolderDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.InventoryDescendentsPacket.ItemDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.FetchInventoryPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.FetchInventoryPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.FetchInventoryPacket.InventoryDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.FetchInventoryReplyPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.FetchInventoryReplyPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.FetchInventoryReplyPacket.InventoryDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.BulkUpdateInventoryPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.BulkUpdateInventoryPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.BulkUpdateInventoryPacket.FolderDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.BulkUpdateInventoryPacket.ItemDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RemoveInventoryObjectsPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RemoveInventoryObjectsPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RemoveInventoryObjectsPacket.FolderDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RemoveInventoryObjectsPacket.ItemDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.PurgeInventoryDescendentsPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.PurgeInventoryDescendentsPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.PurgeInventoryDescendentsPacket.InventoryDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.UpdateTaskInventoryPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.UpdateTaskInventoryPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.UpdateTaskInventoryPacket.UpdateDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.UpdateTaskInventoryPacket.InventoryDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RemoveTaskInventoryPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RemoveTaskInventoryPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RemoveTaskInventoryPacket.InventoryDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MoveTaskInventoryPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MoveTaskInventoryPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MoveTaskInventoryPacket.InventoryDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RequestTaskInventoryPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RequestTaskInventoryPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RequestTaskInventoryPacket.InventoryDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ReplyTaskInventoryPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ReplyTaskInventoryPacket.InventoryDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.DeRezObjectPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.DeRezObjectPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.DeRezObjectPacket.AgentBlockBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.DeRezObjectPacket.ObjectDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.DeRezAckPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.DeRezAckPacket.TransactionDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RezObjectPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RezObjectPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RezObjectPacket.RezDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RezObjectPacket.InventoryDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket.RezDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket.NotecardDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket.InventoryDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AcceptFriendshipPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AcceptFriendshipPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AcceptFriendshipPacket.TransactionBlockBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AcceptFriendshipPacket.FolderDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.DeclineFriendshipPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.DeclineFriendshipPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.DeclineFriendshipPacket.TransactionBlockBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.TerminateFriendshipPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.TerminateFriendshipPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.TerminateFriendshipPacket.ExBlockBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.OfferCallingCardPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.OfferCallingCardPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.OfferCallingCardPacket.AgentBlockBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AcceptCallingCardPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AcceptCallingCardPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AcceptCallingCardPacket.TransactionBlockBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AcceptCallingCardPacket.FolderDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.DeclineCallingCardPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.DeclineCallingCardPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.DeclineCallingCardPacket.TransactionBlockBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RezScriptPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RezScriptPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RezScriptPacket.UpdateBlockBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RezScriptPacket.InventoryBlockBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CreateInventoryItemPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CreateInventoryItemPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CreateInventoryItemPacket.InventoryBlockBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CreateLandmarkForEventPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CreateLandmarkForEventPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CreateLandmarkForEventPacket.EventDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CreateLandmarkForEventPacket.InventoryBlockBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RegionHandleRequestPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RegionHandleRequestPacket.RequestBlockBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RegionIDAndHandleReplyPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RegionIDAndHandleReplyPacket.ReplyBlockBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MoneyTransferRequestPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MoneyTransferRequestPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MoneyTransferRequestPacket.MoneyDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MoneyBalanceRequestPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MoneyBalanceRequestPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MoneyBalanceRequestPacket.MoneyDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MoneyBalanceReplyPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MoneyBalanceReplyPacket.MoneyDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MoneyBalanceReplyPacket.TransactionInfoBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RoutedMoneyBalanceReplyPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RoutedMoneyBalanceReplyPacket.TargetBlockBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RoutedMoneyBalanceReplyPacket.MoneyDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RoutedMoneyBalanceReplyPacket.TransactionInfoBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ActivateGesturesPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ActivateGesturesPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ActivateGesturesPacket.DataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.DeactivateGesturesPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.DeactivateGesturesPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.DeactivateGesturesPacket.DataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MuteListUpdatePacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MuteListUpdatePacket.MuteDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.UseCachedMuteListPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.UseCachedMuteListPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GrantUserRightsPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GrantUserRightsPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GrantUserRightsPacket.RightsBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ChangeUserRightsPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ChangeUserRightsPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ChangeUserRightsPacket.RightsBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.OnlineNotificationPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.OnlineNotificationPacket.AgentBlockBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.OfflineNotificationPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.OfflineNotificationPacket.AgentBlockBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.SetStartLocationRequestPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.SetStartLocationRequestPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.SetStartLocationRequestPacket.StartLocationDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AssetUploadRequestPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AssetUploadRequestPacket.AssetBlockBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AssetUploadCompletePacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AssetUploadCompletePacket.AssetBlockBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CreateGroupRequestPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CreateGroupRequestPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CreateGroupRequestPacket.GroupDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CreateGroupReplyPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CreateGroupReplyPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CreateGroupReplyPacket.ReplyDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.UpdateGroupInfoPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.UpdateGroupInfoPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.UpdateGroupInfoPacket.GroupDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupRoleChangesPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupRoleChangesPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupRoleChangesPacket.RoleChangeBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.JoinGroupRequestPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.JoinGroupRequestPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.JoinGroupRequestPacket.GroupDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.JoinGroupReplyPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.JoinGroupReplyPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.JoinGroupReplyPacket.GroupDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.EjectGroupMemberRequestPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.EjectGroupMemberRequestPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.EjectGroupMemberRequestPacket.GroupDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.EjectGroupMemberRequestPacket.EjectDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.EjectGroupMemberReplyPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.EjectGroupMemberReplyPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.EjectGroupMemberReplyPacket.GroupDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.EjectGroupMemberReplyPacket.EjectDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.LeaveGroupRequestPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.LeaveGroupRequestPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.LeaveGroupRequestPacket.GroupDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.LeaveGroupReplyPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.LeaveGroupReplyPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.LeaveGroupReplyPacket.GroupDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.InviteGroupRequestPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.InviteGroupRequestPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.InviteGroupRequestPacket.GroupDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.InviteGroupRequestPacket.InviteDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupProfileRequestPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupProfileRequestPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupProfileRequestPacket.GroupDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupProfileReplyPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupProfileReplyPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupProfileReplyPacket.GroupDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupAccountSummaryRequestPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupAccountSummaryRequestPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupAccountSummaryRequestPacket.MoneyDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupAccountSummaryReplyPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupAccountSummaryReplyPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupAccountSummaryReplyPacket.MoneyDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsRequestPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsRequestPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsRequestPacket.MoneyDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsReplyPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsReplyPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsReplyPacket.MoneyDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsReplyPacket.HistoryDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsRequestPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsRequestPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsRequestPacket.MoneyDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsReplyPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsReplyPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsReplyPacket.MoneyDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsReplyPacket.HistoryDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupActiveProposalsRequestPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupActiveProposalsRequestPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupActiveProposalsRequestPacket.GroupDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupActiveProposalsRequestPacket.TransactionDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupActiveProposalItemReplyPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupActiveProposalItemReplyPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupActiveProposalItemReplyPacket.TransactionDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupActiveProposalItemReplyPacket.ProposalDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryRequestPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryRequestPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryRequestPacket.GroupDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryRequestPacket.TransactionDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryItemReplyPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryItemReplyPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryItemReplyPacket.TransactionDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryItemReplyPacket.HistoryItemDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryItemReplyPacket.VoteItemBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.StartGroupProposalPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.StartGroupProposalPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.StartGroupProposalPacket.ProposalDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupProposalBallotPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupProposalBallotPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupProposalBallotPacket.ProposalDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupMembersRequestPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupMembersRequestPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupMembersRequestPacket.GroupDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupMembersReplyPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupMembersReplyPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupMembersReplyPacket.GroupDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupMembersReplyPacket.MemberDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ActivateGroupPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ActivateGroupPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.SetGroupContributionPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.SetGroupContributionPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.SetGroupContributionPacket.DataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.SetGroupAcceptNoticesPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.SetGroupAcceptNoticesPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.SetGroupAcceptNoticesPacket.DataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.SetGroupAcceptNoticesPacket.NewDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupRoleDataRequestPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupRoleDataRequestPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupRoleDataRequestPacket.GroupDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupRoleDataReplyPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupRoleDataReplyPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupRoleDataReplyPacket.GroupDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupRoleDataReplyPacket.RoleDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupRoleMembersRequestPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupRoleMembersRequestPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupRoleMembersRequestPacket.GroupDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupRoleMembersReplyPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupRoleMembersReplyPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupRoleMembersReplyPacket.MemberDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupTitlesRequestPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupTitlesRequestPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupTitlesReplyPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupTitlesReplyPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupTitlesReplyPacket.GroupDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupTitleUpdatePacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupTitleUpdatePacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupRoleUpdatePacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupRoleUpdatePacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupRoleUpdatePacket.RoleDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.LiveHelpGroupRequestPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.LiveHelpGroupRequestPacket.RequestDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.LiveHelpGroupReplyPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.LiveHelpGroupReplyPacket.ReplyDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentWearablesRequestPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentWearablesRequestPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentWearablesUpdatePacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentWearablesUpdatePacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentWearablesUpdatePacket.WearableDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentIsNowWearingPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentIsNowWearingPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentIsNowWearingPacket.WearableDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentCachedTexturePacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentCachedTexturePacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentCachedTexturePacket.WearableDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentCachedTextureResponsePacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentCachedTextureResponsePacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentCachedTextureResponsePacket.WearableDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentDataUpdateRequestPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentDataUpdateRequestPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentDataUpdatePacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentDataUpdatePacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupDataUpdatePacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.GroupDataUpdatePacket.AgentGroupDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentGroupDataUpdatePacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentGroupDataUpdatePacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentGroupDataUpdatePacket.GroupDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentDropGroupPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentDropGroupPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RezSingleAttachmentFromInvPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RezSingleAttachmentFromInvPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RezSingleAttachmentFromInvPacket.ObjectDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RezMultipleAttachmentsFromInvPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RezMultipleAttachmentsFromInvPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RezMultipleAttachmentsFromInvPacket.HeaderDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RezMultipleAttachmentsFromInvPacket.ObjectDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.DetachAttachmentIntoInvPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.DetachAttachmentIntoInvPacket.ObjectDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CreateNewOutfitAttachmentsPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CreateNewOutfitAttachmentsPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CreateNewOutfitAttachmentsPacket.HeaderDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CreateNewOutfitAttachmentsPacket.ObjectDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.UserInfoRequestPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.UserInfoRequestPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.UserInfoReplyPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.UserInfoReplyPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.UserInfoReplyPacket.UserDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.UpdateUserInfoPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.UpdateUserInfoPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.UpdateUserInfoPacket.UserDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.InitiateDownloadPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.InitiateDownloadPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.InitiateDownloadPacket.FileDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MapLayerRequestPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MapLayerRequestPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MapLayerReplyPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MapLayerReplyPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MapLayerReplyPacket.LayerDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MapBlockRequestPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MapBlockRequestPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MapBlockRequestPacket.PositionDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MapNameRequestPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MapNameRequestPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MapNameRequestPacket.NameDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MapBlockReplyPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MapBlockReplyPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MapBlockReplyPacket.DataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MapItemRequestPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MapItemRequestPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MapItemRequestPacket.RequestDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MapItemReplyPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MapItemReplyPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MapItemReplyPacket.RequestDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MapItemReplyPacket.DataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.SendPostcardPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.SendPostcardPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ParcelMediaCommandMessagePacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ParcelMediaCommandMessagePacket.CommandBlockBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ParcelMediaUpdatePacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ParcelMediaUpdatePacket.DataBlockBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ParcelMediaUpdatePacket.DataBlockExtendedBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.LandStatRequestPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.LandStatRequestPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.LandStatRequestPacket.RequestDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.LandStatReplyPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.LandStatReplyPacket.RequestDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.LandStatReplyPacket.ReportDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ErrorPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ErrorPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ErrorPacket.DataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ObjectIncludeInSearchPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ObjectIncludeInSearchPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ObjectIncludeInSearchPacket.ObjectDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RezRestoreToWorldPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RezRestoreToWorldPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RezRestoreToWorldPacket.InventoryDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.LinkInventoryItemPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.LinkInventoryItemPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.LinkInventoryItemPacket.InventoryBlockBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.PacketAckPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.PacketAckPacket.PacketsBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.OpenCircuitPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.OpenCircuitPacket.CircuitInfoBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CloseCircuitPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ObjectAddPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ObjectAddPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ObjectAddPacket.ObjectDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MultipleObjectUpdatePacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MultipleObjectUpdatePacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.MultipleObjectUpdatePacket.ObjectDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RequestMultipleObjectsPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RequestMultipleObjectsPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RequestMultipleObjectsPacket.ObjectDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ObjectPositionPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ObjectPositionPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ObjectPositionPacket.ObjectDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RequestObjectPropertiesFamilyPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RequestObjectPropertiesFamilyPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RequestObjectPropertiesFamilyPacket.ObjectDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CoarseLocationUpdatePacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CoarseLocationUpdatePacket.LocationBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CoarseLocationUpdatePacket.IndexBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CoarseLocationUpdatePacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CrossedRegionPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CrossedRegionPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CrossedRegionPacket.RegionDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CrossedRegionPacket.InfoBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ConfirmEnableSimulatorPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ConfirmEnableSimulatorPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ObjectPropertiesPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ObjectPropertiesPacket.ObjectDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ObjectPropertiesFamilyPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ObjectPropertiesFamilyPacket.ObjectDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestPacket.ParcelDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AttachedSoundPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AttachedSoundPacket.DataBlockBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AttachedSoundGainChangePacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AttachedSoundGainChangePacket.DataBlockBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.PreloadSoundPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.PreloadSoundPacket.DataBlockBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ViewerEffectPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ViewerEffectPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ViewerEffectPacket.EffectBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.StartPingCheckPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.StartPingCheckPacket.PingIDBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CompletePingCheckPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CompletePingCheckPacket.PingIDBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentUpdatePacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentUpdatePacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentAnimationPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentAnimationPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentAnimationPacket.AnimationListBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentAnimationPacket.PhysicalAvatarEventListBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentRequestSitPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentRequestSitPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentRequestSitPacket.TargetObjectBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentSitPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AgentSitPacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RequestImagePacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RequestImagePacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.RequestImagePacket.RequestImageBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ImageDataPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ImageDataPacket.ImageIDBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ImageDataPacket.ImageDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ImagePacketPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ImagePacketPacket.ImageIDBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ImagePacketPacket.ImageDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.LayerDataPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.LayerDataPacket.LayerIDBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.LayerDataPacket.LayerDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ObjectUpdatePacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ObjectUpdatePacket.RegionDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ObjectUpdatePacket.ObjectDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ObjectUpdateCompressedPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ObjectUpdateCompressedPacket.RegionDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ObjectUpdateCompressedPacket.ObjectDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ObjectUpdateCachedPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ObjectUpdateCachedPacket.RegionDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ObjectUpdateCachedPacket.ObjectDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ImprovedTerseObjectUpdatePacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ImprovedTerseObjectUpdatePacket.RegionDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ImprovedTerseObjectUpdatePacket.ObjectDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.KillObjectPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.KillObjectPacket.ObjectDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.TransferPacketPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.TransferPacketPacket.TransferDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.SendXferPacketPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.SendXferPacketPacket.XferIDBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.SendXferPacketPacket.DataPacketBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ConfirmXferPacketPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ConfirmXferPacketPacket.XferIDBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket.SenderBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket.AnimationListBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket.AnimationSourceListBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket.PhysicalAvatarEventListBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AvatarSitResponsePacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AvatarSitResponsePacket.SitObjectBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.AvatarSitResponsePacket.SitTransformBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CameraConstraintPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.CameraConstraintPacket.CameraCollidePlaneBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ParcelPropertiesPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ParcelPropertiesPacket.ParcelDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ParcelPropertiesPacket.AgeVerificationBlockBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.GroupDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.AnimationDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.GranterBlockBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.NVPairDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.VisualParamBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.AgentAccessBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.AgentInfoBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ChildAgentAlivePacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ChildAgentAlivePacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ChildAgentPositionUpdatePacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.ChildAgentPositionUpdatePacket.AgentDataBlock">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.SoundTriggerPacket">
+            <exclude/>
+        </member>
+        <member name="T:OpenMetaverse.Packets.SoundTriggerPacket.SoundDataBlock">
+            <exclude/>
+        </member>
+        <member name="M:OpenMetaverse.Packets.PacketDecoder.AddCallback(System.String,OpenMetaverse.Packets.PacketDecoder.CustomPacketDecoder)">
             <summary>
-            Either a Vector3 position or a Vector3 Euler rotation
+            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="T:OpenMetaverse.HandPose">
+        <member name="M:OpenMetaverse.Packets.PacketDecoder.RemoveCustomHandler(System.String,OpenMetaverse.Packets.PacketDecoder.CustomPacketDecoder)">
             <summary>
-            Poses set in the animation metadata for the hands.
+            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="T:OpenMetaverse.BitPack">
+        <member name="M:OpenMetaverse.Packets.PacketDecoder.PacketToString(OpenMetaverse.Packets.Packet)">
             <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
+            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.BitPack.#ctor(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Packets.PacketDecoder.MessageToString(System.Object,System.Int32)">
             <summary>
-            Default constructor, initialize the bit packer / bit unpacker
-            with a byte array and starting position
+            Decode an IMessage object into a beautifully formatted string
             </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>
+            <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="F:OpenMetaverse.BitPack.Data">
+        <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="P:OpenMetaverse.BitPack.BytePos">
+        <member name="T:OpenMetaverse.DirectoryManager">
             <summary>
+            Access to the data server which allows searching for land, events, people, etc
             </summary>
         </member>
-        <member name="P:OpenMetaverse.BitPack.BitPos">
+        <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.BitPack.PackFloat(System.Single)">
+        <member name="M:OpenMetaverse.DirectoryManager.StartClassifiedSearch(System.String)">
             <summary>
-            Pack a floating point value in to the data
+            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="data">Floating point value to pack</param>
+            <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.BitPack.PackBits(System.Int32,System.Int32)">
+        <member name="M:OpenMetaverse.DirectoryManager.StartClassifiedSearch(System.String,OpenMetaverse.DirectoryManager.ClassifiedCategories,OpenMetaverse.DirectoryManager.ClassifiedQueryFlags)">
             <summary>
-            Pack part or all of an integer in to the data
+            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="data">Integer containing the data to pack</param>
-            <param name="totalCount">Number of bits of the integer to pack</param>
+            <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.BitPack.PackBits(System.UInt32,System.Int32)">
+        <member name="M:OpenMetaverse.DirectoryManager.StartDirPlacesSearch(System.String,System.Int32)">
             <summary>
-            Pack part or all of an unsigned integer in to the data
+            Starts search for places (Overloaded)
+            
+            The <see cref="!:OnDirPlacesReply"/> event is raised when a response is received from the simulator
             </summary>
-            <param name="data">Unsigned integer containing the data to pack</param>
-            <param name="totalCount">Number of bits of the integer to pack</param>
+            <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.BitPack.PackBit(System.Boolean)">
+        <member name="M:OpenMetaverse.DirectoryManager.StartDirPlacesSearch(System.String,OpenMetaverse.DirectoryManager.DirFindFlags,OpenMetaverse.ParcelCategory,System.Int32)">
             <summary>
-            Pack a single bit in to the data
+            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="bit">Bit to pack</param>
+            <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.BitPack.PackFixed(System.Single,System.Boolean,System.Int32,System.Int32)">
+        <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="data">
-            </param>
-            <param name="isSigned">
-            </param>
-            <param name="intBits">
-            </param>
-            <param name="fracBits">
-            </param>
+            <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.BitPack.PackUUID(OpenMetaverse.UUID)">
+        <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="data">
-            </param>
+            <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.BitPack.PackColor(OpenMetaverse.Color4)">
+        <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="data">
+            
+            <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.BitPack.UnpackFloat">
+        <member name="M:OpenMetaverse.DirectoryManager.StartGroupSearch(System.String,System.Int32)">
             <summary>
-            Unpacking a floating point value from the data
+            Search for Groups
             </summary>
-            <returns>Unpacked floating point value</returns>
+            <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.BitPack.UnpackBits(System.Int32)">
+        <member name="M:OpenMetaverse.DirectoryManager.StartGroupSearch(System.String,System.Int32,OpenMetaverse.DirectoryManager.DirFindFlags)">
             <summary>
-            Unpack a variable number of bits from the data in to integer format
+            Search for Groups
             </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>
+            <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.BitPack.UnpackUBits(System.Int32)">
+        <member name="M:OpenMetaverse.DirectoryManager.StartPeopleSearch(System.String,System.Int32)">
             <summary>
-            Unpack a variable number of bits from the data in to unsigned
-            integer format
+            Search the People directory for other avatars
             </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>
+            <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.BitPack.UnpackShort">
+        <member name="M:OpenMetaverse.DirectoryManager.StartPlacesSearch">
             <summary>
-            Unpack a 16-bit signed integer
+            Search Places for parcels of land you personally own
             </summary>
-            <returns>16-bit signed integer</returns>
         </member>
-        <member name="M:OpenMetaverse.BitPack.UnpackUShort">
+        <member name="M:OpenMetaverse.DirectoryManager.StartPlacesSearch(OpenMetaverse.UUID)">
             <summary>
-            Unpack a 16-bit unsigned integer
+            Searches Places for land owned by the specified group
             </summary>
-            <returns>16-bit unsigned integer</returns>
+            <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.BitPack.UnpackInt">
+        <member name="M:OpenMetaverse.DirectoryManager.StartPlacesSearch(System.String)">
             <summary>
-            Unpack a 32-bit signed integer
+            Search the Places directory for parcels that are listed in search and contain the specified keywords
             </summary>
-            <returns>32-bit signed integer</returns>
+            <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.BitPack.UnpackUInt">
+        <member name="M:OpenMetaverse.DirectoryManager.StartPlacesSearch(OpenMetaverse.DirectoryManager.DirFindFlags,OpenMetaverse.ParcelCategory,System.String,System.String,OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
-            Unpack a 32-bit unsigned integer
+            Search Places - All Options
             </summary>
-            <returns>32-bit unsigned integer</returns>
+            <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="T:OpenMetaverse.Caps">
+        <member name="M:OpenMetaverse.DirectoryManager.StartEventsSearch(System.String,System.UInt32)">
             <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
+            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.Caps.#ctor(OpenMetaverse.Simulator,System.String)">
+        <member name="M:OpenMetaverse.DirectoryManager.StartEventsSearch(System.String,OpenMetaverse.DirectoryManager.DirFindFlags,System.String,System.UInt32,OpenMetaverse.DirectoryManager.EventCategories)">
             <summary>
-            Default constructor
+            Search Events
             </summary>
-            <param name="simulator">
-            </param>
-            <param name="seedcaps">
-            </param>
+            <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="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 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="F:OpenMetaverse.Caps.Simulator">
-            <summary>Reference to the simulator this system is connected to</summary>
+        <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="P:OpenMetaverse.Caps.SeedCapsURI">
-            <summary>Capabilities URI this system was initialized with</summary>
+        <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="P:OpenMetaverse.Caps.IsEventQueueRunning">
-            <summary>Whether the capabilities event queue is connected and
-            listening for incoming events</summary>
+        <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.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 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.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 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.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.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="P:OpenMetaverse.CoordinateFrame.Origin">
-            <summary>Origin position of this coordinate frame</summary>
+        <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="P:OpenMetaverse.CoordinateFrame.XAxis">
-            <summary>X axis of this coordinate frame, or Forward/At in grid terms</summary>
+        <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="P:OpenMetaverse.CoordinateFrame.YAxis">
-            <summary>Y axis of this coordinate frame, or Left in grid terms</summary>
+        <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="P:OpenMetaverse.CoordinateFrame.ZAxis">
-            <summary>Z axis of this coordinate frame, or Up in grid terms</summary>
+        <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="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 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="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 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>
-        <member name="T:OpenMetaverse.DirectoryManager">
-            <summary>
-            Access to the data server which allows searching for land, events, people, etc
-            </summary>
+        <member name="E:OpenMetaverse.DirectoryManager.PlacesReply">
+            <summary>Raised when the data server responds to a <see cref="M:OpenMetaverse.DirectoryManager.StartPlacesSearch"/> request.</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 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>
+        <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>
+        <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>
+        <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.SearchTypeFlags)"/> request.</summary>
         </member>
         <member name="T:OpenMetaverse.DirectoryManager.ClassifiedCategories">
             <summary>Classified Ad categories</summary>
@@ -6052,87 +8483,69 @@
             <summary>Classified is </summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.PropertyRental">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.SpecialAttraction">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.NewProducts">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Employment">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Wanted">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Service">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.ClassifiedCategories.Personal">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="T:OpenMetaverse.DirectoryManager.EventCategories">
             <summary>Event Categories</summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.EventCategories.All">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Discussion">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Sports">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.EventCategories.LiveMusic">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Commercial">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Nightlife">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Games">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Pageants">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Education">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Arts">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Charity">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.EventCategories.Miscellaneous">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <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>
@@ -6140,12 +8553,10 @@
             <summary>Query the People database</summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.Online">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.Events">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.Groups">
             <summary>Query the Groups database</summary>
@@ -6157,8 +8568,7 @@
             <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>
+            <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>
@@ -6168,39 +8578,35 @@
             when searching the Places database</summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.PgSimsOnly">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.PicturesOnly">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.PgEventsOnly">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.MatureSimsOnly">
-            <summary>
-            </summary>
+            <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.
+            <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.
+            <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.
+            <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.DirectoryManager.DirFindFlags.AreaSort">
-            <summary>Specifies the query should pre sort the results using the ParcelSize field when searching the land sales database.
+            <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.DirectoryManager.DirFindFlags.NameSort">
-            <summary>Specifies the query should pre sort the results using the Name field when searching the land sales database.
+            <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.DirectoryManager.DirFindFlags.LimitByPrice">
@@ -6212,12 +8618,10 @@
             This flag is only used when searching the land sales database</summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.FilterMature">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.DirFindFlags.PGOnly">
-            <summary>
-            </summary>
+            <summary></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>
@@ -6229,8 +8633,7 @@
             <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.DirectoryManager.DirFindFlags.AdultOnly">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="T:OpenMetaverse.DirectoryManager.SearchTypeFlags">
             <summary>
@@ -6271,24 +8674,19 @@
             This set of flags is for the newer style</remarks>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.ClassifiedFlags.None">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.ClassifiedFlags.Mature">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.ClassifiedFlags.Enabled">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.ClassifiedFlags.UpdateTime">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.ClassifiedFlags.AutoRenew">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="T:OpenMetaverse.DirectoryManager.ClassifiedQueryFlags">
             <summary>
@@ -6348,14 +8746,14 @@
         </member>
         <member name="T:OpenMetaverse.DirectoryManager.DirectoryParcel">
             <summary>
-            A parcel retrieved from the dataserver such as results from the
+            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>
+            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>
@@ -6397,7 +8795,7 @@
             <summary>The agents last name</summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.AgentSearchData.AgentID">
-            <summary>The agents <see cref="T:OpenMetaverse.UUID" /></summary>
+            <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>
@@ -6405,7 +8803,7 @@
         </member>
         <member name="T:OpenMetaverse.DirectoryManager.GroupSearchData">
             <summary>
-            Response to a "Groups" Search
+             Response to a "Groups" Search
             </summary>
         </member>
         <member name="F:OpenMetaverse.DirectoryManager.GroupSearchData.GroupID">
@@ -6423,13 +8821,14 @@
         </member>
         <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
+            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>
+            </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
@@ -6476,7 +8875,14 @@
         <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>
+            <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>
@@ -6568,396 +8974,6 @@
             <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="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="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="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="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="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="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="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="F:OpenMetaverse.DirectoryManager.m_DirLandLock">
-            <summary>Thread sync lock object</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>
-        <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>
@@ -6975,12 +8991,12 @@
         </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="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>
+            <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>
@@ -6990,12 +9006,12 @@
         </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="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>
+            <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>
@@ -7005,12 +9021,12 @@
         </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="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>
+            <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>
@@ -7030,12 +9046,12 @@
         </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="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>
+            <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>
@@ -7045,12 +9061,12 @@
         </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="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>
+            <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>
@@ -7065,732 +9081,619 @@
         <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">
+        <member name="T:OpenMetaverse.Interfaces.IMessage">
             <summary>
-            Represends individual HTTP Download request
+            Interface requirements for Messaging system
             </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">
+        <member name="F:OpenMetaverse.Imaging.ManagedImage.Width">
             <summary>
-            Manages async HTTP downloads with a limit on maximum
-            concurrent downloads
+            Image width
             </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">
+        <member name="F:OpenMetaverse.Imaging.ManagedImage.Height">
             <summary>
-            Estate level administration and utilities
+            Image height
             </summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.#ctor(OpenMetaverse.GridClient)">
+        <member name="F:OpenMetaverse.Imaging.ManagedImage.Channels">
             <summary>
-            Constructor for EstateTools class
+            Image channel flags
             </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">
+        <member name="F:OpenMetaverse.Imaging.ManagedImage.Red">
             <summary>
+            Red channel data
             </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="F:OpenMetaverse.EstateTools.m_TopCollidersReply_Lock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <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.EstateTools.m_EstateUsersReply">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
-        <member name="F:OpenMetaverse.EstateTools.m_EstateUsersReply_Lock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <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.EstateTools.m_EstateManagersReply">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
-        <member name="F:OpenMetaverse.EstateTools.m_EstateManagersReply_Lock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <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.EstateTools.m_EstateCovenantReply">
-            <summary>The event subscribers. null if no subcribers</summary>
-        </member>
-        <member name="F:OpenMetaverse.EstateTools.m_EstateCovenantReply_Lock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <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="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 name="F:OpenMetaverse.Imaging.ManagedImage.Green">
+            <summary>
+            Green channel data
+            </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.Imaging.ManagedImage.Blue">
+            <summary>
+            Blue channel data
+            </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.Imaging.ManagedImage.Alpha">
+            <summary>
+            Alpha channel data
+            </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.Imaging.ManagedImage.Bump">
+            <summary>
+            Bump channel data
+            </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="M:OpenMetaverse.Imaging.ManagedImage.#ctor(System.Int32,System.Int32,OpenMetaverse.Imaging.ManagedImage.ImageChannels)">
+            <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.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="M:OpenMetaverse.Imaging.ManagedImage.#ctor(System.Drawing.Bitmap)">
+            <summary>
+            
+            </summary>
+            <param name="bitmap"></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 name="M:OpenMetaverse.Imaging.ManagedImage.ConvertChannels(OpenMetaverse.Imaging.ManagedImage.ImageChannels)">
+            <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.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="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>
-        <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="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>
-        <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="T:OpenMetaverse.Assets.AssetMutable">
+            <summary>
+            Represents an Animation
+            </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="M:OpenMetaverse.Assets.AssetMutable.#ctor(OpenMetaverse.AssetType)">
+            <summary>Default Constructor</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="M:OpenMetaverse.Assets.AssetMutable.#ctor(OpenMetaverse.AssetType,OpenMetaverse.UUID,System.Byte[])">
+            <summary>
+            Construct an Asset object of type Animation
+            </summary>
+            <param name="type">Asset type</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.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="P:OpenMetaverse.Assets.AssetMutable.AssetType">
+            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.LandStatRequest(System.Int32,OpenMetaverse.EstateTools.LandStatReportType,System.UInt32,System.String)">
+        <member name="T:OpenMetaverse.Assets.AssetLandmark">
             <summary>
-            Requests estate information such as top scripts and colliders
+            Represents a Landmark with RegionID and Position vector
             </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 name="F:OpenMetaverse.Assets.AssetLandmark.RegionID">
+            <summary>UUID of the Landmark target region</summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.RequestTopScripts">
-            <summary>Requests the "Top Scripts" list for the current region</summary>
+        <member name="F:OpenMetaverse.Assets.AssetLandmark.Position">
+            <summary> Local position of the target </summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.RequestTopColliders">
-            <summary>Requests the "Top Colliders" list for the current region</summary>
+        <member name="M:OpenMetaverse.Assets.AssetLandmark.#ctor">
+            <summary>Construct an Asset of type Landmark</summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.SetTerrainVariables(System.Single,System.Single,System.Single,System.Boolean,System.Boolean,System.Single)">
+        <member name="M:OpenMetaverse.Assets.AssetLandmark.#ctor(OpenMetaverse.UUID,System.Byte[])">
             <summary>
-            Set several estate specific configuration variables
+            Construct an Asset object of type Landmark
             </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="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.EstateTools.SimWideReturn(OpenMetaverse.UUID,OpenMetaverse.EstateTools.EstateReturnFlags,System.Boolean)">
+        <member name="M:OpenMetaverse.Assets.AssetLandmark.Encode">
             <summary>
-            Request return of objects owned by specified avatar
+            Encode the raw contents of a string with the specific Landmark format
             </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)">
+        <member name="M:OpenMetaverse.Assets.AssetLandmark.Decode">
             <summary>
+            Decode the raw asset data, populating the RegionID and Position
             </summary>
-            <param name="method">
-            </param>
-            <param name="param">
-            </param>
+            <returns>true if the AssetData was successfully decoded to a UUID and Vector</returns>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.EstateOwnerMessage(System.String,System.Collections.Generic.List{System.String})">
+        <member name="P:OpenMetaverse.Assets.AssetLandmark.AssetType">
+            <summary>Override the base classes AssetType</summary>
+        </member>
+        <member name="T:ThreadUtil">
             <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="F:ThreadUtil.wrapperInstance">
             <summary>
-            Kick an avatar from an estate
+            An instance of DelegateWrapper which calls InvokeWrappedDelegate,
+            which in turn calls the DynamicInvoke method of the wrapped
+            delegate
             </summary>
-            <param name="userID">Key of Agent to remove</param>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.BanUser(OpenMetaverse.UUID,System.Boolean)">
+        <member name="F:ThreadUtil.callback">
             <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>
+            Callback used to call EndInvoke on the asynchronously
+            invoked DelegateWrapper
+            </summary>
         </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)">
+        <member name="M:ThreadUtil.FireAndForget(System.Delegate,System.Object[])">
             <summary>
-            Send a message dialog to everyone in an entire estate
+            Executes the specified delegate with the specified arguments
+            asynchronously on a thread pool thread
             </summary>
-            <param name="message">Message to send all users in the estate</param>
+            <param name="d"></param>
+            <param name="args"></param>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.SimulatorMessage(System.String)">
+        <member name="M:ThreadUtil.InvokeWrappedDelegate(System.Delegate,System.Object[])">
             <summary>
-            Send a message dialog to everyone in a simulator
+            Invokes the wrapped delegate synchronously
             </summary>
-            <param name="message">Message to send all users in the simulator</param>
+            <param name="d"></param>
+            <param name="args"></param>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.TeleportHomeUser(OpenMetaverse.UUID)">
+        <member name="M:ThreadUtil.EndWrapperInvoke(System.IAsyncResult)">
             <summary>
-            Send an avatar back to their home location
+            Calls EndInvoke on the wrapper and Close on the resulting WaitHandle
+            to prevent resource leaks
             </summary>
-            <param name="pest">Key of avatar to send home</param>
+            <param name="ar"></param>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.RestartRegion">
+        <member name="T:ThreadUtil.DelegateWrapper">
             <summary>
-            Begin the region restart process
+            Delegate to wrap another delegate and its arguments
             </summary>
+            <param name="d"></param>
+            <param name="args"></param>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.CancelRestart">
+        <member name="T:OpenMetaverse.TextureRequestState">
             <summary>
-            Cancels a region restart
+            The current status of a texture request as it moves through the pipeline or final result of a texture request. 
             </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 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="M:OpenMetaverse.EstateTools.SetRegionDebug(System.Boolean,System.Boolean,System.Boolean)">
-            <summary>Estate panel "Debug" tab settings</summary>
+        <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="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="F:OpenMetaverse.TextureRequestState.Progress">
+            <summary>A request that has received one or more packets back from the simulator</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="F:OpenMetaverse.TextureRequestState.Finished">
+            <summary>A request that has received all packets back from the simulator</summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.RequestCovenant">
-            <summary>Requests the estate covenant</summary>
+        <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="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 name="F:OpenMetaverse.TextureRequestState.Aborted">
+            <summary>The texture request was aborted by request of the agent</summary>
         </member>
-        <member name="M:OpenMetaverse.EstateTools.TeleportHomeAllUsers">
-            <summary>
-            Teleports all users home in current Estate
-            </summary>
+        <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="M:OpenMetaverse.EstateTools.RemoveEstateManager(OpenMetaverse.UUID,System.Boolean)">
+        <member name="T:OpenMetaverse.TextureDownloadCallback">
             <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>
+            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>
-        <member name="M:OpenMetaverse.EstateTools.AddEstateManager(OpenMetaverse.UUID,System.Boolean)">
+        <member name="T:OpenMetaverse.TexturePipeline">
             <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>
+            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.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 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="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 name="F:OpenMetaverse.TexturePipeline._Client">
+            <summary>Holds the reference to the <see cref="T:OpenMetaverse.GridClient"/> client object</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="F:OpenMetaverse.TexturePipeline.maxTextureRequests">
+            <summary>Maximum concurrent texture requests allowed at a time</summary>
         </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="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="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="F:OpenMetaverse.TexturePipeline.threadpoolSlots">
+            <summary>An array of worker slots which shows the availablity status of the slot</summary>
         </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="F:OpenMetaverse.TexturePipeline.downloadMaster">
+            <summary>The primary thread which manages the requests.</summary>
         </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="F:OpenMetaverse.TexturePipeline._Running">
+            <summary>true if the TexturePipeline is currently running</summary>
         </member>
-        <member name="T:OpenMetaverse.TopCollidersReplyEventArgs">
-            <summary>Raised on LandStatReply when the report type is for "top colliders"</summary>
+        <member name="F:OpenMetaverse.TexturePipeline.lockerObject">
+            <summary>A synchronization object used by the primary thread</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.TexturePipeline.RefreshDownloadsTimer">
+            <summary>A refresh timer used to increase the priority of stalled requests</summary>
         </member>
-        <member name="P:OpenMetaverse.TopCollidersReplyEventArgs.ObjectCount">
+        <member name="M:OpenMetaverse.TexturePipeline.#ctor(OpenMetaverse.GridClient)">
             <summary>
-            The number of returned items in LandStatReply
+            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="P:OpenMetaverse.TopCollidersReplyEventArgs.Tasks">
+        <member name="M:OpenMetaverse.TexturePipeline.Startup">
             <summary>
-            A Dictionary of Object UUIDs to tasks returned in LandStatReply
+            Initialize callbacks required for the TexturePipeline to operate
             </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">
+        <member name="M:OpenMetaverse.TexturePipeline.Shutdown">
             <summary>
-            The number of scripts returned in LandStatReply
+            Shutdown the TexturePipeline and cleanup any callbacks or transfers
             </summary>
         </member>
-        <member name="P:OpenMetaverse.TopScriptsReplyEventArgs.Tasks">
+        <member name="M:OpenMetaverse.TexturePipeline.RequestTexture(OpenMetaverse.UUID,OpenMetaverse.ImageType,System.Single,System.Int32,System.UInt32,OpenMetaverse.TextureDownloadCallback,System.Boolean)">
             <summary>
-            A Dictionary of Object UUIDs to tasks returned in LandStatReply
+            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="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">
+        <member name="M:OpenMetaverse.TexturePipeline.RequestImage(OpenMetaverse.UUID,OpenMetaverse.ImageType,System.Single,System.Int32,System.UInt32)">
             <summary>
-            The identifier of the estate
+            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="P:OpenMetaverse.EstateBansReplyEventArgs.Count">
+        <member name="M:OpenMetaverse.TexturePipeline.AbortTextureRequest(OpenMetaverse.UUID)">
             <summary>
-            The number of returned itmes
+            Cancel a pending or in process texture request
             </summary>
+            <param name="textureID">The texture assets unique ID</param>
         </member>
-        <member name="P:OpenMetaverse.EstateBansReplyEventArgs.Banned">
+        <member name="M:OpenMetaverse.TexturePipeline.DownloadThread">
             <summary>
-            List of UUIDs of Banned Users
+            Master Download Thread, Queues up downloads in the threadpool
             </summary>
         </member>
-        <member name="T:OpenMetaverse.EstateUsersReplyEventArgs">
-            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
+        <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.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="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="P:OpenMetaverse.EstateUsersReplyEventArgs.EstateID">
+        <member name="M:OpenMetaverse.TexturePipeline.ImagePacketHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>
-            The identifier of the estate
+            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="P:OpenMetaverse.EstateUsersReplyEventArgs.Count">
+        <member name="M:OpenMetaverse.TexturePipeline.ImageDataHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>
-            The number of returned items
+            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="P:OpenMetaverse.EstateUsersReplyEventArgs.AllowedUsers">
+        <member name="P:OpenMetaverse.TexturePipeline.TransferCount">
+            <summary>Current number of pending and in-process transfers</summary>
+        </member>
+        <member name="T:OpenMetaverse.TexturePipeline.TaskInfo">
             <summary>
-            List of UUIDs of Allowed Users
+            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="T:OpenMetaverse.EstateGroupsReplyEventArgs">
-            <summary>Returned, along with other info, upon a successful .RequestInfo()</summary>
+        <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="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.TexturePipeline.TaskInfo.RequestID">
+            <summary>The Unique Request ID, This is also the Asset ID of the texture being requested</summary>
         </member>
-        <member name="P:OpenMetaverse.EstateGroupsReplyEventArgs.EstateID">
+        <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.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="M:OpenMetaverse.UDPPacketBuffer.#ctor">
             <summary>
-            The identifier of the estate
+            Create an allocated UDP packet buffer for receiving a packet
             </summary>
         </member>
-        <member name="P:OpenMetaverse.EstateGroupsReplyEventArgs.Count">
+        <member name="M:OpenMetaverse.UDPPacketBuffer.#ctor(System.Net.IPEndPoint)">
             <summary>
-            The number of returned items
+            Create an allocated UDP packet buffer for sending a packet
             </summary>
+            <param name="endPoint">EndPoint of the remote host</param>
         </member>
-        <member name="P:OpenMetaverse.EstateGroupsReplyEventArgs.AllowedGroups">
+        <member name="M:OpenMetaverse.UDPPacketBuffer.#ctor(System.Net.IPEndPoint,System.Int32)">
             <summary>
-            List of UUIDs of Allowed Groups
+            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="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">
+        <member name="T:OpenMetaverse.PacketBufferPool">
             <summary>
-            The identifier of the estate
+            Object pool for packet buffers. This is used to allocate memory for all
+            incoming and outgoing packets, and zerocoding buffers for those packets
             </summary>
         </member>
-        <member name="P:OpenMetaverse.EstateManagersReplyEventArgs.Count">
+        <member name="M:OpenMetaverse.ObjectPoolBase`1.#ctor">
             <summary>
-            The number of returned items
+            Creates a new instance of the ObjectPoolBase class. Initialize MUST be called
+            after using this constructor.
             </summary>
         </member>
-        <member name="P:OpenMetaverse.EstateManagersReplyEventArgs.Managers">
+        <member name="M:OpenMetaverse.ObjectPoolBase`1.#ctor(System.Int32,System.Int32,System.Boolean,System.Int32)">
             <summary>
-            List of UUIDs of the Estate's Managers
+            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="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">
+        <member name="M:OpenMetaverse.ObjectPoolBase`1.ForceCleanup">
             <summary>
-            The Covenant
+            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.EstateCovenantReplyEventArgs.Timestamp">
+        <member name="M:OpenMetaverse.ObjectPoolBase`1.GetObjectInstance">
             <summary>
-            The timestamp
+            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.EstateCovenantReplyEventArgs.EstateName">
+        <member name="M:OpenMetaverse.ObjectPoolBase`1.CheckIn(OpenMetaverse.ObjectPoolSegment{`0},`0)">
             <summary>
-            The Estate name
+            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.EstateCovenantReplyEventArgs.EstateOwnerID">
+        <member name="M:OpenMetaverse.ObjectPoolBase`1.CheckOut">
             <summary>
-            The Estate Owner's ID (can be a GroupID)
+            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="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="P:OpenMetaverse.ObjectPoolBase`1.TotalSegments">
             <summary>
-            The estate's name
+            The total number of segments created. Intended to be used by the Unit Tests.
             </summary>
         </member>
-        <member name="P:OpenMetaverse.EstateUpdateInfoReplyEventArgs.EstateOwner">
+        <member name="P:OpenMetaverse.ObjectPoolBase`1.ItemsPerSegment">
             <summary>
-            The Estate Owner's ID (can be a GroupID)
+            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="P:OpenMetaverse.EstateUpdateInfoReplyEventArgs.EstateID">
+        <member name="P:OpenMetaverse.ObjectPoolBase`1.MinimumSegmentCount">
             <summary>
-            The identifier of the estate on the grid
+            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>
         </member>
-        <member name="P:OpenMetaverse.EstateUpdateInfoReplyEventArgs.DenyNoPaymentInfo">
+        <member name="P:OpenMetaverse.ObjectPoolBase`1.MinimumSegmentAgePriorToCleanup">
             <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.
             </summary>
         </member>
-        <member name="T:OpenMetaverse.PacketEventDictionary">
+        <member name="P:OpenMetaverse.ObjectPoolBase`1.CleanupFrequencyMilliseconds">
             <summary>
-            Registers, unregisters, and fires events generated by incoming packets
+            The frequence which the cleanup thread runs. This is typically
+            expected to be in the 5 minute range. 
             </summary>
         </member>
-        <member name="M:OpenMetaverse.PacketEventDictionary.#ctor(OpenMetaverse.GridClient)">
+        <member name="M:OpenMetaverse.PacketBufferPool.#ctor(System.Net.IPEndPoint,System.Int32,System.Int32)">
             <summary>
-            Default constructor
+            Initialize the object pool in client mode
             </summary>
-            <param name="client">
-            </param>
+            <param name="endPoint">Server to connect to</param>
+            <param name="itemsPerSegment"></param>
+            <param name="minSegments"></param>
         </member>
-        <member name="T:OpenMetaverse.PacketEventDictionary.PacketCallbackWrapper">
+        <member name="M:OpenMetaverse.PacketBufferPool.#ctor(System.Int32,System.Int32)">
             <summary>
-            Object that is passed to worker threads in the ThreadPool for
-            firing packet callbacks
+            Initialize the object pool in server mode
             </summary>
+            <param name="itemsPerSegment"></param>
+            <param name="minSegments"></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="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)">
+        <member name="M:OpenMetaverse.PacketBufferPool.GetObjectInstance">
             <summary>
-            Register an event handler
+            Returns a packet buffer with EndPoint set if the buffer is in
+            client mode, or with EndPoint set to null in server mode
             </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>
+            <returns>Initialized UDPPacketBuffer object</returns>
         </member>
-        <member name="M:OpenMetaverse.PacketEventDictionary.UnregisterEvent(OpenMetaverse.Packets.PacketType,System.EventHandler{OpenMetaverse.PacketReceivedEventArgs})">
+        <member name="M:OpenMetaverse.Pool.#cctor">
             <summary>
-            Unregister an event handler
+            Default constructor
             </summary>
-            <param name="packetType">Packet type to unregister the handler for</param>
-            <param name="eventHandler">Callback to be unregistered</param>
         </member>
-        <member name="M:OpenMetaverse.PacketEventDictionary.RaiseEvent(OpenMetaverse.Packets.PacketType,OpenMetaverse.Packets.Packet,OpenMetaverse.Simulator)">
+        <member name="M:OpenMetaverse.Pool.CheckOut">
             <summary>
-            Fire the events registered for this packet type
+            Check a packet buffer out of the pool
             </summary>
-            <param name="packetType">Incoming packet type</param>
-            <param name="packet">Incoming packet</param>
-            <param name="simulator">Simulator this packet was received from</param>
+            <returns>A packet buffer object</returns>
         </member>
-        <member name="T:OpenMetaverse.CapsEventDictionary">
+        <member name="T:OpenMetaverse.Logger">
             <summary>
-            Registers, unregisters, and fires events generated by the Capabilities
-            event queue
+            Singleton logging class for the entire library
             </summary>
         </member>
-        <member name="M:OpenMetaverse.CapsEventDictionary.#ctor(OpenMetaverse.GridClient)">
+        <member name="F:OpenMetaverse.Logger.LogInstance">
+            <summary>log4net logging engine</summary>
+        </member>
+        <member name="M:OpenMetaverse.Logger.#cctor">
             <summary>
             Default constructor
             </summary>
-            <param name="client">Reference to the GridClient object</param>
         </member>
-        <member name="T:OpenMetaverse.CapsEventDictionary.CapsCallbackWrapper">
+        <member name="M:OpenMetaverse.Logger.Log(System.Object,OpenMetaverse.Helpers.LogLevel)">
             <summary>
-            Object that is passed to worker threads in the ThreadPool for
-            firing CAPS callbacks
+            Send a log message to the logging engine
             </summary>
+            <param name="message">The log message</param>
+            <param name="level">The severity of the log entry</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 name="M:OpenMetaverse.Logger.Log(System.Object,OpenMetaverse.Helpers.LogLevel,OpenMetaverse.GridClient)">
+            <summary>
+            Send a log message to the logging engine
+            </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>
         </member>
-        <member name="F:OpenMetaverse.CapsEventDictionary.Client">
-            <summary>Reference to the GridClient object</summary>
+        <member name="M:OpenMetaverse.Logger.Log(System.Object,OpenMetaverse.Helpers.LogLevel,System.Exception)">
+            <summary>
+            Send a log message to the logging engine
+            </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>
         </member>
-        <member name="M:OpenMetaverse.CapsEventDictionary.RegisterEvent(System.String,OpenMetaverse.Caps.EventQueueCallback)">
+        <member name="M:OpenMetaverse.Logger.Log(System.Object,OpenMetaverse.Helpers.LogLevel,OpenMetaverse.GridClient,System.Exception)">
             <summary>
-            Register an new event handler for a capabilities event sent via the EventQueue
+            Send a log message to the logging engine
             </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="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.CapsEventDictionary.UnregisterEvent(System.String,OpenMetaverse.Caps.EventQueueCallback)">
+        <member name="M:OpenMetaverse.Logger.DebugLog(System.Object)">
             <summary>
-            Unregister a previously registered capabilities handler
+            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="capsEvent">Capability event name unregister the
-            handler for</param>
-            <param name="eventHandler">Callback to unregister</param>
+            <param name="message">The message to log at the DEBUG level to the
+            current logging engine</param>
         </member>
-        <member name="M:OpenMetaverse.CapsEventDictionary.RaiseEvent(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
+        <member name="M:OpenMetaverse.Logger.DebugLog(System.Object,OpenMetaverse.GridClient)">
             <summary>
-            Fire the events registered for this event type synchronously
+            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="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="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.CapsEventDictionary.BeginRaiseEvent(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
+        <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="T:OpenMetaverse.Logger.LogCallback">
             <summary>
-            Fire the events registered for this event type asynchronously
+            Callback used for client apps to receive log messages from
+            the library
             </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="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="T:OpenMetaverse.FriendRights">
             <summary>
+            
             </summary>
         </member>
         <member name="F:OpenMetaverse.FriendRights.None">
@@ -7807,7 +9710,7 @@
         </member>
         <member name="T:OpenMetaverse.FriendInfo">
             <summary>
-            This class holds information about an avatar in the friends list.  There are two ways
+            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
@@ -7821,6 +9724,12 @@
             <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">
+            <summary>
+            FriendInfo represented as a string
+            </summary>
+            <returns>A string reprentation of both my rights and my friends rights</returns>
+        </member>
         <member name="P:OpenMetaverse.FriendInfo.UUID">
             <summary>
             System ID of the avatar
@@ -7843,7 +9752,7 @@
         </member>
         <member name="P:OpenMetaverse.FriendInfo.CanSeeMeOnMap">
             <summary>
-            True if the friend can see me on the map
+            True if the friend can see me on the map 
             </summary>
         </member>
         <member name="P:OpenMetaverse.FriendInfo.CanModifyMyObjects">
@@ -7876,151 +9785,121 @@
             My rights represented as bitmapped flags
             </summary>
         </member>
-        <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="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.FriendsManager.#ctor(OpenMetaverse.GridClient)">
-            <summary>
-            Internal constructor
+            This class is used to add and remove avatars from your friends list and to manage their permission.  
             </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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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" />
+            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
+            
+            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 name="M:OpenMetaverse.FriendsManager.#ctor(OpenMetaverse.GridClient)">
+            <summary>
+            Internal constructor
+            </summary>
+            <param name="client">A reference to the GridClient Object</param>
         </member>
         <member name="M:OpenMetaverse.FriendsManager.AcceptFriendship(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
@@ -8033,8 +9912,7 @@
             <summary>
             Decline a friendship request
             </summary>
-            <param name="fromAgentID">
-                <seealso cref="T:OpenMetaverse.UUID" /> of friend</param>
+            <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)">
@@ -8065,7 +9943,7 @@
             <summary>
             Change the rights of a friend avatar.
             </summary>
-            <param name="friendID">the <seealso cref="T:OpenMetaverse.UUID" /> of the friend</param>
+            <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>
@@ -8074,9 +9952,7 @@
             Use to map a friends location on the grid.
             </summary>
             <param name="friendID">Friends UUID to find</param>
-            <remarks>
-                <seealso cref="E:OnFriendFound" />
-            </remarks>
+            <remarks><seealso cref="E:OnFriendFound"/></remarks>
         </member>
         <member name="M:OpenMetaverse.FriendsManager.TrackFriend(OpenMetaverse.UUID)">
             <summary>
@@ -8094,8 +9970,7 @@
             <summary>
             This handles the asynchronous response of a RequestAvatarNames call.
             </summary>
-            <param name="sender">
-            </param>
+            <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)">
@@ -8120,15 +9995,41 @@
         </member>
         <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
+            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
+            <param name="replyData">A <seealso cref="T:OpenMetaverse.LoginResponseData"/> object containing the decoded 
             reply from the login server</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>
+        <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="T:OpenMetaverse.FriendInfoEventArgs">
             <summary>Contains information on a member of our friends list</summary>
         </member>
@@ -8148,11 +10049,11 @@
             <summary>
             Construct a new instance of the FriendNamesEventArgs class
             </summary>
-            <param name="names">A dictionary where the Key is the ID of the Agent,
+            <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="P:OpenMetaverse.FriendNamesEventArgs.Names">
-            <summary>A dictionary where the Key is the ID of the Agent,
+            <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="T:OpenMetaverse.FriendshipOfferedEventArgs">
@@ -8164,7 +10065,7 @@
             </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
+            <param name="imSessionID">The ID of the session, used in accepting or declining the 
             friendship offer</param>
         </member>
         <member name="P:OpenMetaverse.FriendshipOfferedEventArgs.AgentID">
@@ -8174,7 +10075,7 @@
             <summary>Get the name of the agent requesting friendship</summary>
         </member>
         <member name="P:OpenMetaverse.FriendshipOfferedEventArgs.SessionID">
-            <summary>Get the ID of the session, used in accepting or declining the
+            <summary>Get the ID of the session, used in accepting or declining the 
             friendship offer</summary>
         </member>
         <member name="T:OpenMetaverse.FriendshipResponseEventArgs">
@@ -8215,7 +10116,7 @@
         </member>
         <member name="T:OpenMetaverse.FriendFoundReplyEventArgs">
             <summary>
-            Data sent in response to a <see cref="!:FindFriend" /> request which contains the information to allow us to map the friends location
+            Data sent in response to a <see cref="!:FindFriend"/> request which contains the information to allow us to map the friends location
             </summary>
         </member>
         <member name="M:OpenMetaverse.FriendFoundReplyEventArgs.#ctor(OpenMetaverse.UUID,System.UInt64,OpenMetaverse.Vector3)">
@@ -8235,6345 +10136,2832 @@
         <member name="P:OpenMetaverse.FriendFoundReplyEventArgs.Location">
             <summary>Get the simulator local position where our friend is located</summary>
         </member>
-        <member name="T:OpenMetaverse.GridClient">
-            <summary>
-            Main class to expose grid functionality to clients. All of the
-            classes needed for sending and receiving data are accessible through
-            this class.
-            </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.GridClient.#ctor">
-            <summary>
-            Default constructor
-            </summary>
-        </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>
-        </member>
-        <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>
-            Return the full name of this instance
-            </summary>
-            <returns>Client avatars full name</returns>
-        </member>
-        <member name="T:OpenMetaverse.GridLayerType">
-            <summary>
-            Map layer request type
-            </summary>
-        </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">
-            <summary>
-            Type of grid item, such as telehub, event, populator location, etc.
-            </summary>
-        </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>
-        <member name="T:OpenMetaverse.GridRegion">
+        <member name="T:OpenMetaverse.Animations">
             <summary>
-            Information about a region on the grid map
+            Static pre-defined animations available to all agents
             </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>
-        <member name="F:OpenMetaverse.GridRegion.Name">
-            <summary>Sim Name (NOTE: In lowercase!)</summary>
-        </member>
-        <member name="F:OpenMetaverse.GridRegion.Access">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Animations.AFRAID">
+            <summary>Agent with afraid expression on face</summary>
         </member>
-        <member name="F:OpenMetaverse.GridRegion.RegionFlags">
-            <summary>Appears to always be zero (None)</summary>
+        <member name="F:OpenMetaverse.Animations.AIM_BAZOOKA_R">
+            <summary>Agent aiming a bazooka (right handed)</summary>
         </member>
-        <member name="F:OpenMetaverse.GridRegion.WaterHeight">
-            <summary>Sim's defined Water Height</summary>
+        <member name="F:OpenMetaverse.Animations.AIM_BOW_L">
+            <summary>Agent aiming a bow (left handed)</summary>
         </member>
-        <member name="F:OpenMetaverse.GridRegion.Agents">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Animations.AIM_HANDGUN_R">
+            <summary>Agent aiming a hand gun (right handed)</summary>
         </member>
-        <member name="F:OpenMetaverse.GridRegion.MapImageID">
-            <summary>UUID of the World Map image</summary>
+        <member name="F:OpenMetaverse.Animations.AIM_RIFLE_R">
+            <summary>Agent aiming a rifle (right handed)</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.Animations.ANGRY">
+            <summary>Agent with angry expression on face</summary>
         </member>
-        <member name="M:OpenMetaverse.GridRegion.ToString">
-            <summary>
-            </summary>
-            <returns>
-            </returns>
+        <member name="F:OpenMetaverse.Animations.AWAY">
+            <summary>Agent hunched over (away)</summary>
         </member>
-        <member name="M:OpenMetaverse.GridRegion.GetHashCode">
-            <summary>
-            </summary>
-            <returns>
-            </returns>
+        <member name="F:OpenMetaverse.Animations.BACKFLIP">
+            <summary>Agent doing a backflip</summary>
         </member>
-        <member name="M:OpenMetaverse.GridRegion.Equals(System.Object)">
-            <summary>
-            </summary>
-            <param name="obj">
-            </param>
-            <returns>
-            </returns>
+        <member name="F:OpenMetaverse.Animations.BELLY_LAUGH">
+            <summary>Agent laughing while holding belly</summary>
         </member>
-        <member name="T:OpenMetaverse.GridLayer">
-            <summary>
-            Visual chunk of the grid map
-            </summary>
+        <member name="F:OpenMetaverse.Animations.BLOW_KISS">
+            <summary>Agent blowing a kiss</summary>
         </member>
-        <member name="T:OpenMetaverse.MapItem">
-            <summary>
-            Base class for Map Items
-            </summary>
+        <member name="F:OpenMetaverse.Animations.BORED">
+            <summary>Agent with bored expression on face</summary>
         </member>
-        <member name="F:OpenMetaverse.MapItem.GlobalX">
-            <summary>The Global X position of the item</summary>
+        <member name="F:OpenMetaverse.Animations.BOW">
+            <summary>Agent bowing to audience</summary>
         </member>
-        <member name="F:OpenMetaverse.MapItem.GlobalY">
-            <summary>The Global Y position of the item</summary>
+        <member name="F:OpenMetaverse.Animations.BRUSH">
+            <summary>Agent brushing himself/herself off</summary>
         </member>
-        <member name="P:OpenMetaverse.MapItem.LocalX">
-            <summary>Get the Local X position of the item</summary>
+        <member name="F:OpenMetaverse.Animations.BUSY">
+            <summary>Agent in busy mode</summary>
         </member>
-        <member name="P:OpenMetaverse.MapItem.LocalY">
-            <summary>Get the Local Y position of the item</summary>
+        <member name="F:OpenMetaverse.Animations.CLAP">
+            <summary>Agent clapping hands</summary>
         </member>
-        <member name="P:OpenMetaverse.MapItem.RegionHandle">
-            <summary>Get the Handle of the region</summary>
+        <member name="F:OpenMetaverse.Animations.COURTBOW">
+            <summary>Agent doing a curtsey bow</summary>
         </member>
-        <member name="T:OpenMetaverse.MapAgentLocation">
-            <summary>
-            Represents an agent or group of agents location
-            </summary>
+        <member name="F:OpenMetaverse.Animations.CROUCH">
+            <summary>Agent crouching</summary>
         </member>
-        <member name="T:OpenMetaverse.MapTelehub">
-            <summary>
-            Represents a Telehub location
-            </summary>
+        <member name="F:OpenMetaverse.Animations.CROUCHWALK">
+            <summary>Agent crouching while walking</summary>
         </member>
-        <member name="T:OpenMetaverse.MapLandForSale">
-            <summary>
-            Represents a non-adult parcel of land for sale
-            </summary>
+        <member name="F:OpenMetaverse.Animations.CRY">
+            <summary>Agent crying</summary>
         </member>
-        <member name="T:OpenMetaverse.MapAdultLandForSale">
-            <summary>
-            Represents an Adult parcel of land for sale
-            </summary>
+        <member name="F:OpenMetaverse.Animations.CUSTOMIZE">
+            <summary>Agent unanimated with arms out (e.g. setting appearance)</summary>
         </member>
-        <member name="T:OpenMetaverse.MapPGEvent">
-            <summary>
-            Represents a PG Event
-            </summary>
+        <member name="F:OpenMetaverse.Animations.CUSTOMIZE_DONE">
+            <summary>Agent re-animated after set appearance finished</summary>
         </member>
-        <member name="T:OpenMetaverse.MapMatureEvent">
-            <summary>
-            Represents a Mature event
-            </summary>
+        <member name="F:OpenMetaverse.Animations.DANCE1">
+            <summary>Agent dancing</summary>
         </member>
-        <member name="T:OpenMetaverse.MapAdultEvent">
-            <summary>
-            Represents an Adult event
-            </summary>
+        <member name="F:OpenMetaverse.Animations.DANCE2">
+            <summary>Agent dancing</summary>
         </member>
-        <member name="T:OpenMetaverse.GridManager">
-            <summary>
-            Manages grid-wide tasks such as the world map
-            </summary>
+        <member name="F:OpenMetaverse.Animations.DANCE3">
+            <summary>Agent dancing</summary>
         </member>
-        <member name="M:OpenMetaverse.GridManager.#ctor(OpenMetaverse.GridClient)">
-            <summary>
-            Constructor
-            </summary>
-            <param name="client">Instance of GridClient object to associate with this GridManager instance</param>
+        <member name="F:OpenMetaverse.Animations.DANCE4">
+            <summary>Agent dancing</summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_CoarseLocationUpdate">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Animations.DANCE5">
+            <summary>Agent dancing</summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_CoarseLocationUpdateLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Animations.DANCE6">
+            <summary>Agent dancing</summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_GridRegion">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Animations.DANCE7">
+            <summary>Agent dancing</summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_GridRegionLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Animations.DANCE8">
+            <summary>Agent dancing</summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_GridLayer">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Animations.DEAD">
+            <summary>Agent on ground unanimated</summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_GridLayerLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Animations.DRINK">
+            <summary>Agent boozing it up</summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_GridItems">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Animations.EMBARRASSED">
+            <summary>Agent with embarassed expression on face</summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_GridItemsLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_AFRAID">
+            <summary>Agent with afraid expression on face</summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_RegionHandleReply">
-            <summary>The event subscribers. null if no subcribers</summary>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_ANGER">
+            <summary>Agent with angry expression on face</summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.m_RegionHandleReplyLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_BORED">
+            <summary>Agent with bored expression on face</summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.Regions">
-            <summary>A dictionary of all the regions, indexed by region name</summary>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_CRY">
+            <summary>Agent crying</summary>
         </member>
-        <member name="F:OpenMetaverse.GridManager.RegionsByHandle">
-            <summary>A dictionary of all the regions, indexed by region handle</summary>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_DISDAIN">
+            <summary>Agent showing disdain (dislike) for something</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.Animations.EXPRESS_EMBARRASSED">
+            <summary>Agent with embarassed expression on face</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.Animations.EXPRESS_FROWN">
+            <summary>Agent with frowning expression on face</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.Animations.EXPRESS_KISS">
+            <summary>Agent with kissy face</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.Animations.EXPRESS_LAUGH">
+            <summary>Agent expressing laughgter</summary>
         </member>
-        <member name="E:OpenMetaverse.GridManager.RegionHandleReply">
-            <summary>Raised in response to a Region lookup</summary>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_OPEN_MOUTH">
+            <summary>Agent with open mouth</summary>
         </member>
-        <member name="P:OpenMetaverse.GridManager.SunPhase">
-            <summary>Unknown</summary>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_REPULSED">
+            <summary>Agent with repulsed expression on face</summary>
         </member>
-        <member name="P:OpenMetaverse.GridManager.SunDirection">
-            <summary>Current direction of the sun</summary>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_SAD">
+            <summary>Agent expressing sadness</summary>
         </member>
-        <member name="P:OpenMetaverse.GridManager.SunAngVelocity">
-            <summary>Current angular velocity of the sun</summary>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_SHRUG">
+            <summary>Agent shrugging shoulders</summary>
         </member>
-        <member name="P:OpenMetaverse.GridManager.TimeOfDay">
-            <summary>Microseconds since the start of SL 4-hour day</summary>
+        <member name="F:OpenMetaverse.Animations.EXPRESS_SMILE">
+            <summary>Agent with a smile</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 name="F:OpenMetaverse.Animations.EXPRESS_SURPRISE">
+            <summary>Agent expressing surprise</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.Animations.EXPRESS_TONGUE_OUT">
+            <summary>Agent sticking tongue out</summary>
         </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="F:OpenMetaverse.Animations.EXPRESS_TOOTHSMILE">
+            <summary>Agent with big toothy smile</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="F:OpenMetaverse.Animations.EXPRESS_WINK">
+            <summary>Agent winking</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.Animations.EXPRESS_WORRY">
+            <summary>Agent expressing worry</summary>
         </member>
-        <member name="M:OpenMetaverse.GridManager.RequestMapLayer(OpenMetaverse.GridLayerType)">
-            <summary>
-            </summary>
-            <param name="layer">
-            </param>
+        <member name="F:OpenMetaverse.Animations.FALLDOWN">
+            <summary>Agent falling down</summary>
         </member>
-        <member name="M:OpenMetaverse.GridManager.RequestMapRegion(System.String,OpenMetaverse.GridLayerType)">
-            <summary>
-            Request a map layer
-            </summary>
-            <param name="regionName">The name of the region</param>
-            <param name="layer">The type of layer</param>
+        <member name="F:OpenMetaverse.Animations.FEMALE_WALK">
+            <summary>Agent walking (feminine version)</summary>
         </member>
-        <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 name="F:OpenMetaverse.Animations.FINGER_WAG">
+            <summary>Agent wagging finger (disapproval)</summary>
         </member>
-        <member name="M:OpenMetaverse.GridManager.MapItems(System.UInt64,OpenMetaverse.GridItemType,OpenMetaverse.GridLayerType,System.Int32)">
-            <summary>
-            </summary>
-            <param name="regionHandle">
-            </param>
-            <param name="item">
-            </param>
-            <param name="layer">
-            </param>
-            <param name="timeoutMS">
-            </param>
-            <returns>
-            </returns>
+        <member name="F:OpenMetaverse.Animations.FIST_PUMP">
+            <summary>I'm not sure I want to know</summary>
         </member>
-        <member name="M:OpenMetaverse.GridManager.RequestMapItems(System.UInt64,OpenMetaverse.GridItemType,OpenMetaverse.GridLayerType)">
-            <summary>
-            </summary>
-            <param name="regionHandle">
-            </param>
-            <param name="item">
-            </param>
-            <param name="layer">
-            </param>
+        <member name="F:OpenMetaverse.Animations.FLY">
+            <summary>Agent in superman position</summary>
         </member>
-        <member name="M:OpenMetaverse.GridManager.RequestMainlandSims(OpenMetaverse.GridLayerType)">
-            <summary>
-            Request data for all mainland (Linden managed) simulators
-            </summary>
+        <member name="F:OpenMetaverse.Animations.FLYSLOW">
+            <summary>Agent in superman position</summary>
         </member>
-        <member name="M:OpenMetaverse.GridManager.RequestRegionHandle(OpenMetaverse.UUID)">
-            <summary>
-            Request the region handle for the specified region UUID
-            </summary>
-            <param name="regionID">UUID of the region to look up</param>
+        <member name="F:OpenMetaverse.Animations.HELLO">
+            <summary>Agent greeting another</summary>
         </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 name="F:OpenMetaverse.Animations.HOLD_BAZOOKA_R">
+            <summary>Agent holding bazooka (right handed)</summary>
         </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="F:OpenMetaverse.Animations.HOLD_BOW_L">
+            <summary>Agent holding a bow (left handed)</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.Animations.HOLD_HANDGUN_R">
+            <summary>Agent holding a handgun (right handed)</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.Animations.HOLD_RIFLE_R">
+            <summary>Agent holding a rifle (right handed)</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.Animations.HOLD_THROW_R">
+            <summary>Agent throwing an object (right handed)</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="F:OpenMetaverse.Animations.HOVER">
+            <summary>Agent in static hover</summary>
         </member>
-        <member name="T:OpenMetaverse.GroupMember">
-            <summary>
-            Avatar group management
-            </summary>
+        <member name="F:OpenMetaverse.Animations.HOVER_DOWN">
+            <summary>Agent hovering downward</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupMember.ID">
-            <summary>Key of Group Member</summary>
+        <member name="F:OpenMetaverse.Animations.HOVER_UP">
+            <summary>Agent hovering upward</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupMember.Contribution">
-            <summary>Total land contribution</summary>
+        <member name="F:OpenMetaverse.Animations.IMPATIENT">
+            <summary>Agent being impatient</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupMember.OnlineStatus">
-            <summary>Online status information</summary>
+        <member name="F:OpenMetaverse.Animations.JUMP">
+            <summary>Agent jumping</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupMember.Powers">
-            <summary>Abilities that the Group Member has</summary>
+        <member name="F:OpenMetaverse.Animations.JUMP_FOR_JOY">
+            <summary>Agent jumping with fervor</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupMember.Title">
-            <summary>Current group title</summary>
+        <member name="F:OpenMetaverse.Animations.KISS_MY_BUTT">
+            <summary>Agent point to lips then rear end</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupMember.IsOwner">
-            <summary>Is a group owner</summary>
+        <member name="F:OpenMetaverse.Animations.LAND">
+            <summary>Agent landing from jump, finished flight, etc</summary>
         </member>
-        <member name="T:OpenMetaverse.GroupRole">
-            <summary>
-            Role manager for a group
-            </summary>
+        <member name="F:OpenMetaverse.Animations.LAUGH_SHORT">
+            <summary>Agent laughing</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupRole.GroupID">
-            <summary>Key of the group</summary>
+        <member name="F:OpenMetaverse.Animations.MEDIUM_LAND">
+            <summary>Agent landing from jump, finished flight, etc</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupRole.ID">
-            <summary>Key of Role</summary>
+        <member name="F:OpenMetaverse.Animations.MOTORCYCLE_SIT">
+            <summary>Agent sitting on a motorcycle</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupRole.Name">
-            <summary>Name of Role</summary>
+        <member name="F:OpenMetaverse.Animations.MUSCLE_BEACH">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.GroupRole.Title">
-            <summary>Group Title associated with Role</summary>
+        <member name="F:OpenMetaverse.Animations.NO">
+            <summary>Agent moving head side to side</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupRole.Description">
-            <summary>Description of Role</summary>
+        <member name="F:OpenMetaverse.Animations.NO_UNHAPPY">
+            <summary>Agent moving head side to side with unhappy expression</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupRole.Powers">
-            <summary>Abilities Associated with Role</summary>
+        <member name="F:OpenMetaverse.Animations.NYAH_NYAH">
+            <summary>Agent taunting another</summary>
         </member>
-        <member name="M:OpenMetaverse.GroupRole.ToString">
-            <summary>Returns the role's title</summary>
-            <returns>The role's title</returns>
+        <member name="F:OpenMetaverse.Animations.ONETWO_PUNCH">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.GroupTitle">
-            <summary>
-            Class to represent Group Title
-            </summary>
+        <member name="F:OpenMetaverse.Animations.PEACE">
+            <summary>Agent giving peace sign</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupTitle.GroupID">
-            <summary>Key of the group</summary>
+        <member name="F:OpenMetaverse.Animations.POINT_ME">
+            <summary>Agent pointing at self</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupTitle.RoleID">
-            <summary>ID of the role title belongs to</summary>
+        <member name="F:OpenMetaverse.Animations.POINT_YOU">
+            <summary>Agent pointing at another</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupTitle.Title">
-            <summary>Group Title</summary>
+        <member name="F:OpenMetaverse.Animations.PRE_JUMP">
+            <summary>Agent preparing for jump (bending knees)</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupTitle.Selected">
-            <summary>Whether title is Active</summary>
+        <member name="F:OpenMetaverse.Animations.PUNCH_LEFT">
+            <summary>Agent punching with left hand</summary>
         </member>
-        <member name="M:OpenMetaverse.GroupTitle.ToString">
-            <summary>Returns group title</summary>
+        <member name="F:OpenMetaverse.Animations.PUNCH_RIGHT">
+            <summary>Agent punching with right hand</summary>
         </member>
-        <member name="T:OpenMetaverse.Group">
-            <summary>
-            Represents a group on the grid
-            </summary>
+        <member name="F:OpenMetaverse.Animations.REPULSED">
+            <summary>Agent acting repulsed</summary>
         </member>
-        <member name="F:OpenMetaverse.Group.ID">
-            <summary>Key of Group</summary>
+        <member name="F:OpenMetaverse.Animations.ROUNDHOUSE_KICK">
+            <summary>Agent trying to be Chuck Norris</summary>
         </member>
-        <member name="F:OpenMetaverse.Group.InsigniaID">
-            <summary>Key of Group Insignia</summary>
+        <member name="F:OpenMetaverse.Animations.RPS_COUNTDOWN">
+            <summary>Rocks, Paper, Scissors 1, 2, 3</summary>
         </member>
-        <member name="F:OpenMetaverse.Group.FounderID">
-            <summary>Key of Group Founder</summary>
+        <member name="F:OpenMetaverse.Animations.RPS_PAPER">
+            <summary>Agent with hand flat over other hand</summary>
         </member>
-        <member name="F:OpenMetaverse.Group.OwnerRole">
-            <summary>Key of Group Role for Owners</summary>
+        <member name="F:OpenMetaverse.Animations.RPS_ROCK">
+            <summary>Agent with fist over other hand</summary>
         </member>
-        <member name="F:OpenMetaverse.Group.Name">
-            <summary>Name of Group</summary>
+        <member name="F:OpenMetaverse.Animations.RPS_SCISSORS">
+            <summary>Agent with two fingers spread over other hand</summary>
         </member>
-        <member name="F:OpenMetaverse.Group.Charter">
-            <summary>Text of Group Charter</summary>
+        <member name="F:OpenMetaverse.Animations.RUN">
+            <summary>Agent running</summary>
         </member>
-        <member name="F:OpenMetaverse.Group.MemberTitle">
-            <summary>Title of "everyone" role</summary>
+        <member name="F:OpenMetaverse.Animations.SAD">
+            <summary>Agent appearing sad</summary>
         </member>
-        <member name="F:OpenMetaverse.Group.OpenEnrollment">
-            <summary>Is the group open for enrolement to everyone</summary>
+        <member name="F:OpenMetaverse.Animations.SALUTE">
+            <summary>Agent saluting</summary>
         </member>
-        <member name="F:OpenMetaverse.Group.ShowInList">
-            <summary>Will group show up in search</summary>
+        <member name="F:OpenMetaverse.Animations.SHOOT_BOW_L">
+            <summary>Agent shooting bow (left handed)</summary>
         </member>
-        <member name="F:OpenMetaverse.Group.Powers">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Animations.SHOUT">
+            <summary>Agent cupping mouth as if shouting</summary>
         </member>
-        <member name="F:OpenMetaverse.Group.AcceptNotices">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Animations.SHRUG">
+            <summary>Agent shrugging shoulders</summary>
         </member>
-        <member name="F:OpenMetaverse.Group.AllowPublish">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Animations.SIT">
+            <summary>Agent in sit position</summary>
         </member>
-        <member name="F:OpenMetaverse.Group.MaturePublish">
-            <summary>Is the group Mature</summary>
+        <member name="F:OpenMetaverse.Animations.SIT_FEMALE">
+            <summary>Agent in sit position (feminine)</summary>
         </member>
-        <member name="F:OpenMetaverse.Group.MembershipFee">
-            <summary>Cost of group membership</summary>
+        <member name="F:OpenMetaverse.Animations.SIT_GENERIC">
+            <summary>Agent in sit position (generic)</summary>
         </member>
-        <member name="F:OpenMetaverse.Group.Money">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Animations.SIT_GROUND">
+            <summary>Agent sitting on ground</summary>
         </member>
-        <member name="F:OpenMetaverse.Group.Contribution">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Animations.SIT_GROUND_staticRAINED">
+            <summary>Agent sitting on ground</summary>
         </member>
-        <member name="F:OpenMetaverse.Group.GroupMembershipCount">
-            <summary>The total number of current members this group has</summary>
+        <member name="F:OpenMetaverse.Animations.SIT_TO_STAND">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Group.GroupRolesCount">
-            <summary>The number of roles this group has configured</summary>
+        <member name="F:OpenMetaverse.Animations.SLEEP">
+            <summary>Agent sleeping on side</summary>
         </member>
-        <member name="F:OpenMetaverse.Group.ListInProfile">
-            <summary>Show this group in agent's profile</summary>
+        <member name="F:OpenMetaverse.Animations.SMOKE_IDLE">
+            <summary>Agent smoking</summary>
         </member>
-        <member name="M:OpenMetaverse.Group.ToString">
-            <summary>Returns the name of the group</summary>
-            <returns>A string containing the name of the group</returns>
+        <member name="F:OpenMetaverse.Animations.SMOKE_INHALE">
+            <summary>Agent inhaling smoke</summary>
         </member>
-        <member name="T:OpenMetaverse.Vote">
-            <summary>
-            A group Vote
-            </summary>
+        <member name="F:OpenMetaverse.Animations.SMOKE_THROW_DOWN">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Vote.Candidate">
-            <summary>Key of Avatar who created Vote</summary>
+        <member name="F:OpenMetaverse.Animations.SNAPSHOT">
+            <summary>Agent taking a picture</summary>
         </member>
-        <member name="F:OpenMetaverse.Vote.VoteString">
-            <summary>Text of the Vote proposal</summary>
+        <member name="F:OpenMetaverse.Animations.STAND">
+            <summary>Agent standing</summary>
         </member>
-        <member name="F:OpenMetaverse.Vote.NumVotes">
-            <summary>Total number of votes</summary>
+        <member name="F:OpenMetaverse.Animations.STANDUP">
+            <summary>Agent standing up</summary>
         </member>
-        <member name="T:OpenMetaverse.GroupProposal">
-            <summary>
-            A group proposal
-            </summary>
+        <member name="F:OpenMetaverse.Animations.STAND_1">
+            <summary>Agent standing</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupProposal.VoteText">
-            <summary>The Text of the proposal</summary>
+        <member name="F:OpenMetaverse.Animations.STAND_2">
+            <summary>Agent standing</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupProposal.Quorum">
-            <summary>The minimum number of members that must vote before proposal passes or failes</summary>
+        <member name="F:OpenMetaverse.Animations.STAND_3">
+            <summary>Agent standing</summary>
         </member>
-        <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>
-        <member name="F:OpenMetaverse.GroupProposal.Duration">
-            <summary>The duration in days votes are accepted</summary>
+        <member name="F:OpenMetaverse.Animations.STAND_4">
+            <summary>Agent standing</summary>
         </member>
-        <member name="T:OpenMetaverse.GroupAccountSummary">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Animations.STRETCH">
+            <summary>Agent stretching</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.IntervalDays">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Animations.STRIDE">
+            <summary>Agent in stride (fast walk)</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.CurrentInterval">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Animations.SURF">
+            <summary>Agent surfing</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.StartDate">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Animations.SURPRISE">
+            <summary>Agent acting surprised</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.Balance">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Animations.SWORD_STRIKE">
+            <summary>Agent striking with a sword</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.TotalCredits">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Animations.TALK">
+            <summary>Agent talking (lips moving)</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.TotalDebits">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Animations.TANTRUM">
+            <summary>Agent throwing a tantrum</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.ObjectTaxCurrent">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Animations.THROW_R">
+            <summary>Agent throwing an object (right handed)</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.LightTaxCurrent">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Animations.TRYON_SHIRT">
+            <summary>Agent trying on a shirt</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.LandTaxCurrent">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Animations.TURNLEFT">
+            <summary>Agent turning to the left</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.GroupTaxCurrent">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Animations.TURNRIGHT">
+            <summary>Agent turning to the right</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.ParcelDirFeeCurrent">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Animations.TYPE">
+            <summary>Agent typing</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.ObjectTaxEstimate">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Animations.WALK">
+            <summary>Agent walking</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.LightTaxEstimate">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Animations.WHISPER">
+            <summary>Agent whispering</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.LandTaxEstimate">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Animations.WHISTLE">
+            <summary>Agent whispering with fingers in mouth</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.GroupTaxEstimate">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Animations.WINK">
+            <summary>Agent winking</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.ParcelDirFeeEstimate">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Animations.WINK_HOLLYWOOD">
+            <summary>Agent winking</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.NonExemptMembers">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Animations.WORRY">
+            <summary>Agent worried</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.LastTaxDate">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Animations.YES">
+            <summary>Agent nodding yes</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupAccountSummary.TaxDate">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Animations.YES_HAPPY">
+            <summary>Agent nodding yes with happy face</summary>
         </member>
-        <member name="T:OpenMetaverse.GroupNotice">
-            <summary>
-            Struct representing a group notice
-            </summary>
+        <member name="F:OpenMetaverse.Animations.YOGA_FLOAT">
+            <summary>Agent floating with legs and arms crossed</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupNotice.Subject">
+        <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.GroupNotice.Message">
+        <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="F:OpenMetaverse.GroupNotice.AttachmentID">
+        <member name="M:OpenMetaverse.AgentThrottle.#ctor(OpenMetaverse.GridClient)">
             <summary>
+            Default constructor, uses a default high total of 1500 KBps (1536000)
             </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupNotice.OwnerID">
+        <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.GroupNotice.SerializeAttachment">
+        <member name="M:OpenMetaverse.AgentThrottle.Set">
             <summary>
+            Send an AgentThrottle packet to the current server using the 
+            current values
             </summary>
-            <returns>
-            </returns>
         </member>
-        <member name="T:OpenMetaverse.GroupNoticesListEntry">
+        <member name="M:OpenMetaverse.AgentThrottle.Set(OpenMetaverse.Simulator)">
             <summary>
-            Struct representing a group notice list entry
+            Send an AgentThrottle packet to the specified server using the 
+            current values
             </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupNoticesListEntry.NoticeID">
-            <summary>Notice ID</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupNoticesListEntry.Timestamp">
-            <summary>Creation timestamp of notice</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupNoticesListEntry.FromName">
-            <summary>Agent name who created notice</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupNoticesListEntry.Subject">
-            <summary>Notice subject</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupNoticesListEntry.HasAttachment">
-            <summary>Is there an attachment?</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupNoticesListEntry.AssetType">
-            <summary>Attachment Type</summary>
-        </member>
-        <member name="T:OpenMetaverse.ChatSessionMember">
+        <member name="M:OpenMetaverse.AgentThrottle.ToBytes">
             <summary>
-            Struct representing a member of a group chat session and their settings
+            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="F:OpenMetaverse.ChatSessionMember.AvatarKey">
-            <summary>The <see cref="T:OpenMetaverse.UUID" /> of the Avatar</summary>
+        <member name="P:OpenMetaverse.AgentThrottle.Resend">
+            <summary>Maximum bits per second for resending unacknowledged packets</summary>
         </member>
-        <member name="F:OpenMetaverse.ChatSessionMember.CanVoiceChat">
-            <summary>True if user has voice chat enabled</summary>
+        <member name="P:OpenMetaverse.AgentThrottle.Land">
+            <summary>Maximum bits per second for LayerData terrain</summary>
         </member>
-        <member name="F:OpenMetaverse.ChatSessionMember.IsModerator">
-            <summary>True of Avatar has moderator abilities</summary>
+        <member name="P:OpenMetaverse.AgentThrottle.Wind">
+            <summary>Maximum bits per second for LayerData wind data</summary>
         </member>
-        <member name="F:OpenMetaverse.ChatSessionMember.MuteText">
-            <summary>True if a moderator has muted this avatars chat</summary>
+        <member name="P:OpenMetaverse.AgentThrottle.Cloud">
+            <summary>Maximum bits per second for LayerData clouds</summary>
         </member>
-        <member name="F:OpenMetaverse.ChatSessionMember.MuteVoice">
-            <summary>True if a moderator has muted this avatars voice</summary>
+        <member name="P:OpenMetaverse.AgentThrottle.Task">
+            <summary>Unknown, includes object data</summary>
         </member>
-        <member name="T:OpenMetaverse.GroupRoleUpdate">
-            <summary>
-            Role update flags
-            </summary>
+        <member name="P:OpenMetaverse.AgentThrottle.Texture">
+            <summary>Maximum bits per second for textures</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupRoleUpdate.NoUpdate">
-            <summary>
-            </summary>
+        <member name="P:OpenMetaverse.AgentThrottle.Asset">
+            <summary>Maximum bits per second for downloaded assets</summary>
         </member>
-        <member name="F:OpenMetaverse.GroupRoleUpdate.UpdateData">
-            <summary>
-            </summary>
+        <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="F:OpenMetaverse.GroupRoleUpdate.UpdatePowers">
+        <member name="T:OpenMetaverse.Voice.VoiceSession">
             <summary>
+            Represents a single Voice Session to the Vivox service.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupRoleUpdate.UpdateAll">
+        <member name="M:OpenMetaverse.Voice.VoiceSession.Close">
             <summary>
+            Close this session.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupRoleUpdate.Create">
+        <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="F:OpenMetaverse.GroupRoleUpdate.Delete">
+        <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="F:OpenMetaverse.GroupPowers.None">
+        <member name="T:OpenMetaverse.MediaPermission">
             <summary>
+            Permissions for control of object media
             </summary>
         </member>
-        <member name="F:OpenMetaverse.GroupPowers.Invite">
-            <summary>Can send invitations to groups default role</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.Eject">
-            <summary>Can eject members from group</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.ChangeOptions">
-            <summary>Can toggle 'Open Enrollment' and change 'Signup fee'</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.MemberVisible">
-            <summary>Member is visible in the public member list</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.CreateRole">
-            <summary>Can create new roles</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.DeleteRole">
-            <summary>Can delete existing roles</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.RoleProperties">
-            <summary>Can change Role names, titles and descriptions</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.AssignMemberLimited">
-            <summary>Can assign other members to assigners role</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.AssignMember">
-            <summary>Can assign other members to any role</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.RemoveMember">
-            <summary>Can remove members from roles</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.ChangeActions">
-            <summary>Can assign and remove abilities in roles</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.ChangeIdentity">
-            <summary>Can change group Charter, Insignia, 'Publish on the web' and which
-            members are publicly visible in group member listings</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.LandDeed">
-            <summary>Can buy land or deed land to group</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.LandRelease">
-            <summary>Can abandon group owned land to Governor Linden on mainland, or Estate owner for
-            private estates</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.LandSetSale">
-            <summary>Can set land for-sale information on group owned parcels</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.LandDivideJoin">
-            <summary>Can subdivide and join parcels</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.JoinChat">
-            <summary>Can join group chat sessions</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.AllowVoiceChat">
-            <summary>Can use voice chat in Group Chat sessions</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.ModerateChat">
-            <summary>Can moderate group chat sessions</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.FindPlaces">
-            <summary>Can toggle "Show in Find Places" and set search category</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.LandChangeIdentity">
-            <summary>Can change parcel name, description, and 'Publish on web' settings</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.SetLandingPoint">
-            <summary>Can set the landing point and teleport routing on group land</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.ChangeMedia">
-            <summary>Can change music and media settings</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.LandEdit">
-            <summary>Can toggle 'Edit Terrain' option in Land settings</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.LandOptions">
-            <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>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.AllowFly">
-            <summary>Can always fly while over group owned land</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.AllowRez">
-            <summary>Can always rez objects on group owned land</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.AllowLandmark">
-            <summary>Can always create landmarks for group owned parcels</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.AllowSetHome">
-            <summary>Can set home location on any group owned parcel</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.LandManageAllowed">
-            <summary>Can modify public access settings for group owned parcels</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.LandManageBanned">
-            <summary>Can manager parcel ban lists on group owned land</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.LandManagePasses">
-            <summary>Can manage pass list sales information</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.LandEjectAndFreeze">
-            <summary>Can eject and freeze other avatars on group owned land</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.ReturnGroupSet">
-            <summary>Can return objects set to group</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.ReturnNonGroup">
-            <summary>Can return non-group owned/set objects</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.ReturnGroupOwned">
-            <summary>Can return group owned objects</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.LandGardening">
-            <summary>Can landscape using Linden plants</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.DeedObject">
-            <summary>Can deed objects to group</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.ObjectManipulate">
-            <summary>Can move group owned objects</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.ObjectSetForSale">
-            <summary>Can set group owned objects for-sale</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.Accountable">
-            <summary>Pay group liabilities and receive group dividends</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.SendNotices">
-            <summary>Can send group notices</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.ReceiveNotices">
-            <summary>Can receive group notices</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.StartProposal">
-            <summary>Can create group proposals</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupPowers.VoteOnProposal">
-            <summary>Can vote on group proposals</summary>
-        </member>
-        <member name="T:OpenMetaverse.GroupManager">
+        <member name="T:OpenMetaverse.MediaControls">
             <summary>
-            Handles all network traffic related to reading and writing group
-            information
+            Style of cotrols that shold be displayed to the user
             </summary>
         </member>
-        <member name="M:OpenMetaverse.GroupManager.#ctor(OpenMetaverse.GridClient)">
+        <member name="T:OpenMetaverse.MediaEntry">
             <summary>
-            Construct a new instance of the GroupManager class
+            Class representing media data for a single face
             </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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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>
-        </member>
-        <member name="F:OpenMetaverse.GroupManager.GroupMembersRequests">
-            <summary>Currently-active group members requests</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupManager.GroupRolesRequests">
-            <summary>Currently-active group roles requests</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupManager.GroupRolesMembersRequests">
-            <summary>Currently-active group role-member requests</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupManager.TempGroupMembers">
-            <summary>Dictionary keeping group members while request is in progress</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupManager.TempGroupRolesMembers">
-            <summary>Dictionary keeping mebmer/role mapping while request is in progress</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupManager.TempGroupRoles">
-            <summary>Dictionary keeping GroupRole information while request is in progress</summary>
-        </member>
-        <member name="F:OpenMetaverse.GroupManager.GroupName2KeyCache">
-            <summary>Caches group name lookups</summary>
-        </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="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 name="F:OpenMetaverse.MediaEntry.EnableAlterntiveImage">
+            <summary>Is display of the alternative image enabled</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 name="F:OpenMetaverse.MediaEntry.AutoLoop">
+            <summary>Should media auto loop</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 name="F:OpenMetaverse.MediaEntry.AutoPlay">
+            <summary>Shoule media be auto played</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 name="F:OpenMetaverse.MediaEntry.AutoScale">
+            <summary>Auto scale media to prim face</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 name="F:OpenMetaverse.MediaEntry.AutoZoom">
+            <summary>Should viewer automatically zoom in on the face when clicked</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 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="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 name="F:OpenMetaverse.MediaEntry.Controls">
+            <summary>Style of controls viewer should display when
+            viewer media on this face</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 name="F:OpenMetaverse.MediaEntry.HomeURL">
+            <summary>Starting URL for the media</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 name="F:OpenMetaverse.MediaEntry.CurrentURL">
+            <summary>Currently navigated URL</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 name="F:OpenMetaverse.MediaEntry.Height">
+            <summary>Media height in pixes</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 name="F:OpenMetaverse.MediaEntry.Width">
+            <summary>Media width in pixels</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 name="F:OpenMetaverse.MediaEntry.ControlPermissions">
+            <summary>Who can controls the media</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 name="F:OpenMetaverse.MediaEntry.InteractPermissions">
+            <summary>Who can interact with the media</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 name="F:OpenMetaverse.MediaEntry.EnableWhiteList">
+            <summary>Is URL whitelist enabled</summary>
         </member>
-        <member name="M:OpenMetaverse.GroupManager.RequestCurrentGroups">
-            <summary>
-            Request a current list of groups the avatar is a member of.
-            </summary>
-            <remarks>CAPS Event Queue must be running for this to work since the results
-            come across CAPS.</remarks>
+        <member name="F:OpenMetaverse.MediaEntry.WhiteList">
+            <summary>Array of URLs that are whitelisted</summary>
         </member>
-        <member name="M:OpenMetaverse.GroupManager.RequestGroupName(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.MediaEntry.GetOSD">
             <summary>
-            Lookup name of group based on groupID
+            Serialize to OSD
             </summary>
-            <param name="groupID">groupID of group to lookup name for.</param>
+            <returns>OSDMap with the serialized data</returns>
         </member>
-        <member name="M:OpenMetaverse.GroupManager.RequestGroupNames(System.Collections.Generic.List{OpenMetaverse.UUID})">
+        <member name="M:OpenMetaverse.MediaEntry.FromOSD(OpenMetaverse.StructuredData.OSD)">
             <summary>
-            Request lookup of multiple group names
+            Deserialize from OSD data
             </summary>
-            <param name="groupIDs">List of group IDs to request.</param>
-        </member>
-        <member name="M:OpenMetaverse.GroupManager.RequestGroupProfile(OpenMetaverse.UUID)">
-            <summary>Lookup group profile data such as name, enrollment, founder, logo, etc</summary>
-            <remarks>Subscribe to <code>OnGroupProfile</code> event to receive the results.</remarks>
-            <param name="group">group ID (UUID)</param>
-        </member>
-        <member name="M:OpenMetaverse.GroupManager.RequestGroupMembers(OpenMetaverse.UUID)">
-            <summary>Request a list of group members.</summary>
-            <remarks>Subscribe to <code>OnGroupMembers</code> event to receive the results.</remarks>
-            <param name="group">group ID (UUID)</param>
-            <returns>UUID of the request, use to index into cache</returns>
-        </member>
-        <member name="M:OpenMetaverse.GroupManager.RequestGroupRoles(OpenMetaverse.UUID)">
-            <summary>Request group roles</summary>
-            <remarks>Subscribe to <code>OnGroupRoles</code> event to receive the results.</remarks>
-            <param name="group">group ID (UUID)</param>
-            <returns>UUID of the request, use to index into cache</returns>
-        </member>
-        <member name="M:OpenMetaverse.GroupManager.RequestGroupRolesMembers(OpenMetaverse.UUID)">
-            <summary>Request members (members,role) role mapping for a group.</summary>
-            <remarks>Subscribe to <code>OnGroupRolesMembers</code> event to receive the results.</remarks>
-            <param name="group">group ID (UUID)</param>
-            <returns>UUID of the request, use to index into cache</returns>
-        </member>
-        <member name="M:OpenMetaverse.GroupManager.RequestGroupTitles(OpenMetaverse.UUID)">
-            <summary>Request a groups Titles</summary>
-            <remarks>Subscribe to <code>OnGroupTitles</code> event to receive the results.</remarks>
-            <param name="group">group ID (UUID)</param>
-            <returns>UUID of the request, use to index into cache</returns>
-        </member>
-        <member name="M:OpenMetaverse.GroupManager.RequestGroupAccountSummary(OpenMetaverse.UUID,System.Int32,System.Int32)">
-            <summary>Begin to get the group account summary</summary>
-            <remarks>Subscribe to the <code>OnGroupAccountSummary</code> event to receive the results.</remarks>
-            <param name="group">group ID (UUID)</param>
-            <param name="intervalDays">How long of an interval</param>
-            <param name="currentInterval">Which interval (0 for current, 1 for last)</param>
-        </member>
-        <member name="M:OpenMetaverse.GroupManager.Invite(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.UUID},OpenMetaverse.UUID)">
-            <summary>Invites a user to a group</summary>
-            <param name="group">The group to invite to</param>
-            <param name="roles">A list of roles to invite a person to</param>
-            <param name="personkey">Key of person to invite</param>
-        </member>
-        <member name="M:OpenMetaverse.GroupManager.ActivateGroup(OpenMetaverse.UUID)">
-            <summary>Set a group as the current active group</summary>
-            <param name="id">group ID (UUID)</param>
-        </member>
-        <member name="M:OpenMetaverse.GroupManager.ActivateTitle(OpenMetaverse.UUID,OpenMetaverse.UUID)">
-            <summary>Change the role that determines your active title</summary>
-            <param name="group">Group ID to use</param>
-            <param name="role">Role ID to change to</param>
-        </member>
-        <member name="M:OpenMetaverse.GroupManager.SetGroupContribution(OpenMetaverse.UUID,System.Int32)">
-            <summary>Set this avatar's tier contribution</summary>
-            <param name="group">Group ID to change tier in</param>
-            <param name="contribution">amount of tier to donate</param>
+            <param name="osd">Serialized OSD data</param>
+            <returns>Deserialized object</returns>
         </member>
-        <member name="M:OpenMetaverse.GroupManager.SetGroupAcceptNotices(OpenMetaverse.UUID,System.Boolean,System.Boolean)">
+        <member name="T:OpenMetaverse.Primitive">
             <summary>
-            Save wheather agent wants to accept group notices and list this group in their profile
+            Particle system specific enumerators, flags and methods.
             </summary>
-            <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>
-        <member name="M:OpenMetaverse.GroupManager.RequestJoinGroup(OpenMetaverse.UUID)">
-            <summary>Request to join a group</summary>
-            <remarks>Subscribe to <code>OnGroupJoined</code> event for confirmation.</remarks>
-            <param name="id">group ID (UUID) to join.</param>
-        </member>
-        <member name="M:OpenMetaverse.GroupManager.RequestCreateGroup(OpenMetaverse.Group)">
+        <member name="F:OpenMetaverse.Primitive.MediaVersion">
             <summary>
-            Request to create a new group. If the group is successfully
-            created, L$100 will automatically be deducted
+            Current version of the media data for the prim
             </summary>
-            <remarks>Subscribe to <code>OnGroupCreated</code> event to receive confirmation.</remarks>
-            <param name="group">Group struct containing the new group info</param>
-        </member>
-        <member name="M:OpenMetaverse.GroupManager.UpdateGroup(OpenMetaverse.UUID,OpenMetaverse.Group)">
-            <summary>Update a group's profile and other information</summary>
-            <param name="id">Groups ID (UUID) to update.</param>
-            <param name="group">Group struct to update.</param>
-        </member>
-        <member name="M:OpenMetaverse.GroupManager.EjectUser(OpenMetaverse.UUID,OpenMetaverse.UUID)">
-            <summary>Eject a user from a group</summary>
-            <param name="group">Group ID to eject the user from</param>
-            <param name="member">Avatar's key to eject</param>
-        </member>
-        <member name="M:OpenMetaverse.GroupManager.UpdateRole(OpenMetaverse.GroupRole)">
-            <summary>Update role information</summary>
-            <param name="role">Modified role to be updated</param>
-        </member>
-        <member name="M:OpenMetaverse.GroupManager.CreateRole(OpenMetaverse.UUID,OpenMetaverse.GroupRole)">
-            <summary>Create a new group role</summary>
-            <param name="group">Group ID to update</param>
-            <param name="role">Role to create</param>
-        </member>
-        <member name="M:OpenMetaverse.GroupManager.DeleteRole(OpenMetaverse.UUID,OpenMetaverse.UUID)">
-            <summary>Delete a group role</summary>
-            <param name="group">Group ID to update</param>
-            <param name="roleID">Role to delete</param>
-        </member>
-        <member name="M:OpenMetaverse.GroupManager.RemoveFromRole(OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID)">
-            <summary>Remove an avatar from a role</summary>
-            <param name="group">Group ID to update</param>
-            <param name="role">Role ID to be removed from</param>
-            <param name="member">Avatar's Key to remove</param>
-        </member>
-        <member name="M:OpenMetaverse.GroupManager.AddToRole(OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID)">
-            <summary>Assign an avatar to a role</summary>
-            <param name="group">Group ID to update</param>
-            <param name="role">Role ID to assign to</param>
-            <param name="member">Avatar's ID to assign to role</param>
-        </member>
-        <member name="M:OpenMetaverse.GroupManager.RequestGroupNoticesList(OpenMetaverse.UUID)">
-            <summary>Request the group notices list</summary>
-            <param name="group">Group ID to fetch notices for</param>
-        </member>
-        <member name="M:OpenMetaverse.GroupManager.RequestGroupNotice(OpenMetaverse.UUID)">
-            <summary>Request a group notice by key</summary>
-            <param name="noticeID">ID of group notice</param>
-        </member>
-        <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>
-        </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>
-        </member>
-        <member name="M:OpenMetaverse.GroupManager.LeaveGroup(OpenMetaverse.UUID)">
-            <summary>Request to leave a group</summary>
-            <remarks>Subscribe to <code>OnGroupLeft</code> event to receive confirmation</remarks>
-            <param name="groupID">The group to leave</param>
-        </member>
-        <member name="M:OpenMetaverse.GroupManager.AgentDropGroupHandler(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.GroupManager.GroupProfileReplyHandler(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.GroupManager.GroupNoticesListReplyHandler(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.GroupManager.GroupTitlesReplyHandler(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.GroupManager.GroupMembersHandler(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.GroupManager.GroupRoleDataReplyHandler(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.GroupManager.GroupRoleMembersReplyHandler(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.GroupManager.GroupActiveProposalItemHandler(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.GroupManager.GroupVoteHistoryItemHandler(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.GroupManager.GroupAccountSummaryReplyHandler(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.GroupManager.CreateGroupReplyHandler(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.GroupManager.JoinGroupReplyHandler(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.GroupManager.LeaveGroupReplyHandler(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.GroupManager.UUIDGroupNameReplyHandler(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.GroupManager.EjectGroupMemberReplyHandler(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.CurrentGroupsEventArgs">
-            <summary>Contains the current groups your agent is a member of</summary>
-        </member>
-        <member name="M:OpenMetaverse.CurrentGroupsEventArgs.#ctor(System.Collections.Generic.Dictionary{OpenMetaverse.UUID,OpenMetaverse.Group})">
-            <summary>Construct a new instance of the CurrentGroupsEventArgs class</summary>
-            <param name="groups">The current groups your agent is a member of</param>
-        </member>
-        <member name="P:OpenMetaverse.CurrentGroupsEventArgs.Groups">
-            <summary>Get the current groups your agent is a member of</summary>
-        </member>
-        <member name="T:OpenMetaverse.GroupNamesEventArgs">
-            <summary>A Dictionary of group names, where the Key is the groups ID and the value is the groups name</summary>
-        </member>
-        <member name="M:OpenMetaverse.GroupNamesEventArgs.#ctor(System.Collections.Generic.Dictionary{OpenMetaverse.UUID,System.String})">
-            <summary>Construct a new instance of the GroupNamesEventArgs class</summary>
-            <param name="groupNames">The Group names dictionary</param>
-        </member>
-        <member name="P:OpenMetaverse.GroupNamesEventArgs.GroupNames">
-            <summary>Get the Group Names dictionary</summary>
-        </member>
-        <member name="T:OpenMetaverse.GroupMembersReplyEventArgs">
-            <summary>Represents the members of a group</summary>
-        </member>
-        <member name="M:OpenMetaverse.GroupMembersReplyEventArgs.#ctor(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Collections.Generic.Dictionary{OpenMetaverse.UUID,OpenMetaverse.GroupMember})">
+        <member name="F:OpenMetaverse.Primitive.FaceMedia">
             <summary>
-            Construct a new instance of the GroupMembersReplyEventArgs class
+            Array of media entries indexed by face number
             </summary>
-            <param name="requestID">The ID of the request</param>
-            <param name="groupID">The ID of the group</param>
-            <param name="members">The membership list of the group</param>
-        </member>
-        <member name="P:OpenMetaverse.GroupMembersReplyEventArgs.RequestID">
-            <summary>Get the ID as returned by the request to correlate
-            this result set and the request</summary>
-        </member>
-        <member name="P:OpenMetaverse.GroupMembersReplyEventArgs.GroupID">
-            <summary>Get the ID of the group</summary>
-        </member>
-        <member name="P:OpenMetaverse.GroupMembersReplyEventArgs.Members">
-            <summary>Get the dictionary of members</summary>
-        </member>
-        <member name="T:OpenMetaverse.GroupRolesDataReplyEventArgs">
-            <summary>Represents the roles associated with a group</summary>
-        </member>
-        <member name="M:OpenMetaverse.GroupRolesDataReplyEventArgs.#ctor(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Collections.Generic.Dictionary{OpenMetaverse.UUID,OpenMetaverse.GroupRole})">
-            <summary>Construct a new instance of the GroupRolesDataReplyEventArgs class</summary>
-            <param name="requestID">The ID as returned by the request to correlate
-            this result set and the request</param>
-            <param name="groupID">The ID of the group</param>
-            <param name="roles">The dictionary containing the roles</param>
-        </member>
-        <member name="P:OpenMetaverse.GroupRolesDataReplyEventArgs.RequestID">
-            <summary>Get the ID as returned by the request to correlate
-            this result set and the request</summary>
-        </member>
-        <member name="P:OpenMetaverse.GroupRolesDataReplyEventArgs.GroupID">
-            <summary>Get the ID of the group</summary>
-        </member>
-        <member name="P:OpenMetaverse.GroupRolesDataReplyEventArgs.Roles">
-            <summary>Get the dictionary containing the roles</summary>
-        </member>
-        <member name="T:OpenMetaverse.GroupRolesMembersReplyEventArgs">
-            <summary>Represents the Role to Member mappings for a group</summary>
-        </member>
-        <member name="M:OpenMetaverse.GroupRolesMembersReplyEventArgs.#ctor(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Collections.Generic.List{System.Collections.Generic.KeyValuePair{OpenMetaverse.UUID,OpenMetaverse.UUID}})">
-            <summary>Construct a new instance of the GroupRolesMembersReplyEventArgs class</summary>
-            <param name="requestID">The ID as returned by the request to correlate
-            this result set and the request</param>
-            <param name="groupID">The ID of the group</param>
-            <param name="rolesMembers">The member to roles map</param>
-        </member>
-        <member name="P:OpenMetaverse.GroupRolesMembersReplyEventArgs.RequestID">
-            <summary>Get the ID as returned by the request to correlate
-            this result set and the request</summary>
-        </member>
-        <member name="P:OpenMetaverse.GroupRolesMembersReplyEventArgs.GroupID">
-            <summary>Get the ID of the group</summary>
-        </member>
-        <member name="P:OpenMetaverse.GroupRolesMembersReplyEventArgs.RolesMembers">
-            <summary>Get the member to roles map</summary>
-        </member>
-        <member name="T:OpenMetaverse.GroupTitlesReplyEventArgs">
-            <summary>Represents the titles for a group</summary>
-        </member>
-        <member name="M:OpenMetaverse.GroupTitlesReplyEventArgs.#ctor(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Collections.Generic.Dictionary{OpenMetaverse.UUID,OpenMetaverse.GroupTitle})">
-            <summary>Construct a new instance of the GroupTitlesReplyEventArgs class</summary>
-            <param name="requestID">The ID as returned by the request to correlate
-            this result set and the request</param>
-            <param name="groupID">The ID of the group</param>
-            <param name="titles">The titles</param>
-        </member>
-        <member name="P:OpenMetaverse.GroupTitlesReplyEventArgs.RequestID">
-            <summary>Get the ID as returned by the request to correlate
-            this result set and the request</summary>
-        </member>
-        <member name="P:OpenMetaverse.GroupTitlesReplyEventArgs.GroupID">
-            <summary>Get the ID of the group</summary>
-        </member>
-        <member name="P:OpenMetaverse.GroupTitlesReplyEventArgs.Titles">
-            <summary>Get the titles</summary>
-        </member>
-        <member name="T:OpenMetaverse.GroupAccountSummaryReplyEventArgs">
-            <summary>Represents the summary data for a group</summary>
-        </member>
-        <member name="M:OpenMetaverse.GroupAccountSummaryReplyEventArgs.#ctor(OpenMetaverse.UUID,OpenMetaverse.GroupAccountSummary)">
-            <summary>Construct a new instance of the GroupAccountSummaryReplyEventArgs class</summary>
-            <param name="groupID">The ID of the group</param>
-            <param name="summary">The summary data</param>
-        </member>
-        <member name="P:OpenMetaverse.GroupAccountSummaryReplyEventArgs.GroupID">
-            <summary>Get the ID of the group</summary>
-        </member>
-        <member name="P:OpenMetaverse.GroupAccountSummaryReplyEventArgs.Summary">
-            <summary>Get the summary data</summary>
-        </member>
-        <member name="T:OpenMetaverse.GroupCreatedReplyEventArgs">
-            <summary>A response to a group create request</summary>
-        </member>
-        <member name="M:OpenMetaverse.GroupCreatedReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Boolean,System.String)">
-            <summary>Construct a new instance of the GroupCreatedReplyEventArgs class</summary>
-            <param name="groupID">The ID of the group</param>
-            <param name="success">the success or faulure of the request</param>
-            <param name="messsage">A string containing additional information</param>
-        </member>
-        <member name="P:OpenMetaverse.GroupCreatedReplyEventArgs.GroupID">
-            <summary>Get the ID of the group</summary>
-        </member>
-        <member name="P:OpenMetaverse.GroupCreatedReplyEventArgs.Success">
-            <summary>true of the  group was created successfully</summary>
-        </member>
-        <member name="P:OpenMetaverse.GroupCreatedReplyEventArgs.Message">
-            <summary>A string containing the message</summary>
-        </member>
-        <member name="T:OpenMetaverse.GroupOperationEventArgs">
-            <summary>Represents a response to a request</summary>
-        </member>
-        <member name="M:OpenMetaverse.GroupOperationEventArgs.#ctor(OpenMetaverse.UUID,System.Boolean)">
-            <summary>Construct a new instance of the GroupOperationEventArgs class</summary>
-            <param name="groupID">The ID of the group</param>
-            <param name="success">true of the request was successful</param>
         </member>
-        <member name="P:OpenMetaverse.GroupOperationEventArgs.GroupID">
-            <summary>Get the ID of the group</summary>
-        </member>
-        <member name="P:OpenMetaverse.GroupOperationEventArgs.Success">
-            <summary>true of the request was successful</summary>
-        </member>
-        <member name="T:OpenMetaverse.GroupDroppedEventArgs">
-            <summary>Represents your agent leaving a group</summary>
-        </member>
-        <member name="M:OpenMetaverse.GroupDroppedEventArgs.#ctor(OpenMetaverse.UUID)">
-            <summary>Construct a new instance of the GroupDroppedEventArgs class</summary>
-            <param name="groupID">The ID of the group</param>
-        </member>
-        <member name="P:OpenMetaverse.GroupDroppedEventArgs.GroupID">
-            <summary>Get the ID of the group</summary>
-        </member>
-        <member name="T:OpenMetaverse.GroupNoticesListReplyEventArgs">
-            <summary>Represents a list of active group notices</summary>
+        <member name="F:OpenMetaverse.Primitive.Textures">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.GroupNoticesListReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.GroupNoticesListEntry})">
-            <summary>Construct a new instance of the GroupNoticesListReplyEventArgs class</summary>
-            <param name="groupID">The ID of the group</param>
-            <param name="notices">The list containing active notices</param>
+        <member name="F:OpenMetaverse.Primitive.TextureAnim">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.GroupNoticesListReplyEventArgs.GroupID">
-            <summary>Get the ID of the group</summary>
+        <member name="F:OpenMetaverse.Primitive.ID">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.GroupNoticesListReplyEventArgs.Notices">
-            <summary>Get the notices list</summary>
+        <member name="F:OpenMetaverse.Primitive.GroupID">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.GroupProfileEventArgs">
-            <summary>Represents the profile of a group</summary>
+        <member name="F:OpenMetaverse.Primitive.LocalID">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.GroupProfileEventArgs.#ctor(OpenMetaverse.Group)">
-            <summary>Construct a new instance of the GroupProfileEventArgs class</summary>
-            <param name="group">The group profile</param>
+        <member name="F:OpenMetaverse.Primitive.ParentID">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.GroupProfileEventArgs.Group">
-            <summary>Get the group profile</summary>
+        <member name="F:OpenMetaverse.Primitive.RegionHandle">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.GroupInvitationEventArgs">
-            <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
-            to join a group.</remarks>
+        <member name="F:OpenMetaverse.Primitive.Flags">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.GroupInvitationEventArgs.AgentID">
-            <summary>The ID of the Avatar sending the group invitation</summary>
+        <member name="F:OpenMetaverse.Primitive.TreeSpecies">
+            <summary>Foliage type for this primitive. Only applicable if this
+            primitive is foliage</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupInvitationEventArgs.FromName">
-            <summary>The name of the Avatar sending the group invitation</summary>
+        <member name="F:OpenMetaverse.Primitive.ScratchPad">
+            <summary>Unknown</summary>
         </member>
-        <member name="P:OpenMetaverse.GroupInvitationEventArgs.Message">
-            <summary>A message containing the request information which includes
-            the name of the group, the groups charter and the fee to join details</summary>
+        <member name="F:OpenMetaverse.Primitive.Position">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.GroupInvitationEventArgs.Simulator">
-            <summary>The Simulator</summary>
+        <member name="F:OpenMetaverse.Primitive.Scale">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.GroupInvitationEventArgs.Accept">
-            <summary>Set to true to accept invitation, false to decline</summary>
+        <member name="F:OpenMetaverse.Primitive.Rotation">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Helpers">
-            <summary>
-            Static helper functions and global variables
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.Velocity">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Helpers.LogLevel">
-            <summary>
-            Passed to Logger.Log() to identify the severity of a log entry
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.AngularVelocity">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Helpers.LogLevel.None">
-            <summary>No logging information will be output</summary>
+        <member name="F:OpenMetaverse.Primitive.Acceleration">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Helpers.LogLevel.Info">
-            <summary>Non-noisy useful information, may be helpful in
-            debugging a problem</summary>
+        <member name="F:OpenMetaverse.Primitive.CollisionPlane">
+            <summary></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 name="F:OpenMetaverse.Primitive.Flexible">
+            <summary></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 name="F:OpenMetaverse.Primitive.Light">
+            <summary></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.
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.LightMap">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Helpers.MSG_APPENDED_ACKS">
-            <summary>This header flag signals that ACKs are appended to the packet</summary>
+        <member name="F:OpenMetaverse.Primitive.Sculpt">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Helpers.MSG_RESENT">
-            <summary>This header flag signals that this packet has been sent before</summary>
+        <member name="F:OpenMetaverse.Primitive.ClickAction">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Helpers.MSG_RELIABLE">
-            <summary>This header flags signals that an ACK is expected for this packet</summary>
+        <member name="F:OpenMetaverse.Primitive.Sound">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Helpers.MSG_ZEROCODED">
-            <summary>This header flag signals that the message is compressed using zerocoding</summary>
+        <member name="F:OpenMetaverse.Primitive.OwnerID">
+            <summary>Identifies the owner if audio or a particle system is
+            active</summary>
         </member>
-        <member name="M:OpenMetaverse.Helpers.TEOffsetShort(System.Single)">
-            <summary>
-            </summary>
-            <param name="offset">
-            </param>
-            <returns>
-            </returns>
+        <member name="F:OpenMetaverse.Primitive.SoundFlags">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Helpers.TEOffsetFloat(System.Byte[],System.Int32)">
-            <summary>
-            </summary>
-            <param name="bytes">
-            </param>
-            <param name="pos">
-            </param>
-            <returns>
-            </returns>
+        <member name="F:OpenMetaverse.Primitive.SoundGain">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Helpers.TERotationShort(System.Single)">
-            <summary>
-            </summary>
-            <param name="rotation">
-            </param>
-            <returns>
-            </returns>
+        <member name="F:OpenMetaverse.Primitive.SoundRadius">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Helpers.TERotationFloat(System.Byte[],System.Int32)">
-            <summary>
-            </summary>
-            <param name="bytes">
-            </param>
-            <param name="pos">
-            </param>
-            <returns>
-            </returns>
+        <member name="F:OpenMetaverse.Primitive.Text">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Helpers.GlobalPosToRegionHandle(System.Single,System.Single,System.Single@,System.Single@)">
-            <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
-            </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 name="F:OpenMetaverse.Primitive.TextColor">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Helpers.FloatToTerseString(System.Single)">
-            <summary>
-            Converts a floating point number to a terse string format used for
-            transmitting numbers in wearable asset files
-            </summary>
-            <param name="val">Floating point number to convert to a string</param>
-            <returns>A terse string representation of the input number</returns>
+        <member name="F:OpenMetaverse.Primitive.MediaURL">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Helpers.FieldToString(System.Text.StringBuilder,System.Byte[],System.String)">
-            <summary>
-            Convert a variable length field (byte array) to a string, with a
-            field name prepended to each line of the output
-            </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>
+        <member name="F:OpenMetaverse.Primitive.Joint">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Helpers.ZeroDecode(System.Byte[],System.Int32,System.Byte[])">
-            <summary>
-            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 name="F:OpenMetaverse.Primitive.JointPivot">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Helpers.ZeroEncode(System.Byte[],System.Int32,System.Byte[])">
-            <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.
-            </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 name="F:OpenMetaverse.Primitive.JointAxisOrAnchor">
+            <summary></summary>
         </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)">
-            <summary>
-            Calculates the CRC (cyclic redundancy check) needed to upload inventory.
-            </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>
+        <member name="F:OpenMetaverse.Primitive.NameValues">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Helpers.GetResourceStream(System.String)">
-            <summary>
-            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 name="F:OpenMetaverse.Primitive.PrimData">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Helpers.GetResourceStream(System.String,System.String)">
-            <summary>
-            Attempts to load a file either embedded in the assembly or found in
-            a given search path
-            </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>
+        <member name="F:OpenMetaverse.Primitive.Properties">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Helpers.PrimListToOSD(System.Collections.Generic.List{OpenMetaverse.Primitive})">
-            <summary>
-            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 name="F:OpenMetaverse.Primitive.PhysicsProps">
+            <summary>Objects physics engine propertis</summary>
         </member>
-        <member name="M:OpenMetaverse.Helpers.OSDToPrimList(OpenMetaverse.StructuredData.OSD)">
-            <summary>
-            Deserializes OSD in to a list of primitives
-            </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 name="F:OpenMetaverse.Primitive.Tag">
+            <summary>Extra data about primitive</summary>
         </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>
+        <member name="F:OpenMetaverse.Primitive.IsAttachment">
+            <summary>Indicates if prim is attached to an avatar</summary>
         </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
-            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 name="F:OpenMetaverse.Primitive.ActiveClients">
+            <summary>Number of clients referencing this prim</summary>
         </member>
-        <member name="M:OpenMetaverse.InternalDictionary`2.#ctor">
+        <member name="M:OpenMetaverse.Primitive.#ctor">
             <summary>
-            Initializes a new instance of the <seealso cref="T:InternalDictionary" /> Class
-            with the specified key/value, has the default initial capacity.
+            Default constructor
             </summary>
-            <example>
-                <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>
-            </example>
-        </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" />
-            to copy initial values from</param>
-            <example>
-                <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>
-            </example>
         </member>
-        <member name="M:OpenMetaverse.InternalDictionary`2.#ctor(System.Int32)">
+        <member name="M:OpenMetaverse.Primitive.PackPathTwist(System.Single)">
             <summary>
-            Initializes a new instance of the <seealso cref="T:OpenMetaverse.InternalDictionary" /> Class
-            with the specified key/value, With its initial capacity specified.
+            Packs PathTwist, PathTwistBegin, PathRadiusOffset, and PathSkew
+            parameters in to signed eight bit values
             </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,
-            // 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>
+            <param name="pathTwist">Floating point parameter to pack</param>
+            <returns>Signed eight bit value containing the packed parameter</returns>
         </member>
-        <member name="P:OpenMetaverse.InternalDictionary`2.Item(`0)">
+        <member name="M:OpenMetaverse.Primitive.UnpackPathTwist(System.SByte)">
             <summary>
-            Indexer for the dictionary
+            Unpacks PathTwist, PathTwistBegin, PathRadiusOffset, and PathSkew
+            parameters from signed eight bit integers to floating point values
             </summary>
-            <param name="key">The key</param>
-            <returns>The value</returns>
+            <param name="pathTwist">Signed eight bit value to unpack</param>
+            <returns>Unpacked floating point 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 name="F:OpenMetaverse.Primitive.ParticleSys">
+            <summary></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
-            </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 InternalDictionary:
-            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 name="P:OpenMetaverse.Primitive.Type">
+            <summary>Uses basic heuristics to estimate the primitive shape</summary>
         </member>
-        <member name="M:OpenMetaverse.InternalDictionary`2.Find(System.Predicate{`1})">
+        <member name="T:OpenMetaverse.Primitive.TextureAnimMode">
             <summary>
-            Finds the specified match.
+            Texture animation mode
             </summary>
-            <param name="match">The match.</param>
-            <returns>Matched value</returns>
-            <example>
-                <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; });
-            </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>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.ANIM_OFF">
+            <summary>Disable texture animation</summary>
         </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>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.ANIM_ON">
+            <summary>Enable texture animation</summary>
         </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);
-            }
-            });
-            </code>
-            </example>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.LOOP">
+            <summary>Loop when animating textures</summary>
         </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>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.REVERSE">
+            <summary>Animate in reverse direction</summary>
         </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>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.PING_PONG">
+            <summary>Animate forward then reverse</summary>
         </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>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.SMOOTH">
+            <summary>Slide texture smoothly instead of frame-stepping</summary>
         </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>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.ROTATE">
+            <summary>Rotate texture instead of using frames</summary>
         </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>
-            <param name="key">The key</param>
-            <param name="value">The value</param>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.SCALE">
+            <summary>Scale texture instead of using frames</summary>
         </member>
-        <member name="M:OpenMetaverse.InternalDictionary`2.Remove(`0)">
+        <member name="T:OpenMetaverse.Primitive.TextureEntryFace">
             <summary>
-            Removes the specified key, dictionary locking is not performed
+            A single textured face. Don't instantiate this class yourself, use the
+            methods in TextureEntry
             </summary>
-            <param name="key">The key.</param>
-            <returns>
-                <see langword="true" /> if successful, <see langword="false" /> otherwise</returns>
         </member>
-        <member name="T:OpenMetaverse.InventoryException">
+        <member name="M:OpenMetaverse.Primitive.TextureEntryFace.#ctor(OpenMetaverse.Primitive.TextureEntryFace)">
             <summary>
-            Exception class to identify inventory exceptions
+            Contains the definition for individual faces
             </summary>
+            <param name="defaultTexture"></param>
         </member>
-        <member name="T:OpenMetaverse.Inventory">
+        <member name="M:OpenMetaverse.Primitive.TextureEntryFace.ToString">
             <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.
+            
             </summary>
+            <returns></returns>
         </member>
-        <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 name="P:OpenMetaverse.Primitive.TextureEntryFace.material">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectAddedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.media">
+            <summary></summary>
         </member>
-        <member name="E:OpenMetaverse.Inventory.InventoryObjectUpdated">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.RGBA">
+            <summary></summary>
         </member>
-        <member name="E:OpenMetaverse.Inventory.InventoryObjectRemoved">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.RepeatU">
+            <summary></summary>
         </member>
-        <member name="E:OpenMetaverse.Inventory.InventoryObjectAdded">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.RepeatV">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.Inventory.Item(OpenMetaverse.UUID)">
-            <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>
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.OffsetU">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.Inventory.RootFolder">
-            <summary>
-            The root folder of this avatars inventory
-            </summary>
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.OffsetV">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.Inventory.LibraryFolder">
-            <summary>
-            The default shared library folder
-            </summary>
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.Rotation">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.Inventory.RootNode">
-            <summary>
-            The root node of the avatars inventory
-            </summary>
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.Glow">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.Inventory.LibraryRootNode">
-            <summary>
-            The root node of the default shared library
-            </summary>
+        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.Bump">
+            <summary></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 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.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 name="P:OpenMetaverse.Primitive.TextureEntryFace.TextureID">
+            <summary></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 name="P:OpenMetaverse.Primitive.TextureEntryFace.MaterialID">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Inventory.GetContents(OpenMetaverse.UUID)">
+        <member name="T:OpenMetaverse.Primitive.TextureEntry">
             <summary>
-            Returns the contents of the specified folder
+            Represents all of the texturable faces for an object
             </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>
+            <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.Inventory.UpdateNodeFor(OpenMetaverse.InventoryBase)">
-            <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
-            </summary>
-            <param name="item">The InventoryObject to store</param>
+        <member name="F:OpenMetaverse.Primitive.TextureEntry.DefaultTexture">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Inventory.RemoveNodeFor(OpenMetaverse.InventoryBase)">
-            <summary>
-            Removes the InventoryObject and all related node data from Inventory.
-            </summary>
-            <param name="item">The InventoryObject to remove.</param>
+        <member name="F:OpenMetaverse.Primitive.TextureEntry.FaceTextures">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Inventory.Contains(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Primitive.TextureEntry.#ctor(OpenMetaverse.UUID)">
             <summary>
-            Used to find out if Inventory contains the InventoryObject
-            specified by <code>uuid</code>.
+            Constructor that takes a default texture UUID
             </summary>
-            <param name="uuid">The UUID to check.</param>
-            <returns>true if inventory contains uuid, false otherwise</returns>
+            <param name="defaultTextureID">Texture UUID to use as the default texture</param>
         </member>
-        <member name="M:OpenMetaverse.Inventory.SaveToDisk(System.String)">
+        <member name="M:OpenMetaverse.Primitive.TextureEntry.#ctor(OpenMetaverse.Primitive.TextureEntryFace)">
             <summary>
-            Saves the current inventory structure to a cache file
+            Constructor that takes a <code>TextureEntryFace</code> for the
+            default face
             </summary>
-            <param name="filename">Name of the cache file to save to</param>
+            <param name="defaultFace">Face to use as the default face</param>
         </member>
-        <member name="M:OpenMetaverse.Inventory.RestoreFromDisk(System.String)">
+        <member name="M:OpenMetaverse.Primitive.TextureEntry.#ctor(System.Byte[],System.Int32,System.Int32)">
             <summary>
-            Loads in inventory cache file into the inventory structure. Note only valid to call after login has been successful.
+            Constructor that creates the TextureEntry class from a byte array
             </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="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>
+            <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="T:OpenMetaverse.DeRezDestination">
+        <member name="M:OpenMetaverse.Primitive.TextureEntry.CreateFace(System.UInt32)">
             <summary>
-            Possible destinations for DeRezObject request
+            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="F:OpenMetaverse.DeRezDestination.AgentInventorySave">
+        <member name="M:OpenMetaverse.Primitive.TextureEntry.GetFace(System.UInt32)">
             <summary>
+            
             </summary>
+            <param name="index"></param>
+            <returns></returns>
         </member>
-        <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">
+        <member name="M:OpenMetaverse.Primitive.TextureEntry.GetOSD">
             <summary>
+            
             </summary>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.DeRezDestination.AgentInventoryTake">
-            <summary>Take Object</summary>
-        </member>
-        <member name="F:OpenMetaverse.DeRezDestination.ForceToGodInventory">
+        <member name="M:OpenMetaverse.Primitive.TextureEntry.GetBytes">
             <summary>
+            
             </summary>
+            <returns></returns>
         </member>
-        <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">
+        <member name="M:OpenMetaverse.Primitive.TextureEntry.ToString">
             <summary>
+            
             </summary>
+            <returns></returns>
         </member>
-        <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">
+        <member name="T:OpenMetaverse.Primitive.TextureAnimation">
             <summary>
-            Upper half of the Flags field for inventory items
+            Controls the texture animation of a particular prim
             </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>
-        <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 name="F:OpenMetaverse.Primitive.TextureAnimation.Flags">
+            <summary></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.Primitive.TextureAnimation.Face">
+            <summary></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="F:OpenMetaverse.Primitive.TextureAnimation.SizeX">
+            <summary></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="F:OpenMetaverse.Primitive.TextureAnimation.SizeY">
+            <summary></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.Primitive.TextureAnimation.Start">
+            <summary></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.Primitive.TextureAnimation.Length">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryBase">
-            <summary>
-            Base Class for Inventory Items
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Rate">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryBase.#ctor(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Primitive.TextureAnimation.#ctor(System.Byte[],System.Int32)">
             <summary>
-            Constructor, takes an itemID as a parameter
+            
             </summary>
-            <param name="itemID">The <seealso cref="T:OpenMetaverse.UUID" /> of the item</param>
+            <param name="data"></param>
+            <param name="pos"></param>
         </member>
-        <member name="M:OpenMetaverse.InventoryBase.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="M:OpenMetaverse.Primitive.TextureAnimation.GetBytes">
             <summary>
+            
             </summary>
-            <returns>
-            </returns>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.InventoryBase.UUID">
-            <summary>
-                <seealso cref="T:OpenMetaverse.UUID" /> of item/folder</summary>
-        </member>
-        <member name="F:OpenMetaverse.InventoryBase.ParentUUID">
-            <summary>
-                <seealso cref="T:OpenMetaverse.UUID" /> of parent folder</summary>
-        </member>
-        <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)">
+        <member name="T:OpenMetaverse.Primitive.ConstructionData">
             <summary>
+            Parameters used to construct a visual representation of a primitive
             </summary>
-            <returns>
-            </returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryBase.GetHashCode">
-            <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
-            </summary>
-            <returns>A Hashcode of all the combined InventoryBase fields</returns>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.profileCurve">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryBase.Equals(System.Object)">
-            <summary>
-            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 name="F:OpenMetaverse.Primitive.ConstructionData.PathCurve">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryBase.Equals(OpenMetaverse.InventoryBase)">
-            <summary>
-            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 name="F:OpenMetaverse.Primitive.ConstructionData.PathEnd">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryItem">
-            <summary>
-            An Item in Inventory
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathRadiusOffset">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryItem.#ctor(OpenMetaverse.UUID)">
-            <summary>
-            Construct a new InventoryItem object
-            </summary>
-            <param name="itemID">The <seealso cref="T:OpenMetaverse.UUID" /> of the item</param>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathSkew">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryItem.#ctor(OpenMetaverse.InventoryType,OpenMetaverse.UUID)">
-            <summary>
-            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 name="F:OpenMetaverse.Primitive.ConstructionData.PathScaleX">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryItem.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
-            <summary>
-            </summary>
-            <returns>
-            </returns>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathScaleY">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.AssetUUID">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID" /> of this item</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathShearX">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.Permissions">
-            <summary>The combined <seealso cref="T:OpenMetaverse.Permissions" /> of this item</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathShearY">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.AssetType">
-            <summary>The type of item from <seealso cref="T:OpenMetaverse.AssetType" /></summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathTaperX">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.InventoryType">
-            <summary>The type of item from the <seealso cref="T:OpenMetaverse.InventoryType" /> enum</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathTaperY">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.CreatorID">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID" /> of the creator of this item</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathBegin">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.Description">
-            <summary>A Description of this item</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathTwist">
+            <summary></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 name="F:OpenMetaverse.Primitive.ConstructionData.PathTwistBegin">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.GroupOwned">
-            <summary>If true, item is owned by a group</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathRevolutions">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.SalePrice">
-            <summary>The price this item can be purchased for</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.ProfileBegin">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.SaleType">
-            <summary>The type of sale from the <seealso cref="T:OpenMetaverse.SaleType" /> enum</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.ProfileEnd">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.Flags">
-            <summary>Combined flags from <seealso cref="T:OpenMetaverse.InventoryItemFlags" /></summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.ProfileHollow">
+            <summary></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 name="F:OpenMetaverse.Primitive.ConstructionData.Material">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryItem.TransactionID">
-            <summary>Used to update the AssetID in requests sent to the server</summary>
+        <member name="F:OpenMetaverse.Primitive.ConstructionData.State">
+            <summary></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="F:OpenMetaverse.Primitive.ConstructionData.PCode">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryItem.IsLink">
+        <member name="M:OpenMetaverse.Primitive.ConstructionData.GetHashCode">
             <summary>
-            Indicates inventory item is a link
+            Calculdates hash code for prim construction data
             </summary>
-            <returns>True if inventory item is a link to another inventory item</returns>
+            <returns>The has</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryItem.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
-            <summary>
-            </summary>
-            <returns>
-            </returns>
+        <member name="P:OpenMetaverse.Primitive.ConstructionData.AttachmentPoint">
+            <summary>Attachment point to an avatar</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryItem.GetHashCode">
-            <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
-            </summary>
-            <returns>A Hashcode of all the combined InventoryItem fields</returns>
+        <member name="P:OpenMetaverse.Primitive.ConstructionData.ProfileCurve">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryItem.Equals(System.Object)">
-            <summary>
-            Compares an object
-            </summary>
-            <param name="o">The object to compare</param>
-            <returns>true if comparison object matches</returns>
+        <member name="P:OpenMetaverse.Primitive.ConstructionData.ProfileHole">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryItem.Equals(OpenMetaverse.InventoryBase)">
-            <summary>
-            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 name="P:OpenMetaverse.Primitive.ConstructionData.PathBeginScale">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryItem.Equals(OpenMetaverse.InventoryItem)">
-            <summary>
-            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 name="P:OpenMetaverse.Primitive.ConstructionData.PathEndScale">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryTexture">
+        <member name="T:OpenMetaverse.Primitive.FlexibleData">
             <summary>
-            InventoryTexture Class representing a graphical image
+            Information on the flexible properties of a primitive
             </summary>
-            <seealso cref="!:ManagedImage" />
         </member>
-        <member name="M:OpenMetaverse.InventoryTexture.#ctor(OpenMetaverse.UUID)">
-            <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>
+        <member name="F:OpenMetaverse.Primitive.FlexibleData.Softness">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryTexture.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
-            <summary>
-            Construct an InventoryTexture object from a serialization stream
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.FlexibleData.Gravity">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.InventorySound">
-            <summary>
-            InventorySound Class representing a playable sound
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.FlexibleData.Drag">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventorySound.#ctor(OpenMetaverse.UUID)">
-            <summary>
-            Construct an InventorySound object
-            </summary>
-            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID" /> which becomes the
-            <seealso cref="T:OpenMetaverse.InventoryItem" /> objects AssetUUID</param>
+        <member name="F:OpenMetaverse.Primitive.FlexibleData.Wind">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventorySound.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
-            <summary>
-            Construct an InventorySound object from a serialization stream
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.FlexibleData.Tension">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryCallingCard">
-            <summary>
-            InventoryCallingCard Class, contains information on another avatar
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.FlexibleData.Force">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryCallingCard.#ctor(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Primitive.FlexibleData.#ctor">
             <summary>
-            Construct an InventoryCallingCard object
+            Default constructor
             </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.InventoryCallingCard.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="M:OpenMetaverse.Primitive.FlexibleData.#ctor(System.Byte[],System.Int32)">
             <summary>
-            Construct an InventoryCallingCard object from a serialization stream
+            
             </summary>
+            <param name="data"></param>
+            <param name="pos"></param>
         </member>
-        <member name="T:OpenMetaverse.InventoryLandmark">
+        <member name="M:OpenMetaverse.Primitive.FlexibleData.GetBytes">
             <summary>
-            InventoryLandmark Class, contains details on a specific location
+            
             </summary>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryLandmark.#ctor(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Primitive.FlexibleData.GetOSD">
             <summary>
-            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>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryLandmark.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="T:OpenMetaverse.Primitive.LightData">
             <summary>
-            Construct an InventoryLandmark object from a serialization stream
+            Information on the light properties of a primitive
             </summary>
         </member>
-        <member name="P:OpenMetaverse.InventoryLandmark.LandmarkVisited">
-            <summary>
-            Landmarks use the InventoryItemFlags struct and will have a flag of 1 set if they have been visited
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.LightData.Color">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryObject">
-            <summary>
-            InventoryObject Class contains details on a primitive or coalesced set of primitives
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.LightData.Intensity">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryObject.#ctor(OpenMetaverse.UUID)">
-            <summary>
-            Construct an InventoryObject object
-            </summary>
-            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID" /> which becomes the
-            <seealso cref="T:OpenMetaverse.InventoryItem" /> objects AssetUUID</param>
+        <member name="F:OpenMetaverse.Primitive.LightData.Radius">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryObject.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
-            <summary>
-            Construct an InventoryObject object from a serialization stream
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.LightData.Cutoff">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.InventoryObject.ItemFlags">
-            <summary>
-            Gets or sets the upper byte of the Flags value
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.LightData.Falloff">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.InventoryObject.AttachPoint">
+        <member name="M:OpenMetaverse.Primitive.LightData.#ctor">
             <summary>
-            Gets or sets the object attachment point, the lower byte of the Flags value
+            Default constructor
             </summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryNotecard">
+        <member name="M:OpenMetaverse.Primitive.LightData.#ctor(System.Byte[],System.Int32)">
             <summary>
-            InventoryNotecard Class, contains details on an encoded text document
+            
             </summary>
+            <param name="data"></param>
+            <param name="pos"></param>
         </member>
-        <member name="M:OpenMetaverse.InventoryNotecard.#ctor(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Primitive.LightData.GetBytes">
             <summary>
-            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>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryNotecard.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="M:OpenMetaverse.Primitive.LightData.ToString">
             <summary>
-            Construct an InventoryNotecard object from a serialization stream
+            
             </summary>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.InventoryCategory">
+        <member name="T:OpenMetaverse.Primitive.LightImage">
             <summary>
-            InventoryCategory Class
+            Information on the light properties of a primitive as texture map
             </summary>
-            <remarks>TODO: Is this even used for anything?</remarks>
         </member>
-        <member name="M:OpenMetaverse.InventoryCategory.#ctor(OpenMetaverse.UUID)">
-            <summary>
-            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 name="F:OpenMetaverse.Primitive.LightImage.LightTexture">
+            <summary></summary>
         </member>
-        <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 name="F:OpenMetaverse.Primitive.LightImage.Params">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryLSL">
+        <member name="M:OpenMetaverse.Primitive.LightImage.#ctor">
             <summary>
-            InventoryLSL Class, represents a Linden Scripting Language object
+            Default constructor
             </summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryLSL.#ctor(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Primitive.LightImage.#ctor(System.Byte[],System.Int32)">
             <summary>
-            Construct an InventoryLSL object
+            
             </summary>
-            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID" /> which becomes the
-            <seealso cref="T:OpenMetaverse.InventoryItem" /> objects AssetUUID</param>
+            <param name="data"></param>
+            <param name="pos"></param>
         </member>
-        <member name="M:OpenMetaverse.InventoryLSL.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="M:OpenMetaverse.Primitive.LightImage.GetBytes">
             <summary>
-            Construct an InventoryLSL object from a serialization stream
+            
             </summary>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.InventorySnapshot">
+        <member name="M:OpenMetaverse.Primitive.LightImage.ToString">
             <summary>
-            InventorySnapshot Class, an image taken with the viewer
+            
             </summary>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.InventorySnapshot.#ctor(OpenMetaverse.UUID)">
+        <member name="T:OpenMetaverse.Primitive.SculptData">
             <summary>
-            Construct an InventorySnapshot object
+            Information on the sculpt properties of a sculpted primitive
             </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.InventorySnapshot.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="M:OpenMetaverse.Primitive.SculptData.#ctor">
             <summary>
-            Construct an InventorySnapshot object from a serialization stream
+            Default constructor
             </summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryAttachment">
+        <member name="M:OpenMetaverse.Primitive.SculptData.#ctor(System.Byte[],System.Int32)">
             <summary>
-            InventoryAttachment Class, contains details on an attachable object
+            
             </summary>
+            <param name="data"></param>
+            <param name="pos"></param>
         </member>
-        <member name="M:OpenMetaverse.InventoryAttachment.#ctor(OpenMetaverse.UUID)">
+        <member name="P:OpenMetaverse.Primitive.SculptData.Invert">
             <summary>
-            Construct an InventoryAttachment object
+            Render inside out (inverts the normals).
             </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="P:OpenMetaverse.Primitive.SculptData.Mirror">
             <summary>
-            Construct an InventoryAttachment object from a serialization stream
+            Render an X axis mirror of the sculpty.
             </summary>
         </member>
-        <member name="P:OpenMetaverse.InventoryAttachment.AttachmentPoint">
+        <member name="T:OpenMetaverse.Primitive.ObjectProperties">
             <summary>
-            Get the last AttachmentPoint this object was attached to
+            Extended properties to describe an object
             </summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryWearable">
-            <summary>
-            InventoryWearable Class, details on a clothing item or body part
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.ObjectID">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryWearable.#ctor(OpenMetaverse.UUID)">
-            <summary>
-            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 name="F:OpenMetaverse.Primitive.ObjectProperties.CreatorID">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryWearable.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
-            <summary>
-            Construct an InventoryWearable object from a serialization stream
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.OwnerID">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.InventoryWearable.WearableType">
-            <summary>
-            The <seealso cref="T:OpenMetaverse.WearableType" />, Skin, Shape, Skirt, Etc
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.GroupID">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryAnimation">
-            <summary>
-            InventoryAnimation Class, A bvh encoded object which animates an avatar
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.CreationDate">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryAnimation.#ctor(OpenMetaverse.UUID)">
-            <summary>
-            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 name="F:OpenMetaverse.Primitive.ObjectProperties.Permissions">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryAnimation.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
-            <summary>
-            Construct an InventoryAnimation object from a serialization stream
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.OwnershipCost">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryGesture">
-            <summary>
-            InventoryGesture Class, details on a series of animations, sounds, and actions
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.SaleType">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryGesture.#ctor(OpenMetaverse.UUID)">
-            <summary>
-            Construct an InventoryGesture object
-            </summary>
-            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID" /> which becomes the
-            <seealso cref="T:OpenMetaverse.InventoryItem" /> objects AssetUUID</param>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.SalePrice">
+            <summary></summary>
         </member>
-        <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 name="F:OpenMetaverse.Primitive.ObjectProperties.AggregatePerms">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryFolder">
-            <summary>
-            A folder contains <seealso cref="T:OpenMetaverse.InventoryItem" />s and has certain attributes specific
-            to itself
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.AggregatePermTextures">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryFolder.#ctor(OpenMetaverse.UUID)">
-            <summary>
-            Constructor
-            </summary>
-            <param name="itemID">UUID of the folder</param>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.AggregatePermTexturesOwner">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryFolder.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
-            <summary>
-            Construct an InventoryFolder object from a serialization stream
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.Category">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryFolder.PreferredType">
-            <summary>The Preferred <seealso cref="T:OpenMetaverse.AssetType" /> for a folder.</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.InventorySerial">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryFolder.Version">
-            <summary>The Version of this folder</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.ItemID">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryFolder.DescendentCount">
-            <summary>Number of child items this folder contains.</summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.FolderID">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryFolder.ToString">
-            <summary>
-            </summary>
-            <returns>
-            </returns>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.FromTaskID">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryFolder.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
-            <summary>
-            Get Serilization data for this InventoryFolder object
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.LastOwnerID">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryFolder.GetHashCode">
-            <summary>
-            </summary>
-            <returns>
-            </returns>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.Name">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryFolder.Equals(System.Object)">
-            <summary>
-            </summary>
-            <param name="o">
-            </param>
-            <returns>
-            </returns>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.Description">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryFolder.Equals(OpenMetaverse.InventoryBase)">
-            <summary>
-            </summary>
-            <param name="o">
-            </param>
-            <returns>
-            </returns>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.TouchName">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryFolder.Equals(OpenMetaverse.InventoryFolder)">
-            <summary>
-            </summary>
-            <param name="o">
-            </param>
-            <returns>
-            </returns>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.SitName">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.InventoryManager">
-            <summary>
-            Tools for dealing with agents inventory
-            </summary>
+        <member name="F:OpenMetaverse.Primitive.ObjectProperties.TextureIDs">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.#ctor(OpenMetaverse.GridClient)">
+        <member name="M:OpenMetaverse.Primitive.ObjectProperties.#ctor">
             <summary>
             Default constructor
             </summary>
-            <param name="client">Reference to the GridClient object</param>
-        </member>
-        <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="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="T:OpenMetaverse.InventoryManager.ItemCopiedCallback">
-            <summary>
-            </summary>
-            <param name="item">
-            </param>
-        </member>
-        <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="T:OpenMetaverse.InventoryManager.ScriptUpdatedCallback">
+        <member name="M:OpenMetaverse.Primitive.ObjectProperties.SetFamilyProperties(OpenMetaverse.Primitive.ObjectProperties)">
             <summary>
-            Delegate that is invoked when script upload is completed
+            Set the properties that are set in an ObjectPropertiesFamily packet
             </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.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="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="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="F:OpenMetaverse.InventoryManager.m_InventoryObjectOfferedLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_TaskItemReceived">
-            <summary>The event subscribers, null of no subscribers</summary>
-        </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_TaskItemReceivedLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_FindObjectByPathReply">
-            <summary>The event subscribers, null of no subscribers</summary>
-        </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_FindObjectByPathReplyLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_TaskInventoryReply">
-            <summary>The event subscribers, null of no subscribers</summary>
-        </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_TaskInventoryReplyLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_SaveAssetToInventory">
-            <summary>The event subscribers, null of no subscribers</summary>
-        </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_SaveAssetToInventoryLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_ScriptRunningReply">
-            <summary>The event subscribers, null of no subscribers</summary>
-        </member>
-        <member name="F:OpenMetaverse.InventoryManager.m_ScriptRunningReplyLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.InventoryManager._NewFolderNames">
-            <summary>Partial mapping of AssetTypes to folder names</summary>
-        </member>
-        <member name="E:OpenMetaverse.InventoryManager.ItemReceived">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
-        </member>
-        <member name="E:OpenMetaverse.InventoryManager.FolderUpdated">
-            <summary>Raised when the simulator sends us data containing
-            ...</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>
-        <member name="E:OpenMetaverse.InventoryManager.TaskItemReceived">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
-        </member>
-        <member name="E:OpenMetaverse.InventoryManager.FindObjectByPathReply">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
-        </member>
-        <member name="E:OpenMetaverse.InventoryManager.TaskInventoryReply">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
-        </member>
-        <member name="E:OpenMetaverse.InventoryManager.SaveAssetToInventory">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
-        </member>
-        <member name="E:OpenMetaverse.InventoryManager.ScriptRunningReply">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
+            <param name="props"><seealso cref="T:OpenMetaverse.Primitive.ObjectProperties"/> that has
+            been partially filled by an ObjectPropertiesFamily packet</param>
         </member>
-        <member name="P:OpenMetaverse.InventoryManager.Store">
+        <member name="T:OpenMetaverse.Primitive.PhysicsProperties">
             <summary>
-            Get this agents Inventory data
+            Describes physics attributes of the prim
             </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="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="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="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="F:OpenMetaverse.Primitive.PhysicsProperties.LocalID">
+            <summary>Primitive's local ID</summary>
         </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="F:OpenMetaverse.Primitive.PhysicsProperties.Density">
+            <summary>Density (1000 for normal density)</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.Primitive.PhysicsProperties.Friction">
+            <summary>Friction</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.Primitive.PhysicsProperties.GravityMultiplier">
+            <summary>Gravity multiplier (1 for normal gravity) </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="F:OpenMetaverse.Primitive.PhysicsProperties.PhysicsShapeType">
+            <summary>Type of physics representation of this primitive in the simulator</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.FetchItem(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Int32)">
-            <summary>
-            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 name="F:OpenMetaverse.Primitive.PhysicsProperties.Restitution">
+            <summary>Restitution</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestFetchInventory(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Primitive.PhysicsProperties.FromOSD(OpenMetaverse.StructuredData.OSD)">
             <summary>
-            Request A single inventory item
+            Creates PhysicsProperties from OSD
             </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)" />
+            <param name="osd">OSDMap with incoming data</param>
+            <returns>Deserialized PhysicsProperties object</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestFetchInventory(System.Collections.Generic.List{OpenMetaverse.UUID},System.Collections.Generic.List{OpenMetaverse.UUID})">
+        <member name="M:OpenMetaverse.Primitive.PhysicsProperties.GetOSD">
             <summary>
-            Request inventory items
+            Serializes PhysicsProperties to OSD
             </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)" />
+            <returns>OSDMap with serialized PhysicsProperties data</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.FolderContents(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean,System.Boolean,OpenMetaverse.InventorySortOrder,System.Int32)">
+        <member name="T:OpenMetaverse.Primitive.ParticleSystem">
             <summary>
-            Get contents of a folder
+            Complete structure for the particle system
             </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>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestFolderContents(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean,System.Boolean,OpenMetaverse.InventorySortOrder)">
-            <summary>
-            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 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="M:OpenMetaverse.InventoryManager.RequestFolderContentsCap(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean,System.Boolean,OpenMetaverse.InventorySortOrder)">
-            <summary>
-            Request the contents of an inventory folder using HTTP capabilities
-            </summary>
-            <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 name="F:OpenMetaverse.Primitive.ParticleSystem.Pattern">
+            <summary><seealso cref="T:SourcePattern"/> pattern of particles</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.FindFolderForType(OpenMetaverse.AssetType)">
-            <summary>
-            Returns the UUID of the folder (category) that defaults to
-            containing 'type'. The folder is not necessarily only for that
-            type
-            </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 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="M:OpenMetaverse.InventoryManager.FindObjectByPath(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,System.Int32)">
-            <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 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="M:OpenMetaverse.InventoryManager.RequestFindObjectByPath(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String)">
-            <summary>
-            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 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="M:OpenMetaverse.InventoryManager.LocalFind(OpenMetaverse.UUID,System.String[],System.Int32,System.Boolean)">
-            <summary>
-            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 name="F:OpenMetaverse.Primitive.ParticleSystem.OuterAngle">
+            <summary>A <see langword="float"/> in radians that specifies where particles will be created</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.Move(OpenMetaverse.InventoryBase,OpenMetaverse.InventoryFolder)">
-            <summary>
-            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 name="F:OpenMetaverse.Primitive.ParticleSystem.BurstRate">
+            <summary>A <see langword="float"/> representing the number of seconds between burts.</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.Move(OpenMetaverse.InventoryBase,OpenMetaverse.InventoryFolder,System.String)">
-            <summary>
-            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 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="M:OpenMetaverse.InventoryManager.MoveFolder(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String)">
-            <summary>
-            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 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="M:OpenMetaverse.InventoryManager.UpdateFolderProperties(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,OpenMetaverse.AssetType)">
-            <summary>
-            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 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="M:OpenMetaverse.InventoryManager.MoveFolder(OpenMetaverse.UUID,OpenMetaverse.UUID)">
-            <summary>
-            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 name="F:OpenMetaverse.Primitive.ParticleSystem.BurstPartCount">
+            <summary>A <see langword="byte"/> representing the maximum number of particles emitted per burst</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.MoveFolders(System.Collections.Generic.Dictionary{OpenMetaverse.UUID,OpenMetaverse.UUID})">
-            <summary>
-            Move multiple folders, the keys in the Dictionary parameter,
-            to a new parents, the value of that folder's key.
-            </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>
+        <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="M:OpenMetaverse.InventoryManager.MoveItem(OpenMetaverse.UUID,OpenMetaverse.UUID)">
-            <summary>
-            Move an inventory item to a new folder
-            </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 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="M:OpenMetaverse.InventoryManager.MoveItem(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String)">
-            <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 name="F:OpenMetaverse.Primitive.ParticleSystem.Texture">
+            <summary>The <see cref="T:UUID"/> Key of the texture displayed on the particle</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.MoveItems(System.Collections.Generic.Dictionary{OpenMetaverse.UUID,OpenMetaverse.UUID})">
-            <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 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="M:OpenMetaverse.InventoryManager.RemoveDescendants(OpenMetaverse.UUID)">
-            <summary>
-            Remove descendants of a folder
-            </summary>
-            <param name="folder">The <seealso cref="T:OpenMetaverse.UUID" /> of the folder</param>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartDataFlags">
+            <summary>Flags of particle from <seealso cref="T:ParticleDataFlags"/></summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RemoveItem(OpenMetaverse.UUID)">
-            <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 name="F:OpenMetaverse.Primitive.ParticleSystem.PartMaxAge">
+            <summary>Max Age particle system will emit particles for</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RemoveFolder(OpenMetaverse.UUID)">
-            <summary>
-            Remove a folder from inventory
-            </summary>
-            <param name="folder">The <seealso cref="T:OpenMetaverse.UUID" /> of the folder to remove</param>
+        <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="M:OpenMetaverse.InventoryManager.Remove(System.Collections.Generic.List{OpenMetaverse.UUID},System.Collections.Generic.List{OpenMetaverse.UUID})">
-            <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 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="M:OpenMetaverse.InventoryManager.EmptyLostAndFound">
-            <summary>
-            Empty the Lost and Found folder
-            </summary>
+        <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="M:OpenMetaverse.InventoryManager.EmptyTrash">
-            <summary>
-            Empty the Trash folder
-            </summary>
+        <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="M:OpenMetaverse.InventoryManager.RequestCreateItem(OpenMetaverse.UUID,System.String,System.String,OpenMetaverse.AssetType,OpenMetaverse.UUID,OpenMetaverse.InventoryType,OpenMetaverse.PermissionMask,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
-            <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 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="M:OpenMetaverse.InventoryManager.RequestCreateItem(OpenMetaverse.UUID,System.String,System.String,OpenMetaverse.AssetType,OpenMetaverse.UUID,OpenMetaverse.InventoryType,OpenMetaverse.WearableType,OpenMetaverse.PermissionMask,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
-            <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 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.InventoryManager.CreateFolder(OpenMetaverse.UUID,System.String)">
+        <member name="M:OpenMetaverse.Primitive.ParticleSystem.#ctor(System.Byte[],System.Int32)">
             <summary>
-            Creates a new inventory folder
+            Decodes a byte[] array into a ParticleSystem Object
             </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>
+            <param name="data">ParticleSystem object</param>
+            <param name="pos">Start position for BitPacker</param>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.CreateFolder(OpenMetaverse.UUID,System.String,OpenMetaverse.AssetType)">
+        <member name="M:OpenMetaverse.Primitive.ParticleSystem.GetBytes">
             <summary>
-            Creates a new inventory folder
+            Generate byte[] array from particle data
             </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>
+            <returns>Byte array</returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestCreateItemFromAsset(System.Byte[],System.String,System.String,OpenMetaverse.AssetType,OpenMetaverse.InventoryType,OpenMetaverse.UUID,OpenMetaverse.InventoryManager.ItemCreatedFromAssetCallback)">
+        <member name="T:OpenMetaverse.Primitive.ParticleSystem.SourcePattern">
             <summary>
-            Create an inventory item and upload asset data
+            Particle source pattern
             </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)">
-            <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 name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.None">
+            <summary>None</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.CreateLink(OpenMetaverse.UUID,OpenMetaverse.InventoryBase,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
-            <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="bse">Inventory item or folder</param>
-            <param name="callback">Method to call upon creation of the link</param>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.Drop">
+            <summary>Drop particles from source position with no force</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.CreateLink(OpenMetaverse.UUID,OpenMetaverse.InventoryItem,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
-            <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 name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.Explode">
+            <summary>"Explode" particles in all directions</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.CreateLink(OpenMetaverse.UUID,OpenMetaverse.InventoryFolder,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
-            <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 name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.Angle">
+            <summary>Particles shoot across a 2D area</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.CreateLink(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,System.String,OpenMetaverse.AssetType,OpenMetaverse.InventoryType,OpenMetaverse.UUID,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
-            <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 name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.AngleCone">
+            <summary>Particles shoot across a 3D Cone</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestCopyItem(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,OpenMetaverse.InventoryManager.ItemCopiedCallback)">
-            <summary>
-            </summary>
-            <param name="item">
-            </param>
-            <param name="newParent">
-            </param>
-            <param name="newName">
-            </param>
-            <param name="callback">
-            </param>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.SourcePattern.AngleConeEmpty">
+            <summary>Inverse of AngleCone (shoot particles everywhere except the 3D cone defined</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestCopyItem(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,OpenMetaverse.UUID,OpenMetaverse.InventoryManager.ItemCopiedCallback)">
+        <member name="T:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags">
             <summary>
+            Particle Data Flags
             </summary>
-            <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.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>
-            </summary>
-            <param name="items">
-            </param>
-            <param name="targetFolders">
-            </param>
-            <param name="newNames">
-            </param>
-            <param name="oldOwnerID">
-            </param>
-            <param name="callback">
-            </param>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.None">
+            <summary>None</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestCopyItemFromNotecard(OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.InventoryManager.ItemCopiedCallback)">
-            <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 name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.InterpColor">
+            <summary>Interpolate color and alpha from start to end</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestUpdateItem(OpenMetaverse.InventoryItem)">
-            <summary>
-            </summary>
-            <param name="item">
-            </param>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.InterpScale">
+            <summary>Interpolate scale from start to end</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestUpdateItems(System.Collections.Generic.List{OpenMetaverse.InventoryItem})">
-            <summary>
-            </summary>
-            <param name="items">
-            </param>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.Bounce">
+            <summary>Bounce particles off particle sources Z height</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestUpdateItems(System.Collections.Generic.List{OpenMetaverse.InventoryItem},OpenMetaverse.UUID)">
-            <summary>
-            </summary>
-            <param name="items">
-            </param>
-            <param name="transactionID">
-            </param>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.Wind">
+            <summary>velocity of particles is dampened toward the simulators wind</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestUploadNotecardAsset(System.Byte[],OpenMetaverse.UUID,OpenMetaverse.InventoryManager.InventoryUploadedAssetCallback)">
-            <summary>
-            </summary>
-            <param name="data">
-            </param>
-            <param name="notecardID">
-            </param>
-            <param name="callback">
-            </param>
+        <member name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.FollowSrc">
+            <summary>Particles follow the source</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestUpdateNotecardTask(System.Byte[],OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.InventoryManager.InventoryUploadedAssetCallback)">
-            <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 name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.FollowVelocity">
+            <summary>Particles point towards the direction of source's velocity</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestUploadGestureAsset(System.Byte[],OpenMetaverse.UUID,OpenMetaverse.InventoryManager.InventoryUploadedAssetCallback)">
-            <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 name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.TargetPos">
+            <summary>Target of the particles</summary>
         </member>
-        <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="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 name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.TargetLinear">
+            <summary>Particles are sent in a straight line</summary>
         </member>
-        <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="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 name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.Emissive">
+            <summary>Particles emit a glow</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestRezFromInventory(OpenMetaverse.Simulator,OpenMetaverse.Quaternion,OpenMetaverse.Vector3,OpenMetaverse.InventoryItem)">
-            <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 name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleDataFlags.Beam">
+            <summary>used for point/grab/touch</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestRezFromInventory(OpenMetaverse.Simulator,OpenMetaverse.Quaternion,OpenMetaverse.Vector3,OpenMetaverse.InventoryItem,OpenMetaverse.UUID)">
+        <member name="T:OpenMetaverse.Primitive.ParticleSystem.ParticleFlags">
             <summary>
-            Rez an object from inventory
+            Particle Flags Enum
             </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)">
-            <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 name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleFlags.None">
+            <summary>None</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestDeRezToInventory(System.UInt32)">
-            <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 name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleFlags.ObjectRelative">
+            <summary>Acceleration and velocity for particles are
+            relative to the object rotation</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestDeRezToInventory(System.UInt32,OpenMetaverse.DeRezDestination,OpenMetaverse.UUID,OpenMetaverse.UUID)">
-            <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 name="F:OpenMetaverse.Primitive.ParticleSystem.ParticleFlags.UseNewAngle">
+            <summary>Particles use new 'correct' angle parameters</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestRestoreRezFromInventory(OpenMetaverse.Simulator,OpenMetaverse.InventoryItem,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Messages.MessageUtils.DecodeEvent(System.String,OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            Rez an item from inventory to its previous simulator location
+            Return a decoded capabilities message as a strongly typed object
             </summary>
-            <param name="simulator">
-            </param>
-            <param name="item">
-            </param>
-            <param name="queryID">
-            </param>
-            <returns>
-            </returns>
+            <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="M:OpenMetaverse.InventoryManager.GiveItem(OpenMetaverse.UUID,System.String,OpenMetaverse.AssetType,OpenMetaverse.UUID,System.Boolean)">
+        <member name="T:OpenMetaverse.Imaging.OpenJPEG">
             <summary>
-            Give an inventory item to another avatar
+            A Wrapper around openjpeg to encode and decode images to and from byte arrays
             </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)">
-            <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 name="F:OpenMetaverse.Imaging.OpenJPEG.TGA_HEADER_SIZE">
+            <summary>TGA Header size</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.UpdateTaskInventory(System.UInt32,OpenMetaverse.InventoryItem)">
-            <summary>
-            Copy or move an <see cref="T:OpenMetaverse.InventoryItem" /> from agent inventory to a task (primitive) inventory
-            </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>
+        <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.InventoryManager.GetTaskInventory(OpenMetaverse.UUID,System.UInt32,System.Int32)">
+        <member name="M:OpenMetaverse.Imaging.OpenJPEG.Encode(OpenMetaverse.Imaging.ManagedImage,System.Boolean)">
             <summary>
-            Retrieve a listing of the items contained in a task (Primitive)
+            Encode a <seealso cref="T:OpenMetaverse.Imaging.ManagedImage"/> object into a byte array
             </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>
+            <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.InventoryManager.RequestTaskInventory(System.UInt32)">
+        <member name="M:OpenMetaverse.Imaging.OpenJPEG.Encode(OpenMetaverse.Imaging.ManagedImage)">
             <summary>
-            Request the contents of a tasks (primitives) inventory from the
-            current simulator
+            Encode a <seealso cref="T:OpenMetaverse.Imaging.ManagedImage"/> object into a byte array
             </summary>
-            <param name="objectLocalID">The LocalID of the object</param>
-            <seealso cref="E:OpenMetaverse.InventoryManager.TaskInventoryReply" />
+            <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.InventoryManager.RequestTaskInventory(System.UInt32,OpenMetaverse.Simulator)">
+        <member name="M:OpenMetaverse.Imaging.OpenJPEG.DecodeToImage(System.Byte[],OpenMetaverse.Imaging.ManagedImage@,System.Drawing.Image@)">
             <summary>
-            Request the contents of a tasks (primitives) inventory
+            Decode JPEG2000 data to an <seealso cref="T:System.Drawing.Image"/> and
+            <seealso cref="T:OpenMetaverse.Imaging.ManagedImage"/>
             </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" />
+            <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.InventoryManager.MoveTaskInventory(System.UInt32,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.Simulator)">
+        <member name="M:OpenMetaverse.Imaging.OpenJPEG.DecodeToImage(System.Byte[],OpenMetaverse.Imaging.ManagedImage@)">
             <summary>
-            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>
+            <param name="encoded"></param>
+            <param name="managedImage"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RemoveTaskInventory(System.UInt32,OpenMetaverse.UUID,OpenMetaverse.Simulator)">
+        <member name="M:OpenMetaverse.Imaging.OpenJPEG.DecodeLayerBoundaries(System.Byte[],OpenMetaverse.Imaging.OpenJPEG.J2KLayerInfo[]@,System.Int32@)">
             <summary>
-            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>
+            <param name="encoded"></param>
+            <param name="layerInfo"></param>
+            <param name="components"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.CopyScriptToTask(System.UInt32,OpenMetaverse.InventoryItem,System.Boolean)">
+        <member name="M:OpenMetaverse.Imaging.OpenJPEG.EncodeFromImage(System.Drawing.Bitmap,System.Boolean)">
             <summary>
-            Copy an InventoryScript item from the Agents Inventory into a primitives task inventory
+            Encode a <seealso cref="T:System.Drawing.Bitmap"/> object into a byte array
             </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>
+            <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.InventoryManager.RequestGetScriptRunning(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="T:OpenMetaverse.Imaging.OpenJPEG.J2KLayerInfo">
             <summary>
-            Request the running status of a script contained in a task (primitive) inventory
+            Defines the beginning and ending file positions of a layer in an
+            LRCP-progression JPEG2000 file
             </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" />
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.RequestSetScriptRunning(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean)">
+        <member name="T:OpenMetaverse.Imaging.OpenJPEG.MarshalledImage">
             <summary>
-            Send a request to set the running state of a script contained in a task (primitive) inventory
+            This structure is used to marshal both encoded and decoded images.
+            MUST MATCH THE STRUCT IN dotnet.h!
             </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>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.ItemCRC(OpenMetaverse.InventoryItem)">
+        <member name="T:OpenMetaverse.Imaging.OpenJPEG.MarshalledPacket">
             <summary>
-            Create a CRC from an InventoryItem
+            Information about a single packet in a JPEG2000 stream
             </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)">
-            <summary>
-            Reverses a cheesy XORing with a fixed UUID to convert a shadow_id to an asset_id
-            </summary>
-            <param name="shadowID">Obfuscated shadow_id value</param>
-            <returns>Deobfuscated asset_id value</returns>
+        <member name="F:OpenMetaverse.Imaging.OpenJPEG.MarshalledPacket.start_pos">
+            <summary>Packet start position</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.EncryptAssetID(OpenMetaverse.UUID)">
-            <summary>
-            Does a cheesy XORing with a fixed UUID to convert an asset_id to a shadow_id
-            </summary>
-            <param name="assetID">asset_id value to obfuscate</param>
-            <returns>Obfuscated shadow_id value</returns>
+        <member name="F:OpenMetaverse.Imaging.OpenJPEG.MarshalledPacket.end_ph_pos">
+            <summary>Packet header end position</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.CreateInventoryItem(OpenMetaverse.InventoryType,OpenMetaverse.UUID)">
-            <summary>
-            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 name="F:OpenMetaverse.Imaging.OpenJPEG.MarshalledPacket.end_pos">
+            <summary>Packet end position</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.ParseTaskInventory(System.String)">
-            <summary>
-            Parse the results of a RequestTaskInventory() response
-            </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>
+        <member name="F:OpenMetaverse.TerrainManager.m_LandPatchReceivedEvent">
+            <summary>The event subscribers. null if no subcribers</summary>
         </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.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="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="F:OpenMetaverse.TerrainManager.m_LandPatchReceivedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryManager.UpdateCreateInventoryItemHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <member name="M:OpenMetaverse.TerrainManager.#ctor(OpenMetaverse.GridClient)">
             <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
+            Default constructor
             </summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
+            <param name="client"></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="E:OpenMetaverse.TerrainManager.LandPatchReceived">
+            <summary>Raised when the simulator responds sends </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="P:OpenMetaverse.LandPatchReceivedEventArgs.Simulator">
+            <summary>Simulator from that sent tha data</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="P:OpenMetaverse.LandPatchReceivedEventArgs.X">
+            <summary>Sim coordinate of the patch</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="P:OpenMetaverse.LandPatchReceivedEventArgs.Y">
+            <summary>Sim coordinate of the patch</summary>
         </member>
-        <member name="P:OpenMetaverse.InventoryObjectOfferedEventArgs.Accept">
-            <summary>Set to true to accept offer, false to decline it</summary>
+        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.PatchSize">
+            <summary>Size of tha patch</summary>
         </member>
-        <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 name="P:OpenMetaverse.LandPatchReceivedEventArgs.HeightMap">
+            <summary>Heightmap for the patch</summary>
         </member>
-        <member name="T:OpenMetaverse.TaskItemReceivedEventArgs">
+        <member name="T:OpenMetaverse.Caps">
             <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.
+            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="M:OpenMetaverse.InventoryNode.#ctor">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Caps.Simulator">
+            <summary>Reference to the simulator this system is connected to</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryNode.#ctor(OpenMetaverse.InventoryBase)">
+        <member name="M:OpenMetaverse.Caps.#ctor(OpenMetaverse.Simulator,System.String)">
             <summary>
+            Default constructor
             </summary>
-            <param name="data">
-            </param>
+            <param name="simulator"></param>
+            <param name="seedcaps"></param>
         </member>
-        <member name="M:OpenMetaverse.InventoryNode.#ctor(OpenMetaverse.InventoryBase,OpenMetaverse.InventoryNode)">
+        <member name="M:OpenMetaverse.Caps.CapabilityURI(System.String)">
             <summary>
-            De-serialization constructor for the InventoryNode Class
+            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.InventoryNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+        <member name="M:OpenMetaverse.Caps.EventQueueEventHandler(System.String,OpenMetaverse.StructuredData.OSDMap)">
             <summary>
-            De-serialization handler for the InventoryNode Class
+            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.InventoryNode.Data">
-            <summary>
-            </summary>
+        <member name="P:OpenMetaverse.Caps.SeedCapsURI">
+            <summary>Capabilities URI this system was initialized with</summary>
         </member>
-        <member name="P:OpenMetaverse.InventoryNode.Parent">
-            <summary>
-            </summary>
+        <member name="P:OpenMetaverse.Caps.IsEventQueueRunning">
+            <summary>Whether the capabilities event queue is connected and
+            listening for incoming events</summary>
         </member>
-        <member name="P:OpenMetaverse.InventoryNode.ParentID">
+        <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="P:OpenMetaverse.InventoryNode.Nodes">
+        <member name="T:OpenMetaverse.StatusCode">
             <summary>
+            
             </summary>
         </member>
-        <member name="P:OpenMetaverse.InventoryNode.NeedsUpdate">
-            <summary>
-            For inventory folder nodes specifies weather the folder needs to be
-            refreshed from the server
-            </summary>
+        <member name="F:OpenMetaverse.StatusCode.OK">
+            <summary>OK</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryNode.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
-            <summary>
-            Serialization handler for the InventoryNode Class
-            </summary>
+        <member name="F:OpenMetaverse.StatusCode.Done">
+            <summary>Transfer completed</summary>
         </member>
-        <member name="M:OpenMetaverse.InventoryNode.ToString">
-            <summary>
-            </summary>
-            <returns>
-            </returns>
+        <member name="F:OpenMetaverse.StatusCode.Skip">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Logger">
-            <summary>
-            Singleton logging class for the entire library
-            </summary>
+        <member name="F:OpenMetaverse.StatusCode.Abort">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Logger.#ctor">
-            <summary>
-            Default constructor
-            </summary>
+        <member name="F:OpenMetaverse.StatusCode.Error">
+            <summary>Unknown error occurred</summary>
         </member>
-        <member name="T:OpenMetaverse.Logger.LogCallback">
-            <summary>
-            Callback used for client apps to receive log messages from
-            the library
-            </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>
+        <member name="F:OpenMetaverse.StatusCode.UnknownSource">
+            <summary>Equivalent to a 404 error</summary>
         </member>
-        <member name="F:OpenMetaverse.Logger.LogInstance">
-            <summary>log4net logging engine</summary>
+        <member name="F:OpenMetaverse.StatusCode.InsufficientPermissions">
+            <summary>Client does not have permission for that resource</summary>
         </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="F:OpenMetaverse.StatusCode.Unknown">
+            <summary>Unknown status</summary>
         </member>
-        <member name="M:OpenMetaverse.Logger.Log(System.Object,OpenMetaverse.Helpers.LogLevel)">
+        <member name="T:OpenMetaverse.ChannelType">
             <summary>
-            Send a log message to the logging engine
+            
             </summary>
-            <param name="message">The log message</param>
-            <param name="level">The severity of the log entry</param>
         </member>
-        <member name="M:OpenMetaverse.Logger.Log(System.Object,OpenMetaverse.Helpers.LogLevel,OpenMetaverse.GridClient)">
-            <summary>
-            Send a log message to the logging engine
-            </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>
+        <member name="F:OpenMetaverse.ChannelType.Unknown">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Logger.Log(System.Object,OpenMetaverse.Helpers.LogLevel,System.Exception)">
-            <summary>
-            Send a log message to the logging engine
-            </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>
+        <member name="F:OpenMetaverse.ChannelType.Misc">
+            <summary>Unknown</summary>
         </member>
-        <member name="M:OpenMetaverse.Logger.Log(System.Object,OpenMetaverse.Helpers.LogLevel,OpenMetaverse.GridClient,System.Exception)">
-            <summary>
-            Send a log message to the logging engine
-            </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 name="F:OpenMetaverse.ChannelType.Asset">
+            <summary>Virtually all asset transfers use this channel</summary>
         </member>
-        <member name="M:OpenMetaverse.Logger.DebugLog(System.Object)">
+        <member name="T:OpenMetaverse.SourceType">
             <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
+            
             </summary>
-            <param name="message">The message to log at the DEBUG level to the
-            current logging engine</param>
         </member>
-        <member name="M:OpenMetaverse.Logger.DebugLog(System.Object,OpenMetaverse.GridClient)">
-            <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
-            </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 name="F:OpenMetaverse.SourceType.Unknown">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.LoginStatus">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.SourceType.Asset">
+            <summary>Asset from the asset server</summary>
         </member>
-        <member name="F:OpenMetaverse.LoginStatus.Failed">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.SourceType.SimInventoryItem">
+            <summary>Inventory item</summary>
         </member>
-        <member name="F:OpenMetaverse.LoginStatus.None">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.SourceType.SimEstate">
+            <summary>Estate asset, such as an estate covenant</summary>
         </member>
-        <member name="F:OpenMetaverse.LoginStatus.ConnectingToLogin">
+        <member name="T:OpenMetaverse.TargetType">
             <summary>
+            
             </summary>
         </member>
-        <member name="F:OpenMetaverse.LoginStatus.ReadingResponse">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.TargetType.Unknown">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.LoginStatus.ConnectingToSim">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.TargetType.File">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.LoginStatus.Redirecting">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.TargetType.VFile">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.LoginStatus.Success">
+        <member name="T:OpenMetaverse.ImageType">
             <summary>
+            When requesting image download, type of the image requested
             </summary>
         </member>
-        <member name="T:OpenMetaverse.LoginParams">
-            <summary>
-            Login Request Parameters
-            </summary>
+        <member name="F:OpenMetaverse.ImageType.Normal">
+            <summary>Normal in-world object texture</summary>
         </member>
-        <member name="M:OpenMetaverse.LoginParams.#ctor">
-            <summary>
-            Default constuctor, initializes sane default values
-            </summary>
+        <member name="F:OpenMetaverse.ImageType.Baked">
+            <summary>Avatar texture</summary>
         </member>
-        <member name="M:OpenMetaverse.LoginParams.#ctor(OpenMetaverse.GridClient,System.String,System.String,System.String,System.String,System.String)">
-            <summary>
-            Instantiates new LoginParams object and fills in the values
-            </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>
+        <member name="F:OpenMetaverse.ImageType.ServerBaked">
+            <summary>Server baked avatar texture</summary>
         </member>
-        <member name="M:OpenMetaverse.LoginParams.#ctor(OpenMetaverse.GridClient,System.String,System.String,System.String,System.String,System.String,System.String)">
+        <member name="T:OpenMetaverse.ImageCodec">
             <summary>
-            Instantiates new LoginParams object and fills in the values
+            Image file format
             </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>
-        </member>
-        <member name="F:OpenMetaverse.LoginParams.URI">
-            <summary>The URL of the Login Server</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>
-        <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="F:OpenMetaverse.LoginParams.FirstName">
-            <summary>The Agents First name</summary>
-        </member>
-        <member name="F:OpenMetaverse.LoginParams.LastName">
-            <summary>The Agents Last name</summary>
-        </member>
-        <member name="F:OpenMetaverse.LoginParams.Password">
-            <summary>A md5 hashed password</summary>
-            <remarks>plaintext password will be automatically hashed</remarks>
-        </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>
-        <member name="F:OpenMetaverse.LoginParams.Channel">
-            <summary>A string containing the client software channel information</summary>
-            <example>Second Life Release</example>
-        </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>
-        <member name="F:OpenMetaverse.LoginParams.Platform">
-            <summary>A string containing the platform information the agent is running on</summary>
-        </member>
-        <member name="F:OpenMetaverse.LoginParams.MAC">
-            <summary>A string hash of the network cards Mac Address</summary>
-        </member>
-        <member name="F:OpenMetaverse.LoginParams.ViewerDigest">
-            <summary>Unknown or deprecated</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>
-        <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.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.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.LoginParams.ReadCritical">
-            <summary>Unknown</summary>
-        </member>
-        <member name="F:OpenMetaverse.LoginParams.Options">
-            <summary>An array of string sent to the login server to enable various options</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>
-        <member name="T:OpenMetaverse.LoginResponseData">
+        <member name="T:OpenMetaverse.Transfer">
             <summary>
-            The decoded data returned from the login server after a successful login
+            
             </summary>
         </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 name="P:OpenMetaverse.Transfer.TimeSinceLastPacket">
+            <summary>Number of milliseconds passed since the last transfer
+            packet was received</summary>
         </member>
-        <member name="M:OpenMetaverse.LoginResponseData.Parse(OpenMetaverse.StructuredData.OSDMap)">
+        <member name="T:OpenMetaverse.AssetDownload">
             <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="T:OpenMetaverse.NetworkManager">
-            <summary>
-            Login Routines
-            </summary>
+        <member name="T:OpenMetaverse.XferDownload">
             <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="M:OpenMetaverse.NetworkManager.#ctor(OpenMetaverse.GridClient)">
+        <member name="T:OpenMetaverse.ImageDownload">
             <summary>
-            Default constructor
+            
             </summary>
-            <param name="client">Reference to the GridClient object</param>
         </member>
-        <member name="T:OpenMetaverse.NetworkManager.DisconnectType">
+        <member name="T:OpenMetaverse.AssetUpload">
             <summary>
-            Explains why a simulator or the grid disconnected from us
+            
             </summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.DisconnectType.ClientInitiated">
-            <summary>The client requested the logout or simulator disconnect</summary>
-        </member>
-        <member name="F:OpenMetaverse.NetworkManager.DisconnectType.ServerInitiated">
-            <summary>The server notified us that it is disconnecting</summary>
-        </member>
-        <member name="F:OpenMetaverse.NetworkManager.DisconnectType.NetworkTimeout">
-            <summary>Either a socket was closed or network traffic timed out</summary>
-        </member>
-        <member name="F:OpenMetaverse.NetworkManager.DisconnectType.SimShutdown">
-            <summary>The last active simulator shut down</summary>
-        </member>
-        <member name="T:OpenMetaverse.NetworkManager.IncomingPacket">
+        <member name="T:OpenMetaverse.ImageRequest">
             <summary>
-            Holds a simulator reference and a decoded packet, these structs are put in
-            the packet inbox for event handling
+            
             </summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.IncomingPacket.Simulator">
-            <summary>Reference to the simulator that this packet came from</summary>
-        </member>
-        <member name="F:OpenMetaverse.NetworkManager.IncomingPacket.Packet">
-            <summary>Packet that needs to be processed</summary>
-        </member>
-        <member name="T:OpenMetaverse.NetworkManager.OutgoingPacket">
+        <member name="M:OpenMetaverse.ImageRequest.#ctor(OpenMetaverse.UUID,OpenMetaverse.ImageType,System.Single,System.Int32)">
             <summary>
-            Holds a simulator reference and a serialized packet, these structs are put in
-            the packet outbox for sending
+            
             </summary>
+            <param name="imageid"></param>
+            <param name="type"></param>
+            <param name="priority"></param>
+            <param name="discardLevel"></param>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.Simulator">
-            <summary>Reference to the simulator this packet is destined for</summary>
-        </member>
-        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.Buffer">
-            <summary>Packet that needs to be sent</summary>
-        </member>
-        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.SequenceNumber">
-            <summary>Sequence number of the wrapped packet</summary>
-        </member>
-        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.ResendCount">
-            <summary>Number of times this packet has been resent</summary>
-        </member>
-        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.TickCount">
-            <summary>Environment.TickCount when this packet was last sent over the wire</summary>
-        </member>
-        <member name="F:OpenMetaverse.NetworkManager.OutgoingPacket.Type">
-            <summary>Type of the packet</summary>
-        </member>
-        <member name="T:OpenMetaverse.NetworkManager.LoginResponseCallback">
+        <member name="T:OpenMetaverse.AssetManager">
             <summary>
+            
             </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.NetworkManager.m_LoginProgress">
-            <summary>The event subscribers, null of no subscribers</summary>
-        </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_LoginProgressLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.NetworkManager.LoginSeedCapability">
-            <summary>Seed CAPS URL returned from the login server</summary>
-        </member>
-        <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.NetworkManager.XMPPHost">
-            <summary>XMPP server to connect to for Group chat and IM services</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>
-        <member name="F:OpenMetaverse.NetworkManager.m_PacketSent">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <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.NetworkManager.m_PacketSentLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.AssetManager.m_XferReceivedEvent">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_LoggedOut">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <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="F:OpenMetaverse.NetworkManager.m_LoggedOutLock">
+        <member name="F:OpenMetaverse.AssetManager.m_XferReceivedLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_SimConnecting">
-            <summary>The event subscribers, null of no subscribers</summary>
-        </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_SimConnectingLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.AssetManager.m_AssetUploadedEvent">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_SimConnected">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <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="F:OpenMetaverse.NetworkManager.m_SimConnectedLock">
+        <member name="F:OpenMetaverse.AssetManager.m_AssetUploadedLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_SimDisconnected">
-            <summary>The event subscribers, null of no subscribers</summary>
-        </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_SimDisconnectedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.AssetManager.m_UploadProgressEvent">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_Disconnected">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <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="F:OpenMetaverse.NetworkManager.m_DisconnectedLock">
+        <member name="F:OpenMetaverse.AssetManager.m_UploadProgressLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_SimChanged">
-            <summary>The event subscribers, null of no subscribers</summary>
-        </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_SimChangedLock">
-            <summary>Thread sync lock object</summary>
+        <member name="F:OpenMetaverse.AssetManager.m_InitiateDownloadEvent">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="F:OpenMetaverse.NetworkManager.m_EventQueueRunning">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <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="F:OpenMetaverse.NetworkManager.m_EventQueueRunningLock">
+        <member name="F:OpenMetaverse.AssetManager.m_InitiateDownloadLock">
             <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>
-        <member name="F:OpenMetaverse.NetworkManager.CapsEvents">
-            <summary>Handlers for incoming capability events</summary>
-        </member>
-        <member name="F:OpenMetaverse.NetworkManager.PacketEvents">
-            <summary>Handlers for incoming packets</summary>
-        </member>
-        <member name="F:OpenMetaverse.NetworkManager.PacketInbox">
-            <summary>Incoming packets that are awaiting handling</summary>
-        </member>
-        <member name="F:OpenMetaverse.NetworkManager.PacketOutbox">
-            <summary>Outgoing packets that are awaiting handling</summary>
-        </member>
-        <member name="E:OpenMetaverse.NetworkManager.LoginProgress">
-            <summary>Raised when the simulator sends us data containing
-            ...</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>
-        <member name="E:OpenMetaverse.NetworkManager.PacketSent">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
-        </member>
-        <member name="E:OpenMetaverse.NetworkManager.LoggedOut">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
-        </member>
-        <member name="E:OpenMetaverse.NetworkManager.SimConnecting">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
-        </member>
-        <member name="E:OpenMetaverse.NetworkManager.SimConnected">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
-        </member>
-        <member name="E:OpenMetaverse.NetworkManager.SimDisconnected">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
-        </member>
-        <member name="E:OpenMetaverse.NetworkManager.Disconnected">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
-        </member>
-        <member name="E:OpenMetaverse.NetworkManager.SimChanged">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
-        </member>
-        <member name="E:OpenMetaverse.NetworkManager.EventQueueRunning">
-            <summary>Raised when the simulator sends us data containing
-            ...</summary>
-        </member>
-        <member name="P:OpenMetaverse.NetworkManager.LoginStatusCode">
-            <summary>Current state of logging in</summary>
-        </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>
-        <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="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="P:OpenMetaverse.NetworkManager.CircuitCode">
-            <summary>Unique identifier associated with our connections to
-            simulators</summary>
-        </member>
-        <member name="P:OpenMetaverse.NetworkManager.CurrentSim">
-            <summary>The simulator that the logged in avatar is currently
-            occupying</summary>
-        </member>
-        <member name="P:OpenMetaverse.NetworkManager.Connected">
-            <summary>Shows whether the network layer is logged in to the
-            grid or not</summary>
-        </member>
-        <member name="P:OpenMetaverse.NetworkManager.InboxCount">
-            <summary>Number of packets in the incoming queue</summary>
-        </member>
-        <member name="P:OpenMetaverse.NetworkManager.OutboxCount">
-            <summary>Number of packets in the outgoing queue</summary>
-        </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>
-        <member name="M:OpenMetaverse.NetworkManager.DefaultLoginParams(System.String,System.String,System.String,System.String,System.String)">
-            <summary>
-            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.NetworkManager.Login(System.String,System.String,System.String,System.String,System.String)">
-            <summary>
-            Simplified login that takes the most common and required fields
-            </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)">
-            <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
-            </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 name="F:OpenMetaverse.AssetManager.m_ImageReceiveProgressEvent">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.Login(OpenMetaverse.LoginParams)">
-            <summary>
-            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 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.NetworkManager.StartLocation(System.String,System.Int32,System.Int32,System.Int32)">
-            <summary>
-            Build a start location URI for passing to the Login function
-            </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 name="F:OpenMetaverse.AssetManager.m_ImageReceiveProgressLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.RemoteLoginHandler(OpenMetaverse.LoginResponseData,OpenMetaverse.LoginParams)">
-            <summary>
-            LoginParams and the initial login XmlRpcRequest were made on a remote machine.
-            This method now initializes libomv with the results.
-            </summary>
+        <member name="F:OpenMetaverse.AssetManager.Cache">
+            <summary>Texture download cache</summary>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.LoginReplyXmlRpcHandler(Nwc.XmlRpc.XmlRpcResponse,OpenMetaverse.LoginParams)">
+        <member name="M:OpenMetaverse.AssetManager.#ctor(OpenMetaverse.GridClient)">
             <summary>
-            Handles response from XML-RPC login replies
+            Default constructor
             </summary>
+            <param name="client">A reference to the GridClient object</param>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.LoginReplyXmlRpcHandler(OpenMetaverse.LoginResponseData,OpenMetaverse.LoginParams)">
+        <member name="M:OpenMetaverse.AssetManager.RequestAsset(OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean,OpenMetaverse.AssetManager.AssetReceivedCallback)">
             <summary>
-            Handles response from XML-RPC login replies with already parsed LoginResponseData
+            Request an asset download
             </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>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.LoginReplyLLSDHandler(OpenMetaverse.Http.CapsClient,OpenMetaverse.StructuredData.OSD,System.Exception)">
+        <member name="M:OpenMetaverse.AssetManager.RequestAsset(OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean,OpenMetaverse.SourceType,OpenMetaverse.AssetManager.AssetReceivedCallback)">
             <summary>
-            Handle response from LLSD login replies
+            Request an asset download
             </summary>
-            <param name="client">
-            </param>
-            <param name="result">
-            </param>
-            <param name="error">
-            </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.GetPlatform">
+        <member name="M:OpenMetaverse.AssetManager.RequestAsset(OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean,OpenMetaverse.SourceType,OpenMetaverse.UUID,OpenMetaverse.AssetManager.AssetReceivedCallback)">
             <summary>
-            Get current OS
+            Request an asset download
             </summary>
-            <returns>Either "Win" or "Linux"</returns>
+            <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.GetMAC">
+        <member name="M:OpenMetaverse.AssetManager.RequestAssetXfer(System.String,System.Boolean,System.Boolean,OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean)">
             <summary>
-            Get clients default Mac Address
+            Request an asset download through the almost deprecated Xfer system
             </summary>
-            <returns>A string containing the first found Mac Address</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>
-        <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.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.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.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.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="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="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>
+            <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.RegisterCallback(OpenMetaverse.Packets.PacketType,System.EventHandler{OpenMetaverse.PacketReceivedEventArgs})">
+        <member name="M:OpenMetaverse.AssetManager.RequestInventoryAsset(OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.AssetType,System.Boolean,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
+            
             </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">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.RegisterCallback(OpenMetaverse.Packets.PacketType,System.EventHandler{OpenMetaverse.PacketReceivedEventArgs},System.Boolean)">
+        <member name="M:OpenMetaverse.AssetManager.SetPendingAssetUploadData(OpenMetaverse.AssetUpload)">
             <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
+            Used to force asset data into the PendingUpload property, ie: for raw terrain uploads
             </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="assetData">An AssetUpload object containing the data to upload to the simulator</param>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.UnregisterCallback(OpenMetaverse.Packets.PacketType,System.EventHandler{OpenMetaverse.PacketReceivedEventArgs})">
+        <member name="M:OpenMetaverse.AssetManager.RequestUpload(OpenMetaverse.Assets.Asset,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 be uploaded to the simulator
             </summary>
-            <param name="type">Packet type this callback is registered with</param>
-            <param name="callback">Callback to stop firing events for</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.RegisterEventCallback(System.String,OpenMetaverse.Caps.EventQueueCallback)">
+        <member name="M:OpenMetaverse.AssetManager.RequestUpload(OpenMetaverse.AssetType,System.Byte[],System.Boolean)">
             <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
+            Request an asset be uploaded to the simulator
             </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="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.UnregisterEventCallback(System.String,OpenMetaverse.Caps.EventQueueCallback)">
+        <member name="M:OpenMetaverse.AssetManager.RequestUpload(OpenMetaverse.UUID@,OpenMetaverse.AssetType,System.Byte[],System.Boolean)">
             <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
+            Request an asset be uploaded to the simulator
             </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="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.SendPacket(OpenMetaverse.Packets.Packet)">
+        <member name="M:OpenMetaverse.AssetManager.RequestUpload(OpenMetaverse.UUID@,OpenMetaverse.AssetType,System.Byte[],System.Boolean,OpenMetaverse.UUID)">
             <summary>
-            Send a packet to the simulator the avatar is currently occupying
+            Initiate an asset upload
             </summary>
-            <param name="packet">Packet to send</param>
+            <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.SendPacket(OpenMetaverse.Packets.Packet,OpenMetaverse.Simulator)">
-            <summary>
-            Send a packet to a specified simulator
-            </summary>
-            <param name="packet">Packet to send</param>
-            <param name="simulator">Simulator to send the packet to</param>
+        <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>
-        <member name="M:OpenMetaverse.NetworkManager.Connect(System.Net.IPAddress,System.UInt16,System.UInt64,System.Boolean,System.String)">
+        <member name="M:OpenMetaverse.AssetManager.RequestImage(OpenMetaverse.UUID,OpenMetaverse.TextureDownloadCallback)">
             <summary>
-            Connect to a 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="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="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.Connect(System.Net.IPEndPoint,System.UInt64,System.Boolean,System.String)">
+        <member name="M:OpenMetaverse.AssetManager.RequestImage(OpenMetaverse.UUID,OpenMetaverse.ImageType,OpenMetaverse.TextureDownloadCallback)">
             <summary>
-            Connect to a 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="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="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.Logout">
+        <member name="M:OpenMetaverse.AssetManager.RequestImage(OpenMetaverse.UUID,OpenMetaverse.ImageType,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
+            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="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.RequestLogout">
+        <member name="M:OpenMetaverse.AssetManager.RequestImageCancel(OpenMetaverse.UUID)">
             <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
+            Cancel a texture request
             </summary>
+            <param name="textureID">The texture assets <see cref="T:OpenMetaverse.UUID"/></param>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.DisconnectSim(OpenMetaverse.Simulator,System.Boolean)">
+        <member name="M:OpenMetaverse.AssetManager.RequestMesh(OpenMetaverse.UUID,OpenMetaverse.AssetManager.MeshDownloadCallback)">
             <summary>
-            Close a connection to the given simulator
+            Requests download of a mesh asset
             </summary>
-            <param name="simulator">
-            </param>
-            <param name="sendCloseCircuit">
-            </param>
-        </member>
-        <member name="M:OpenMetaverse.NetworkManager.Shutdown(OpenMetaverse.NetworkManager.DisconnectType)">
-            <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>
-        </member>
-        <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>
+            <param name="meshID">UUID of the mesh asset</param>
+            <param name="callback">Callback when the request completes</param>
         </member>
-        <member name="M:OpenMetaverse.NetworkManager.FindSimulator(System.Net.IPEndPoint)">
+        <member name="M:OpenMetaverse.AssetManager.RequestServerBakedImage(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,OpenMetaverse.TextureDownloadCallback)">
             <summary>
-            Searches through the list of currently connected simulators to find
-            one attached to the given IPEndPoint
+            Fetach avatar texture on a grid capable of server side baking
             </summary>
-            <param name="endPoint">IPEndPoint of the Simulator to search for</param>
-            <returns>A Simulator reference on success, otherwise null</returns>
+            <param name="avatarID">ID of the avatar</param>
+            <param name="textureID">ID of the texture</param>
+            <param name="bakeName">Name of the part of the avatar texture applies to</param>
+            <param name="callback">Callback invoked on operation completion</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="T:OpenMetaverse.NameValue">
-            <summary>
-            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="M:OpenMetaverse.NameValue.#ctor(System.String,OpenMetaverse.NameValue.ValueType,OpenMetaverse.NameValue.ClassType,OpenMetaverse.NameValue.SendtoType,System.Object)">
-            <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)">
-            <summary>
-            Constructor that takes a single line from a NameValue field
-            </summary>
-            <param name="data">
-            </param>
-        </member>
-        <member name="T:OpenMetaverse.NameValue.ValueType">
-            <summary>Type of the value</summary>
-        </member>
-        <member name="F:OpenMetaverse.NameValue.ValueType.Unknown">
-            <summary>Unknown</summary>
-        </member>
-        <member name="F:OpenMetaverse.NameValue.ValueType.String">
-            <summary>String value</summary>
-        </member>
-        <member name="F:OpenMetaverse.NameValue.ValueType.F32">
-            <summary>
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.NameValue.ValueType.S32">
-            <summary>
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.NameValue.ValueType.VEC3">
-            <summary>
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.NameValue.ValueType.U32">
-            <summary>
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.NameValue.ValueType.CAMERA">
-            <summary>Deprecated</summary>
-        </member>
-        <member name="F:OpenMetaverse.NameValue.ValueType.Asset">
-            <summary>String value, but designated as an asset</summary>
-        </member>
-        <member name="F:OpenMetaverse.NameValue.ValueType.U64">
-            <summary>
-            </summary>
-        </member>
-        <member name="T:OpenMetaverse.NameValue.ClassType">
-            <summary>
-            </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="F:OpenMetaverse.NameValue.ClassType.Unknown">
-            <summary>
-            </summary>
+        <member name="E:OpenMetaverse.AssetManager.XferReceived">
+            <summary>Raised when the simulator responds sends </summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ClassType.ReadOnly">
-            <summary>
-            </summary>
+        <member name="E:OpenMetaverse.AssetManager.AssetUploaded">
+            <summary>Raised during upload completes</summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ClassType.ReadWrite">
-            <summary>
-            </summary>
+        <member name="E:OpenMetaverse.AssetManager.UploadProgress">
+            <summary>Raised during upload with progres update</summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.ClassType.Callback">
-            <summary>
-            </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="T:OpenMetaverse.NameValue.SendtoType">
-            <summary>
-            </summary>
+        <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="F:OpenMetaverse.NameValue.SendtoType.Unknown">
+        <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="F:OpenMetaverse.NameValue.SendtoType.Sim">
+        <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="F:OpenMetaverse.NameValue.SendtoType.DataSim">
+        <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.NameValue.SendtoType.SimViewer">
-            <summary>
-            </summary>
+        <member name="P:OpenMetaverse.XferReceivedEventArgs.Xfer">
+            <summary>Xfer data</summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.SendtoType.DataSimViewer">
-            <summary>
-            </summary>
+        <member name="P:OpenMetaverse.AssetUploadEventArgs.Upload">
+            <summary>Upload data</summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.Name">
-            <summary>
-            </summary>
+        <member name="P:OpenMetaverse.InitiateDownloadEventArgs.SimFileName">
+            <summary>Filename used on the simulator</summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.Type">
-            <summary>
-            </summary>
+        <member name="P:OpenMetaverse.InitiateDownloadEventArgs.ViewerFileName">
+            <summary>Filename used by the client</summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.Class">
-            <summary>
-            </summary>
+        <member name="P:OpenMetaverse.ImageReceiveProgressEventArgs.ImageID">
+            <summary>UUID of the image that is in progress</summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.Sendto">
-            <summary>
-            </summary>
+        <member name="P:OpenMetaverse.ImageReceiveProgressEventArgs.Received">
+            <summary>Number of bytes received so far</summary>
         </member>
-        <member name="F:OpenMetaverse.NameValue.Value">
-            <summary>
-            </summary>
+        <member name="P:OpenMetaverse.ImageReceiveProgressEventArgs.Total">
+            <summary>Image size in bytes</summary>
         </member>
-        <member name="T:OpenMetaverse.ReportType">
+        <member name="T:OpenMetaverse.Assets.AssetScriptText">
             <summary>
+            Represents an LSL Text object containing a string of UTF encoded characters
             </summary>
         </member>
-        <member name="F:OpenMetaverse.ReportType.None">
-            <summary>No report</summary>
-        </member>
-        <member name="F:OpenMetaverse.ReportType.Unknown">
-            <summary>Unknown report type</summary>
-        </member>
-        <member name="F:OpenMetaverse.ReportType.Bug">
-            <summary>Bug report</summary>
-        </member>
-        <member name="F:OpenMetaverse.ReportType.Complaint">
-            <summary>Complaint report</summary>
+        <member name="F:OpenMetaverse.Assets.AssetScriptText.Source">
+            <summary>A string of characters represting the script contents</summary>
         </member>
-        <member name="F:OpenMetaverse.ReportType.CustomerServiceRequest">
-            <summary>Customer service report</summary>
+        <member name="M:OpenMetaverse.Assets.AssetScriptText.#ctor">
+            <summary>Initializes a new AssetScriptText object</summary>
         </member>
-        <member name="T:OpenMetaverse.CompressedFlags">
+        <member name="M:OpenMetaverse.Assets.AssetScriptText.#ctor(OpenMetaverse.UUID,System.Byte[])">
             <summary>
-            Bitflag field for ObjectUpdateCompressed data blocks, describing
-            which options are present for each object
+            Initializes a new AssetScriptText 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.CompressedFlags.ScratchPad">
-            <summary>Unknown</summary>
-        </member>
-        <member name="F:OpenMetaverse.CompressedFlags.Tree">
-            <summary>Whether the object has a TreeSpecies</summary>
-        </member>
-        <member name="F:OpenMetaverse.CompressedFlags.HasText">
-            <summary>Whether the object has floating text ala llSetText</summary>
-        </member>
-        <member name="F:OpenMetaverse.CompressedFlags.HasParticles">
-            <summary>Whether the object has an active particle system</summary>
-        </member>
-        <member name="F:OpenMetaverse.CompressedFlags.HasSound">
-            <summary>Whether the object has sound attached to it</summary>
-        </member>
-        <member name="F:OpenMetaverse.CompressedFlags.HasParent">
-            <summary>Whether the object is attached to a root object or not</summary>
-        </member>
-        <member name="F:OpenMetaverse.CompressedFlags.TextureAnimation">
-            <summary>Whether the object has texture animation settings</summary>
-        </member>
-        <member name="F:OpenMetaverse.CompressedFlags.HasAngularVelocity">
-            <summary>Whether the object has an angular velocity</summary>
-        </member>
-        <member name="F:OpenMetaverse.CompressedFlags.HasNameValues">
-            <summary>Whether the object has a name value pairs string</summary>
-        </member>
-        <member name="F:OpenMetaverse.CompressedFlags.MediaURL">
-            <summary>Whether the object has a Media URL set</summary>
-        </member>
-        <member name="T:OpenMetaverse.UpdateType">
+        <member name="M:OpenMetaverse.Assets.AssetScriptText.Encode">
             <summary>
-            Specific Flags for MultipleObjectUpdate requests
+            Encode a string containing the scripts contents into byte encoded AssetData
             </summary>
         </member>
-        <member name="F:OpenMetaverse.UpdateType.None">
-            <summary>None</summary>
-        </member>
-        <member name="F:OpenMetaverse.UpdateType.Position">
-            <summary>Change position of prims</summary>
-        </member>
-        <member name="F:OpenMetaverse.UpdateType.Rotation">
-            <summary>Change rotation of prims</summary>
-        </member>
-        <member name="F:OpenMetaverse.UpdateType.Scale">
-            <summary>Change size of prims</summary>
-        </member>
-        <member name="F:OpenMetaverse.UpdateType.Linked">
-            <summary>Perform operation on link set</summary>
-        </member>
-        <member name="F:OpenMetaverse.UpdateType.Uniform">
-            <summary>Scale prims uniformly, same as selecing ctrl+shift in the
-            viewer. Used in conjunction with Scale</summary>
-        </member>
-        <member name="T:OpenMetaverse.PayPriceType">
+        <member name="M:OpenMetaverse.Assets.AssetScriptText.Decode">
             <summary>
-            Special values in PayPriceReply. If the price is not one of these
-            literal value of the price should be use
+            Decode a byte array containing the scripts contents into a string
             </summary>
+            <returns>true if decoding is successful</returns>
         </member>
-        <member name="F:OpenMetaverse.PayPriceType.Hide">
-            <summary>
-            Indicates that this pay option should be hidden
-            </summary>
+        <member name="P:OpenMetaverse.Assets.AssetScriptText.AssetType">
+            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="F:OpenMetaverse.PayPriceType.Default">
+        <member name="T:OpenMetaverse.Assets.AssetScriptBinary">
             <summary>
-            Indicates that this pay option should have the default value
+            Represents an AssetScriptBinary object containing the 
+            LSO compiled bytecode of an LSL script
             </summary>
         </member>
-        <member name="T:OpenMetaverse.ObjectMovementUpdate">
-            <summary>
-            Contains the variables sent in an object update packet for objects.
-            Used to track position and movement of prims and avatars
-            </summary>
+        <member name="M:OpenMetaverse.Assets.AssetScriptBinary.#ctor">
+            <summary>Initializes a new instance of an AssetScriptBinary object</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectMovementUpdate.Avatar">
-            <summary>
-            </summary>
+        <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="F:OpenMetaverse.ObjectMovementUpdate.CollisionPlane">
+        <member name="M:OpenMetaverse.Assets.AssetScriptBinary.Encode">
             <summary>
+            TODO: Encodes a scripts contents into a LSO Bytecode file
             </summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectMovementUpdate.State">
+        <member name="M:OpenMetaverse.Assets.AssetScriptBinary.Decode">
             <summary>
+            TODO: Decode LSO Bytecode into a string
             </summary>
+            <returns>true</returns>
         </member>
-        <member name="F:OpenMetaverse.ObjectMovementUpdate.LocalID">
-            <summary>
-            </summary>
+        <member name="P:OpenMetaverse.Assets.AssetScriptBinary.AssetType">
+            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectMovementUpdate.Position">
+        <member name="T:OpenMetaverse.Assets.AssetCallingCard">
             <summary>
+            Represents a Callingcard with AvatarID and Position vector
             </summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectMovementUpdate.Velocity">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Assets.AssetCallingCard.AvatarID">
+            <summary>UUID of the Callingcard target avatar</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectMovementUpdate.Acceleration">
-            <summary>
-            </summary>
+        <member name="M:OpenMetaverse.Assets.AssetCallingCard.#ctor">
+            <summary>Construct an Asset of type Callingcard</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectMovementUpdate.Rotation">
+        <member name="M:OpenMetaverse.Assets.AssetCallingCard.#ctor(OpenMetaverse.UUID,System.Byte[])">
             <summary>
+            Construct an Asset object of type Callingcard
             </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.ObjectMovementUpdate.AngularVelocity">
+        <member name="M:OpenMetaverse.Assets.AssetCallingCard.#ctor(OpenMetaverse.UUID)">
             <summary>
+            Constuct an asset of type Callingcard
             </summary>
+            <param name="avatarID">UUID of the target avatar</param>
         </member>
-        <member name="F:OpenMetaverse.ObjectMovementUpdate.Textures">
+        <member name="M:OpenMetaverse.Assets.AssetCallingCard.Encode">
             <summary>
+            Encode the raw contents of a string with the specific Callingcard format
             </summary>
         </member>
-        <member name="T:OpenMetaverse.ObjectManager">
+        <member name="M:OpenMetaverse.Assets.AssetCallingCard.Decode">
             <summary>
-            Handles all network traffic related to prims and avatar positions and
-            movement.
+            Decode the raw asset data, populating the AvatarID and Position
             </summary>
+            <returns>true if the AssetData was successfully decoded to a UUID and Vector</returns>
         </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="P:OpenMetaverse.Assets.AssetCallingCard.AssetType">
+            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="T:OpenMetaverse.ObjectManager.ObjectMediaCallback">
+        <member name="T:OpenMetaverse.SoundManager">
             <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>
-        <member name="F:OpenMetaverse.ObjectManager.m_ObjectUpdateLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_ObjectProperties">
-            <summary>The event subscribers, null of no subscribers</summary>
-        </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="F:OpenMetaverse.ObjectManager.m_ObjectPropertiesUpdatedLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_ObjectPropertiesFamily">
+        <member name="F:OpenMetaverse.SoundManager.m_AttachedSound">
             <summary>The event subscribers, null of no subscribers</summary>
         </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 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.ObjectManager.m_AvatarUpdateLock">
+        <member name="F:OpenMetaverse.SoundManager.m_AttachedSoundLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_TerseObjectUpdate">
+        <member name="F:OpenMetaverse.SoundManager.m_AttachedSoundGainChange">
             <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_TerseObjectUpdateLock">
-            <summary>Thread sync lock object</summary>
-        </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_ObjectDataBlockUpdate">
-            <summary>The event subscribers, null of no subscribers</summary>
+        <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.ObjectManager.m_ObjectDataBlockUpdateLock">
+        <member name="F:OpenMetaverse.SoundManager.m_AttachedSoundGainChangeLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_KillObject">
+        <member name="F:OpenMetaverse.SoundManager.m_SoundTrigger">
             <summary>The event subscribers, null of no subscribers</summary>
         </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 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.ObjectManager.m_AvatarSitChangedLock">
+        <member name="F:OpenMetaverse.SoundManager.m_SoundTriggerLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.m_PayPriceReply">
+        <member name="F:OpenMetaverse.SoundManager.m_PreloadSound">
             <summary>The event subscribers, null of no subscribers</summary>
         </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 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.ObjectManager.m_PhysicsPropertiesLock">
+        <member name="F:OpenMetaverse.SoundManager.m_PreloadSoundLock">
             <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.ObjectManager.Client">
-            <summary>Reference to the GridClient object</summary>
-        </member>
-        <member name="F:OpenMetaverse.ObjectManager.InterpolationTimer">
-            <summary>Does periodic dead reckoning calculation to convert
-            velocity and acceleration to new positions for objects</summary>
-        </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="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" />
-            you are currently connected to
-            </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>
-        </member>
-        <member name="M:OpenMetaverse.ObjectManager.RequestObjects(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32})">
-            <summary>
-            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="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>
-            </example>
-        </member>
-        <member name="M:OpenMetaverse.ObjectManager.RequestPayPrice(OpenMetaverse.Simulator,OpenMetaverse.UUID)">
-            <summary>
-            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="objectID">The ID of the object</param>
-            <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
-            </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" />
-        </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
-            </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="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" />
-        </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>
-            <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" />
-        </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>
-            <param name="localIDs">An array containing the Local IDs of the objects</param>
-            <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="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="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>
-            <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="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="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="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="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="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>
-            <param name="faceIndex">The face of the position to touch</param>
-            <param name="position">The region coordinates of the position to touch</param>
-            <param name="normal">The surface normal of the position to touch (A normal is a vector perpindicular to the surface)</param>
-            <param name="binormal">The surface binormal of the position to touch (A binormal is a vector tangen to the surface
-            pointing along the U direction of the tangent space</param>
-        </member>
-        <member name="M:OpenMetaverse.ObjectManager.AddPrim(OpenMetaverse.Simulator,OpenMetaverse.Primitive.ConstructionData,OpenMetaverse.UUID,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Quaternion)">
-            <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="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>
-            <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
-            follow up by moving the object after it has been created. This
-            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="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>
-            <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
-            follow up by moving the object after it has been created. This
-            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="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,
-            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>
-        <member name="M:OpenMetaverse.ObjectManager.AddGrass(OpenMetaverse.Simulator,OpenMetaverse.Vector3,OpenMetaverse.Quaternion,OpenMetaverse.Vector3,OpenMetaverse.Grass,OpenMetaverse.UUID)">
-            <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="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,
-            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="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>
-        <member name="M:OpenMetaverse.ObjectManager.SetTextures(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Primitive.TextureEntry,System.String)">
-            <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="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>
-        </member>
-        <member name="M:OpenMetaverse.ObjectManager.SetLight(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Primitive.LightData)">
-            <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="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>
-        </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="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>
-        </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="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>
-        </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="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>
-        <member name="M:OpenMetaverse.ObjectManager.LinkPrims(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32})">
-            <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="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>
-        <member name="M:OpenMetaverse.ObjectManager.DelinkPrims(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32})">
-            <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="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="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>
-        <member name="M:OpenMetaverse.ObjectManager.SetName(OpenMetaverse.Simulator,System.UInt32,System.String)">
-            <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="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>
-        <member name="M:OpenMetaverse.ObjectManager.SetNames(OpenMetaverse.Simulator,System.UInt32[],System.String[])">
-            <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="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>
-        <member name="M:OpenMetaverse.ObjectManager.SetDescription(OpenMetaverse.Simulator,System.UInt32,System.String)">
-            <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="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>
-        <member name="M:OpenMetaverse.ObjectManager.SetDescriptions(OpenMetaverse.Simulator,System.UInt32[],System.String[])">
-            <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="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>
-        <member name="M:OpenMetaverse.ObjectManager.AttachObject(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.AttachmentPoint,OpenMetaverse.Quaternion)">
-            <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="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>
-        </member>
-        <member name="M:OpenMetaverse.ObjectManager.DropObject(OpenMetaverse.Simulator,System.UInt32)">
-            <summary>
-            Drop an attached object from this avatar
-            </summary>
-            <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>
-        </member>
-        <member name="M:OpenMetaverse.ObjectManager.DetachObjects(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32})">
-            <summary>
-            Detach an object from yourself
-            </summary>
-            <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>
-        </member>
-        <member name="M:OpenMetaverse.ObjectManager.SetPosition(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Vector3)">
-            <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="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>
-        <member name="M:OpenMetaverse.ObjectManager.SetPosition(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Vector3,System.Boolean)">
-            <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="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>
-        </member>
-        <member name="M:OpenMetaverse.ObjectManager.SetScale(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Vector3,System.Boolean,System.Boolean)">
-            <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="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>
-            <param name="uniform">True to resize prims uniformly</param>
-        </member>
-        <member name="M:OpenMetaverse.ObjectManager.SetRotation(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Quaternion,System.Boolean)">
-            <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="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>
-        </member>
-        <member name="M:OpenMetaverse.ObjectManager.UpdateObject(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Vector3,OpenMetaverse.UpdateType)">
-            <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="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>
-        </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="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>
-        </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="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>
-        </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="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">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>
-        </member>
-        <member name="M:OpenMetaverse.ObjectManager.RequestObjectPropertiesFamily(OpenMetaverse.Simulator,OpenMetaverse.UUID,System.Boolean)">
+        <member name="M:OpenMetaverse.SoundManager.#ctor(OpenMetaverse.GridClient)">
             <summary>
-            Request additional properties for an object
+            Construct a new instance of the SoundManager class, used for playing and receiving
+            sound assets
             </summary>
-            <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>
+            <param name="client">A reference to the current GridClient instance</param>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.SetObjectsGroup(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32},OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.SoundManager.PlaySound(OpenMetaverse.UUID)">
             <summary>
-            Set the ownership of a list of objects to the specified group
+            Plays a sound in the current region at full volume from avatar position
             </summary>
-            <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>
+            <param name="soundID">UUID of the sound to be played</param>
         </member>
-        <member name="M:OpenMetaverse.ObjectManager.NavigateObjectMedia(OpenMetaverse.UUID,System.Int32,System.String,OpenMetaverse.Simulator)">
+        <member name="M:OpenMetaverse.SoundManager.SendSoundTrigger(OpenMetaverse.UUID,OpenMetaverse.Vector3)">
             <summary>
-            Update current URL of the previously set prim media
+            Plays a sound in the current region at full volume
             </summary>
-            <param name="primID">UUID of the prim</param>
-            <param name="newURL">Set current URL to this</param>
-            <param name="face">Prim face number</param>
-            <param name="sim">Simulator in which prim is located</param>
+            <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.ObjectManager.UpdateObjectMedia(OpenMetaverse.UUID,OpenMetaverse.MediaEntry[],OpenMetaverse.Simulator)">
+        <member name="M:OpenMetaverse.SoundManager.SendSoundTrigger(OpenMetaverse.UUID,OpenMetaverse.Vector3,System.Single)">
             <summary>
-            Set object media
+            Plays a sound in the current region
             </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>
-            <param name="sim">Simulatior in which prim is located</param>
+            <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.ObjectManager.RequestObjectMedia(OpenMetaverse.UUID,OpenMetaverse.Simulator,OpenMetaverse.ObjectManager.ObjectMediaCallback)">
+        <member name="M:OpenMetaverse.SoundManager.SendSoundTrigger(OpenMetaverse.UUID,OpenMetaverse.Simulator,OpenMetaverse.Vector3,System.Single)">
             <summary>
-            Retrieve information about object media
+            Plays a sound in the specified sim
             </summary>
-            <param name="primID">UUID of the primitive</param>
-            <param name="sim">Simulator where prim is located</param>
-            <param name="callback">Call this callback when done</param>
-        </member>
-        <member name="M:OpenMetaverse.ObjectManager.ObjectUpdateHandler(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>
+            <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.ObjectManager.ImprovedTerseObjectUpdateHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <member name="M:OpenMetaverse.SoundManager.SendSoundTrigger(OpenMetaverse.UUID,System.UInt64,OpenMetaverse.Vector3,System.Single)">
             <summary>
-            A terse object update, used when a transformation matrix or
-            velocity/acceleration for an object changes but nothing else
-            (scale/position/rotation/acceleration/velocity)
+            Play a sound asset
             </summary>
-            <param name="sender">The sender</param>
-            <param name="e">The EventArgs object containing the packet data</param>
-        </member>
-        <member name="M:OpenMetaverse.ObjectManager.ObjectUpdateCompressedHandler(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.ObjectManager.ObjectUpdateCachedHandler(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>
+            <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.ObjectManager.KillObjectHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <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.ObjectManager.ObjectPropertiesHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <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.ObjectManager.ObjectPropertiesFamilyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <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.ObjectManager.PayPriceReplyHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
+        <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="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>
-        </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>
-        </member>
-        <member name="M:OpenMetaverse.ObjectManager.UpdateDilation(OpenMetaverse.Simulator,System.UInt32)">
-            <summary>
-            </summary>
-            <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="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>
-        <member name="M:OpenMetaverse.ObjectManager.SetMaterial(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Material)">
-            <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="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>
-        </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="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" />
-        </member>
-        <member name="M:OpenMetaverse.PrimEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.Primitive,System.UInt16,System.Boolean,System.Boolean)">
-            <summary>
-            Construct a new instance of the PrimEventArgs class
-            </summary>
-            <param name="simulator">The simulator the object originated from</param>
-            <param name="prim">The Primitive</param>
-            <param name="timeDilation">The simulator time dilation</param>
-            <param name="isNew">The prim was not in the dictionary before this update</param>
-            <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>
-        </member>
-        <member name="P:OpenMetaverse.PrimEventArgs.Prim">
-            <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>
-        </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>
-        </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" />
-        </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="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>
-        <member name="P:OpenMetaverse.AvatarUpdateEventArgs.Simulator">
-            <summary>Get the simulator the object originated from</summary>
+        <member name="E:OpenMetaverse.SoundManager.AttachedSound">
+            <summary>Raised when the simulator sends us data containing
+            sound</summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarUpdateEventArgs.Avatar">
-            <summary>Get the <see cref="T:OpenMetaverse.Avatar" /> data</summary>
+        <member name="E:OpenMetaverse.SoundManager.AttachedSoundGainChange">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarUpdateEventArgs.TimeDilation">
-            <summary>Get the simulator time dilation</summary>
+        <member name="E:OpenMetaverse.SoundManager.SoundTrigger">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarUpdateEventArgs.IsNew">
-            <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 name="E:OpenMetaverse.SoundManager.PreloadSound">
+            <summary>Raised when the simulator sends us data containing
+            ...</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,System.Boolean)" /> request is
-            made.</para>
-            </remarks>
+        <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 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.
+            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 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>
-            Construct a new instance of the ObjectPropertiesEventArgs class
-            </summary>
-            <param name="simulator">The simulator the object is located</param>
-            <param name="props">The primitive Properties</param>
-        </member>
-        <member name="P:OpenMetaverse.ObjectPropertiesEventArgs.Simulator">
-            <summary>Get the simulator the object is located</summary>
-        </member>
-        <member name="P:OpenMetaverse.ObjectPropertiesEventArgs.Properties">
-            <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="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>
-            <param name="simulator">The simulator the object is located</param>
-            <param name="prim">The Primitive</param>
-            <param name="props">The primitive Properties</param>
-        </member>
-        <member name="P:OpenMetaverse.ObjectPropertiesUpdatedEventArgs.Simulator">
-            <summary>Get the simulator the object is located</summary>
-        </member>
-        <member name="P:OpenMetaverse.ObjectPropertiesUpdatedEventArgs.Prim">
-            <summary>Get the primitive details</summary>
-        </member>
-        <member name="P:OpenMetaverse.ObjectPropertiesUpdatedEventArgs.Properties">
-            <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
-            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,System.Boolean)" /> request is
-            made, the viewer equivalent is hovering the mouse cursor over an object</para>
-            </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>
-        </member>
-        <member name="P:OpenMetaverse.ObjectPropertiesFamilyEventArgs.Type">
-            <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>
-            </remarks>
-        </member>
-        <member name="P:OpenMetaverse.TerseObjectUpdateEventArgs.Simulator">
-            <summary>Get the simulator the object is located</summary>
-        </member>
-        <member name="P:OpenMetaverse.TerseObjectUpdateEventArgs.Prim">
-            <summary>Get the primitive details</summary>
-        </member>
-        <member name="P:OpenMetaverse.TerseObjectUpdateEventArgs.Update">
-            <summary>
-            </summary>
-        </member>
-        <member name="P:OpenMetaverse.TerseObjectUpdateEventArgs.TimeDilation">
-            <summary>
-            </summary>
-        </member>
-        <member name="T:OpenMetaverse.ObjectDataBlockUpdateEventArgs">
-            <summary>
-            </summary>
-        </member>
-        <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.Simulator">
-            <summary>Get the simulator the object is located</summary>
-        </member>
-        <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.Prim">
-            <summary>Get the primitive details</summary>
-        </member>
-        <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.ConstructionData">
-            <summary>
-            </summary>
-        </member>
-        <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.Block">
-            <summary>
-            </summary>
-        </member>
-        <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.Update">
-            <summary>
-            </summary>
+                // 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="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.NameValues">
+        <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="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>
+        <member name="P:OpenMetaverse.AttachedSoundEventArgs.Simulator">
+            <summary>Simulator where the event originated</summary>
         </member>
-        <member name="P:OpenMetaverse.KillObjectEventArgs.Simulator">
-            <summary>Get the simulator the object is located</summary>
+        <member name="P:OpenMetaverse.AttachedSoundEventArgs.SoundID">
+            <summary>Get the sound asset id</summary>
         </member>
-        <member name="P:OpenMetaverse.KillObjectEventArgs.ObjectLocalID">
-            <summary>The LocalID of the object</summary>
+        <member name="P:OpenMetaverse.AttachedSoundEventArgs.OwnerID">
+            <summary>Get the ID of the owner</summary>
         </member>
-        <member name="T:OpenMetaverse.AvatarSitChangedEventArgs">
-            <summary>
-            Provides updates sit position data
-            </summary>
+        <member name="P:OpenMetaverse.AttachedSoundEventArgs.ObjectID">
+            <summary>Get the ID of the Object</summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarSitChangedEventArgs.Simulator">
-            <summary>Get the simulator the object is located</summary>
+        <member name="P:OpenMetaverse.AttachedSoundEventArgs.Gain">
+            <summary>Get the volume level</summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarSitChangedEventArgs.Avatar">
-            <summary>
-            </summary>
+        <member name="P:OpenMetaverse.AttachedSoundEventArgs.Flags">
+            <summary>Get the <see cref="T:OpenMetaverse.SoundFlags"/></summary>
         </member>
-        <member name="P:OpenMetaverse.AvatarSitChangedEventArgs.SittingOn">
-            <summary>
-            </summary>
+        <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="P:OpenMetaverse.AvatarSitChangedEventArgs.OldSeat">
+        <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="T:OpenMetaverse.PayPriceReplyEventArgs">
-            <summary>
-            </summary>
+        <member name="P:OpenMetaverse.AttachedSoundGainChangeEventArgs.Simulator">
+            <summary>Simulator where the event originated</summary>
         </member>
-        <member name="P:OpenMetaverse.PayPriceReplyEventArgs.Simulator">
-            <summary>Get the simulator the object is located</summary>
+        <member name="P:OpenMetaverse.AttachedSoundGainChangeEventArgs.ObjectID">
+            <summary>Get the ID of the Object</summary>
         </member>
-        <member name="P:OpenMetaverse.PayPriceReplyEventArgs.ObjectID">
-            <summary>
-            </summary>
+        <member name="P:OpenMetaverse.AttachedSoundGainChangeEventArgs.Gain">
+            <summary>Get the volume level</summary>
         </member>
-        <member name="P:OpenMetaverse.PayPriceReplyEventArgs.DefaultPrice">
-            <summary>
-            </summary>
+        <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="P:OpenMetaverse.PayPriceReplyEventArgs.ButtonPrices">
+        <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.ObjectMediaEventArgs.Success">
-            <summary>
-            Indicates if the operation was successful
-            </summary>
+        <member name="P:OpenMetaverse.SoundTriggerEventArgs.Simulator">
+            <summary>Simulator where the event originated</summary>
         </member>
-        <member name="P:OpenMetaverse.ObjectMediaEventArgs.Version">
-            <summary>
-            Media version string
-            </summary>
+        <member name="P:OpenMetaverse.SoundTriggerEventArgs.SoundID">
+            <summary>Get the sound asset id</summary>
         </member>
-        <member name="P:OpenMetaverse.ObjectMediaEventArgs.FaceMedia">
-            <summary>
-            Array of media entries indexed by face number
-            </summary>
+        <member name="P:OpenMetaverse.SoundTriggerEventArgs.OwnerID">
+            <summary>Get the ID of the owner</summary>
         </member>
-        <member name="T:OpenMetaverse.PhysicsPropertiesEventArgs">
-            <summary>
-            Set when simulator sends us infomation on primitive's physical properties
-            </summary>
+        <member name="P:OpenMetaverse.SoundTriggerEventArgs.ObjectID">
+            <summary>Get the ID of the Object</summary>
         </member>
-        <member name="M:OpenMetaverse.PhysicsPropertiesEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.Primitive.PhysicsProperties)">
-            <summary>
-            Constructor
-            </summary>
-            <param name="sim">Simulator where the message originated</param>
-            <param name="props">Updated physical properties</param>
+        <member name="P:OpenMetaverse.SoundTriggerEventArgs.ParentID">
+            <summary>Get the ID of the objects parent</summary>
         </member>
-        <member name="F:OpenMetaverse.PhysicsPropertiesEventArgs.Simulator">
-            <summary>Simulator where the message originated</summary>
+        <member name="P:OpenMetaverse.SoundTriggerEventArgs.Gain">
+            <summary>Get the volume level</summary>
         </member>
-        <member name="F:OpenMetaverse.PhysicsPropertiesEventArgs.PhysicsProperties">
-            <summary>Updated physical properties</summary>
+        <member name="P:OpenMetaverse.SoundTriggerEventArgs.RegionHandle">
+            <summary>Get the regionhandle</summary>
         </member>
-        <member name="M:OpenMetaverse.UDPPacketBuffer.#ctor">
-            <summary>
-            Create an allocated UDP packet buffer for receiving a packet
-            </summary>
+        <member name="P:OpenMetaverse.SoundTriggerEventArgs.Position">
+            <summary>Get the source position</summary>
         </member>
-        <member name="M:OpenMetaverse.UDPPacketBuffer.#ctor(System.Net.IPEndPoint)">
-            <summary>
-            Create an allocated UDP packet buffer for sending a packet
-            </summary>
-            <param name="endPoint">EndPoint of the remote host</param>
+        <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.UDPPacketBuffer.#ctor(System.Net.IPEndPoint,System.Int32)">
+        <member name="M:OpenMetaverse.PreloadSoundEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
-            Create an allocated UDP packet buffer for sending a packet
+            Construct a new instance of the PreloadSoundEventArgs class
             </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="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="F:OpenMetaverse.UDPPacketBuffer.BUFFER_SIZE">
-            <summary>Size of the byte array used to store raw packet data</summary>
+        <member name="P:OpenMetaverse.PreloadSoundEventArgs.Simulator">
+            <summary>Simulator where the event originated</summary>
         </member>
-        <member name="F:OpenMetaverse.UDPPacketBuffer.Data">
-            <summary>Raw packet data buffer</summary>
+        <member name="P:OpenMetaverse.PreloadSoundEventArgs.SoundID">
+            <summary>Get the sound asset id</summary>
         </member>
-        <member name="F:OpenMetaverse.UDPPacketBuffer.DataLength">
-            <summary>Length of the data to transmit</summary>
+        <member name="P:OpenMetaverse.PreloadSoundEventArgs.OwnerID">
+            <summary>Get the ID of the owner</summary>
         </member>
-        <member name="F:OpenMetaverse.UDPPacketBuffer.RemoteEndPoint">
-            <summary>EndPoint of the remote host</summary>
+        <member name="P:OpenMetaverse.PreloadSoundEventArgs.ObjectID">
+            <summary>Get the ID of the Object</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>
+        <member name="F:OpenMetaverse.Voice.VoicePosition.Position">
+            <summary>Positional vector of the users position</summary>
         </member>
-        <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 name="F:OpenMetaverse.Voice.VoicePosition.Velocity">
+            <summary>Velocity vector of the position</summary>
         </member>
-        <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 name="F:OpenMetaverse.Voice.VoicePosition.AtOrientation">
+            <summary>At Orientation (X axis) of the position</summary>
         </member>
-        <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 name="F:OpenMetaverse.Voice.VoicePosition.UpOrientation">
+            <summary>Up Orientation (Y axis) of the position</summary>
         </member>
-        <member name="M:OpenMetaverse.Pool.#ctor">
-            <summary>
-            Default constructor
-            </summary>
+        <member name="F:OpenMetaverse.Voice.VoicePosition.LeftOrientation">
+            <summary>Left Orientation (Z axis) of the position</summary>
         </member>
-        <member name="M:OpenMetaverse.Pool.CheckOut">
+        <member name="T:OpenMetaverse.Rendering.FacetedMesh">
             <summary>
-            Check a packet buffer out of the pool
+            Contains all mesh faces that belong to a prim
             </summary>
-            <returns>A packet buffer object</returns>
         </member>
-        <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 name="F:OpenMetaverse.Rendering.FacetedMesh.Faces">
+            <summary>List of primitive faces</summary>
         </member>
-        <member name="M:OpenMetaverse.WrappedObject`1.Dispose">
+        <member name="M:OpenMetaverse.Rendering.FacetedMesh.TryDecodeFromAsset(OpenMetaverse.Primitive,OpenMetaverse.Assets.AssetMesh,OpenMetaverse.Rendering.DetailLevel,OpenMetaverse.Rendering.FacetedMesh@)">
             <summary>
-            Checks the instance back into the object pool
+            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.ObjectPoolBase`1.#ctor">
+        <member name="T:OpenMetaverse.Assets.GestureStepType">
             <summary>
-            Creates a new instance of the ObjectPoolBase class. Initialize MUST be called
-            after using this constructor.
+            Type of gesture step
             </summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectPoolBase`1.#ctor(System.Int32,System.Int32,System.Boolean,System.Int32)">
+        <member name="T:OpenMetaverse.Assets.GestureStep">
             <summary>
-            Creates a new instance of the ObjectPool Base class.
+            Base class for gesture steps
             </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="P:OpenMetaverse.ObjectPoolBase`1.TotalSegments">
+        <member name="P:OpenMetaverse.Assets.GestureStep.GestureStepType">
             <summary>
-            The total number of segments created. Intended to be used by the Unit Tests.
+            Retururns what kind of gesture step this is
             </summary>
         </member>
-        <member name="P:OpenMetaverse.ObjectPoolBase`1.ItemsPerSegment">
+        <member name="T:OpenMetaverse.Assets.GestureStepAnimation">
             <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.
+            Describes animation step of a gesture
             </summary>
         </member>
-        <member name="P:OpenMetaverse.ObjectPoolBase`1.MinimumSegmentCount">
+        <member name="F:OpenMetaverse.Assets.GestureStepAnimation.AnimationStart">
             <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.
+            If true, this step represents start of animation, otherwise animation stop
             </summary>
         </member>
-        <member name="P:OpenMetaverse.ObjectPoolBase`1.MinimumSegmentAgePriorToCleanup">
+        <member name="F:OpenMetaverse.Assets.GestureStepAnimation.ID">
             <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.
+            Animation asset <see cref="T:OpenMetaverse.UUID"/>
             </summary>
         </member>
-        <member name="P:OpenMetaverse.ObjectPoolBase`1.CleanupFrequencyMilliseconds">
+        <member name="F:OpenMetaverse.Assets.GestureStepAnimation.Name">
             <summary>
-            The frequence which the cleanup thread runs. This is typically
-            expected to be in the 5 minute range.
+            Animation inventory name
             </summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectPoolBase`1.ForceCleanup">
+        <member name="P:OpenMetaverse.Assets.GestureStepAnimation.GestureStepType">
             <summary>
-            Forces the segment cleanup algorithm to be run. This method is intended
-            primarly for use from the Unit Test libraries.
+            Returns what kind of gesture step this is
             </summary>
         </member>
-        <member name="M:OpenMetaverse.ObjectPoolBase`1.GetObjectInstance">
+        <member name="T:OpenMetaverse.Assets.GestureStepSound">
             <summary>
-            Responsible for allocate 1 instance of an object that will be stored in a segment.
+            Describes sound step of a gesture
             </summary>
-            <returns>An instance of whatever objec the pool is pooling.</returns>
         </member>
-        <member name="M:OpenMetaverse.ObjectPoolBase`1.CheckIn(OpenMetaverse.ObjectPoolSegment{`0},`0)">
+        <member name="F:OpenMetaverse.Assets.GestureStepSound.ID">
             <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.
+            Sound asset <see cref="T:OpenMetaverse.UUID"/>
             </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="M:OpenMetaverse.ObjectPoolBase`1.CheckOut">
+        <member name="F:OpenMetaverse.Assets.GestureStepSound.Name">
             <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.
+            Sound inventory name
             </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="T:OpenMetaverse.DictionaryEventAction">
+        <member name="P:OpenMetaverse.Assets.GestureStepSound.GestureStepType">
             <summary>
+            Returns what kind of gesture step this is
             </summary>
         </member>
-        <member name="F:OpenMetaverse.DictionaryEventAction.Add">
+        <member name="T:OpenMetaverse.Assets.GestureStepChat">
             <summary>
+            Describes sound step of a gesture
             </summary>
         </member>
-        <member name="F:OpenMetaverse.DictionaryEventAction.Remove">
+        <member name="F:OpenMetaverse.Assets.GestureStepChat.Text">
             <summary>
+            Text to output in chat
             </summary>
         </member>
-        <member name="F:OpenMetaverse.DictionaryEventAction.Change">
+        <member name="P:OpenMetaverse.Assets.GestureStepChat.GestureStepType">
             <summary>
+            Returns what kind of gesture step this is
             </summary>
         </member>
-        <member name="T:OpenMetaverse.ObservableDictionary`2">
+        <member name="T:OpenMetaverse.Assets.GestureStepWait">
             <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.
+            Describes sound step of a gesture
             </summary>
-            <typeparam name="TKey">Key <see langword="Tkey" /></typeparam>
-            <typeparam name="TValue">Value <see langword="TValue" /></typeparam>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.#ctor">
+        <member name="F:OpenMetaverse.Assets.GestureStepWait.WaitForAnimation">
             <summary>
-            Initializes a new instance of the <seealso cref="T:ObservableDictionary" /> Class
-            with the specified key/value, has the default initial capacity.
+            If true in this step we wait for all animations to finish
             </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="F:OpenMetaverse.Assets.GestureStepWait.WaitForTime">
             <summary>
-            Initializes a new instance of the <seealso cref="T:OpenMetaverse.ObservableDictionary" /> Class
-            with the specified key/value, With its initial capacity specified.
+            If true gesture player should wait for the specified amount of time
             </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.ObservableDictionary`2.Delegates">
+        <member name="F:OpenMetaverse.Assets.GestureStepWait.WaitTime">
             <summary>
-            A dictionary of callbacks to fire when specified action occurs
+            Time in seconds to wait if WaitForAnimation is false
             </summary>
         </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="P:OpenMetaverse.ObservableDictionary`2.Item(`0)">
+        <member name="P:OpenMetaverse.Assets.GestureStepWait.GestureStepType">
             <summary>
-            Indexer for the dictionary
+            Returns what kind of gesture step this is
             </summary>
-            <param name="key">The key</param>
-            <returns>The value</returns>
-        </member>
-        <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.ObservableDictionary`2.AddDelegate(OpenMetaverse.DictionaryEventAction,OpenMetaverse.DictionaryChangeCallback)">
+        <member name="T:OpenMetaverse.Assets.GestureStepEOF">
             <summary>
-            Register a callback to be fired when an action occurs
+            Describes the final step of a gesture
             </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="P:OpenMetaverse.Assets.GestureStepEOF.GestureStepType">
             <summary>
-            Unregister a callback
+            Returns what kind of gesture step this is
             </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.Assets.AssetGesture">
             <summary>
+            Represents a sequence of animations, sounds, and chat actions
             </summary>
-            <param name="action">
-            </param>
-            <param name="entry">
-            </param>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.TryGetValue(`0,`1@)">
+        <member name="F:OpenMetaverse.Assets.AssetGesture.TriggerKey">
             <summary>
-            Try to get entry from the <seealso cref="!:ObservableDictionary" /> with specified key
+            Keyboard key that triggers the gestyre
             </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="F:OpenMetaverse.Assets.AssetGesture.TriggerKeyMask">
             <summary>
-            Finds the specified match.
+            Modifier to the trigger key
             </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="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.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="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)">
+        <member name="F:OpenMetaverse.Assets.AssetGesture.Trigger">
             <summary>
-            Removes the specified key, dictionary locking is not performed
+            String that triggers playing of the gesture sequence
             </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">
+        <member name="F:OpenMetaverse.Assets.AssetGesture.ReplaceWith">
             <summary>
-            Clear the contents of the dictionary
+            Text that replaces trigger in chat once gesture is triggered
             </summary>
         </member>
-        <member name="M:OpenMetaverse.ObservableDictionary`2.GetEnumerator">
+        <member name="F:OpenMetaverse.Assets.AssetGesture.Sequence">
             <summary>
-            Enumerator for iterating dictionary entries
+            Sequence of gesture steps
             </summary>
-            <returns>
-            </returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.PacketDecoder.CustomPacketDecoder">
+        <member name="M:OpenMetaverse.Assets.AssetGesture.#ctor">
             <summary>
-            A custom decoder callback
+            Constructs guesture asset
             </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)">
+        <member name="M:OpenMetaverse.Assets.AssetGesture.#ctor(OpenMetaverse.UUID,System.Byte[])">
             <summary>
-            Add a custom decoder callback
+            Constructs guesture asset
             </summary>
-            <param name="key">The key of the field to decode</param>
-            <param name="customPacketHandler">The custom decode handler</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.Packets.PacketDecoder.RemoveCustomHandler(System.String,OpenMetaverse.Packets.PacketDecoder.CustomPacketDecoder)">
+        <member name="M:OpenMetaverse.Assets.AssetGesture.Encode">
             <summary>
-            Remove a custom decoder callback
+            Encodes gesture asset suitable for uplaod
             </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)">
+        <member name="M:OpenMetaverse.Assets.AssetGesture.Decode">
             <summary>
-            Creates a formatted string containing the values of a Packet
+            Decodes gesture assset into play sequence
             </summary>
-            <param name="packet">The Packet</param>
-            <returns>A formatted string of values of the nested items in the Packet object</returns>
+            <returns>true if the asset data was decoded successfully</returns>
         </member>
-        <member name="M:OpenMetaverse.Packets.PacketDecoder.MessageToString(System.Object,System.Int32)">
+        <member name="P:OpenMetaverse.Assets.AssetGesture.AssetType">
             <summary>
-            Decode an IMessage object into a beautifully formatted string
+            Returns asset type
             </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>
@@ -14581,8 +12969,7 @@
             </summary>
         </member>
         <member name="F:OpenMetaverse.ObjectReturnType.None">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.ObjectReturnType.Owner">
             <summary>Return objects owned by parcel owner</summary>
@@ -14817,11 +13204,11 @@
             <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
+            <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
+            <summary>Objects on this parcel are sold when the land is 
             purchsaed</summary>
         </member>
         <member name="F:OpenMetaverse.ParcelFlags.AllowPublish">
@@ -14846,7 +13233,7 @@
             <summary>Allow group-owned scripts to run</summary>
         </member>
         <member name="F:OpenMetaverse.ParcelFlags.CreateGroupObjects">
-            <summary>Allow object creation by group members or group
+            <summary>Allow object creation by group members or group 
             objects</summary>
         </member>
         <member name="F:OpenMetaverse.ParcelFlags.AllowAPrimitiveEntry">
@@ -14961,12 +13348,12 @@
             <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,
+            <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,
+            <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">
@@ -14979,15 +13366,15 @@
             <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,
+            <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
+            <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).
+            <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">
@@ -15006,7 +13393,7 @@
             <summary>Global Key of record</summary>
         </member>
         <member name="F:OpenMetaverse.ParcelInfo.OwnerID">
-            <summary>Parcel Owners <seealso cref="T:OpenMetaverse.UUID" /></summary>
+            <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>
@@ -15036,7 +13423,7 @@
             <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>
+            <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>
@@ -15059,7 +13446,7 @@
             <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
+            <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">
@@ -15082,14 +13469,8 @@
             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>
+            <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>
@@ -15107,8 +13488,7 @@
             <summary>Whether the land is deeded to a group or not</summary>
         </member>
         <member name="F:OpenMetaverse.Parcel.AuctionID">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Parcel.ClaimDate">
             <summary>Date land was claimed</summary>
@@ -15128,15 +13508,14 @@
             parcel</summary>
         </member>
         <member name="F:OpenMetaverse.Parcel.Bitmap">
-            <summary>Bitmap describing land layout in 4x4m squares across the
+            <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>
+            <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>
@@ -15156,7 +13535,7 @@
             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
+            <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>
@@ -15171,8 +13550,7 @@
             <summary>Autoreturn value in minutes for others' objects</summary>
         </member>
         <member name="F:OpenMetaverse.Parcel.Flags">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Parcel.SalePrice">
             <summary>Sale price of the parcel, only useful if ForSale is set</summary>
@@ -15190,8 +13568,7 @@
             <summary>URL For Music Stream</summary>
         </member>
         <member name="F:OpenMetaverse.Parcel.GroupID">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Parcel.PassPrice">
             <summary>Price for a temporary pass</summary>
@@ -15200,8 +13577,7 @@
             <summary>How long is pass valid for</summary>
         </member>
         <member name="F:OpenMetaverse.Parcel.Category">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Parcel.AuthBuyerID">
             <summary>Key of authorized buyer</summary>
@@ -15216,19 +13592,16 @@
             <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>
+            <summary>The type of landing enforced from the <see cref="T:OpenMetaverse.LandingType"/> enum</summary>
         </member>
         <member name="F:OpenMetaverse.Parcel.Dwell">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Parcel.RegionDenyAnonymous">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Parcel.RegionPushOverride">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Parcel.AccessWhiteList">
             <summary>Access list of who is whitelisted on this
@@ -15256,6 +13629,12 @@
             </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>
         <member name="M:OpenMetaverse.Parcel.Update(OpenMetaverse.Simulator,System.Boolean)">
             <summary>
             Update the simulator with any local changes to this Parcel object
@@ -15275,180 +13654,111 @@
             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="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="F:OpenMetaverse.ParcelManager.m_DwellReplyLock">
             <summary>Thread sync lock object</summary>
         </member>
         <member name="F:OpenMetaverse.ParcelManager.m_ParcelInfo">
             <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>
         <member name="F:OpenMetaverse.ParcelManager.m_ParcelInfoLock">
             <summary>Thread sync lock object</summary>
         </member>
         <member name="F:OpenMetaverse.ParcelManager.m_ParcelProperties">
             <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>
         <member name="F:OpenMetaverse.ParcelManager.m_ParcelPropertiesLock">
             <summary>Thread sync lock object</summary>
         </member>
         <member name="F:OpenMetaverse.ParcelManager.m_ParcelACL">
             <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>
         <member name="F:OpenMetaverse.ParcelManager.m_ParcelACLLock">
             <summary>Thread sync lock object</summary>
         </member>
         <member name="F:OpenMetaverse.ParcelManager.m_ParcelObjectOwnersReply">
             <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>
         <member name="F:OpenMetaverse.ParcelManager.m_ParcelObjectOwnersLock">
             <summary>Thread sync lock object</summary>
         </member>
         <member name="F:OpenMetaverse.ParcelManager.m_SimParcelsDownloaded">
             <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>
         <member name="F:OpenMetaverse.ParcelManager.m_SimParcelsDownloadedLock">
             <summary>Thread sync lock object</summary>
         </member>
         <member name="F:OpenMetaverse.ParcelManager.m_ForceSelectObjects">
             <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>
         <member name="F:OpenMetaverse.ParcelManager.m_ForceSelectObjectsLock">
             <summary>Thread sync lock object</summary>
         </member>
         <member name="F:OpenMetaverse.ParcelManager.m_ParcelMediaUpdateReply">
             <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>
         <member name="F:OpenMetaverse.ParcelManager.m_ParcelMediaUpdateReplyLock">
             <summary>Thread sync lock object</summary>
         </member>
         <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="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="F:OpenMetaverse.ParcelManager.m_ParcelMediaCommandLock">
+            <summary>Thread sync lock object</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="M:OpenMetaverse.ParcelManager.RequestParcelInfo(OpenMetaverse.UUID)">
             <summary>
             Request basic information for a single parcel
@@ -15474,8 +13784,7 @@
             <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="flags"></param>
         </member>
         <member name="M:OpenMetaverse.ParcelManager.RequestParcelProperties(OpenMetaverse.Simulator,System.Single,System.Single,System.Single,System.Single,System.Int32,System.Boolean)">
             <summary>
@@ -15495,14 +13804,14 @@
         </member>
         <member name="M:OpenMetaverse.ParcelManager.RequestAllSimParcels(OpenMetaverse.Simulator)">
             <summary>
-            Request all simulator parcel properties (used for populating the <code>Simulator.Parcels</code>
+            Request all simulator parcel properties (used for populating the <code>Simulator.Parcels</code> 
             dictionary)
             </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)">
             <summary>
-            Request all simulator parcel properties (used for populating the <code>Simulator.Parcels</code>
+            Request all simulator parcel properties (used for populating the <code>Simulator.Parcels</code> 
             dictionary)
             </summary>
             <param name="simulator">Simulator to request parcels from (must be connected)</param>
@@ -15523,12 +13832,11 @@
             <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="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>
+            <returns></returns>
         </member>
         <member name="M:OpenMetaverse.ParcelManager.Reclaim(OpenMetaverse.Simulator,System.Int32)">
             <summary>
@@ -15543,7 +13851,7 @@
             </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="groupID">The groups <seealso cref="T:OpenMetaverse.UUID"/></param>
         </member>
         <member name="M:OpenMetaverse.ParcelManager.RequestObjectOwners(OpenMetaverse.Simulator,System.Int32)">
             <summary>
@@ -15558,38 +13866,28 @@
             </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>
+            <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)">
             <summary>
             Subdivide (split) a parcel
             </summary>
-            <param name="simulator">
-            </param>
-            <param name="west">
-            </param>
-            <param name="south">
-            </param>
-            <param name="east">
-            </param>
-            <param name="north">
-            </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.ParcelManager.ParcelJoin(OpenMetaverse.Simulator,System.Single,System.Single,System.Single,System.Single)">
             <summary>
             Join two parcels of land creating a single parcel
             </summary>
-            <param name="simulator">
-            </param>
-            <param name="west">
-            </param>
-            <param name="south">
-            </param>
-            <param name="east">
-            </param>
-            <param name="north">
-            </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.ParcelManager.GetParcelLocalID(OpenMetaverse.Simulator,OpenMetaverse.Vector3)">
             <summary>
@@ -15610,7 +13908,7 @@
             <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,
+            <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)">
@@ -15625,7 +13923,7 @@
             <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,
+            <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)">
@@ -15642,7 +13940,7 @@
             <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,
+            <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)">
@@ -15666,9 +13964,9 @@
             </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;
+            <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>
+            <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>
@@ -15712,31 +14010,31 @@
             <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>
+            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ParcelDwellReply"/> event</remarks>
         </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>
+            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ParcelInfoReply"/> event</remarks>
         </member>
         <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>
+            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ParcelAccessListReply"/> event</remarks>
         </member>
         <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>
+            <remarks>Raises the <see cref="E:OpenMetaverse.ParcelManager.ForceSelectObjectsReply"/> event</remarks>
         </member>
         <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>
+            <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>
@@ -15747,10 +14045,78 @@
             <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>
+            <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>
+        <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>
+        <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)"/> 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="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="T:OpenMetaverse.ParcelDwellReplyEventArgs">
-            <summary>Contains a parcels dwell data returned from the simulator in response to an <see cref="!:RequestParcelDwell" /></summary>
+            <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>
@@ -15770,29 +14136,29 @@
             <summary>Get the calculated dwell</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>
+            <summary>Contains basic parcel information data returned from the 
+            simulator in response to an <see cref="!:RequestParcelInfo"/> request</summary>
         </member>
         <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>
+            <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>
+            <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>
+            <summary>Contains basic parcel information data returned from the simulator in response to an <see cref="!:RequestParcelInfo"/> request</summary>
         </member>
         <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="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
+            <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>
@@ -15802,14 +14168,14 @@
             <summary>Get the simulator the parcel is located in</summary>
         </member>
         <member name="P:OpenMetaverse.ParcelPropertiesEventArgs.Parcel">
-            <summary>Get the <see cref="T:OpenMetaverse.Parcel" /> object containing the details</summary>
+            <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>
         <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
+            <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">
@@ -15820,7 +14186,7 @@
             <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>
+            <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>
@@ -15850,8 +14216,8 @@
             <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>
+            <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>
@@ -15869,7 +14235,7 @@
         <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[,])">
+        <member name="M:OpenMetaverse.SimParcelsDownloadedEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.InternalDictionary{System.Int32,OpenMetaverse.Parcel},System.Int32[0:,0:])">
             <summary>
             Construct a new instance of the SimParcelsDownloadedEventArgs class
             </summary>
@@ -15889,7 +14255,7 @@
             to each 64x64 parcel's LocalID.</summary>
         </member>
         <member name="T:OpenMetaverse.ForceSelectObjectsReplyEventArgs">
-            <summary>Contains the data returned when a <see cref="!:RequestForceSelectObjects" /> request</summary>
+            <summary>Contains the data returned when a <see cref="!:RequestForceSelectObjects"/> request</summary>
         </member>
         <member name="M:OpenMetaverse.ForceSelectObjectsReplyEventArgs.#ctor(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32},System.Boolean)">
             <summary>
@@ -15934,6724 +14300,7412 @@
             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="sequence"></param>
+            <param name="flags"></param>
             <param name="command">The media command that was sent</param>
-            <param name="time">
-            </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>
         <member name="P:OpenMetaverse.ParcelMediaCommandEventArgs.Sequence">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="P:OpenMetaverse.ParcelMediaCommandEventArgs.ParcelFlags">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="P:OpenMetaverse.ParcelMediaCommandEventArgs.MediaCommand">
             <summary>Get the media command that was sent</summary>
         </member>
         <member name="P:OpenMetaverse.ParcelMediaCommandEventArgs.Time">
-            <summary>
-            </summary>
-        </member>
-        <member name="T:OpenMetaverse.PermissionMask">
-            <summary>
-            </summary>
-        </member>
-        <member name="T:OpenMetaverse.PermissionWho">
-            <summary>
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.PermissionWho.Base">
-            <summary>
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.PermissionWho.Owner">
-            <summary>
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.PermissionWho.Group">
-            <summary>
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.PermissionWho.Everyone">
-            <summary>
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.PermissionWho.NextOwner">
-            <summary>
-            </summary>
-        </member>
-        <member name="F:OpenMetaverse.PermissionWho.All">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Permissions">
-            <summary>
-            </summary>
-        </member>
-        <member name="T:OpenMetaverse.FieldType">
-            <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">
+        <member name="T:OpenMetaverse.NameValue">
             <summary>
+            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.FieldType.S16">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.NameValue.Name">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.FieldType.S32">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.NameValue.Type">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.FieldType.F32">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.NameValue.Class">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.FieldType.F64">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.NameValue.Sendto">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.FieldType.UUID">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.NameValue.Value">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.FieldType.BOOL">
+        <member name="M:OpenMetaverse.NameValue.#ctor(System.String,OpenMetaverse.NameValue.ValueType,OpenMetaverse.NameValue.ClassType,OpenMetaverse.NameValue.SendtoType,System.Object)">
             <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="F:OpenMetaverse.FieldType.Vector3">
+        <member name="M:OpenMetaverse.NameValue.#ctor(System.String)">
             <summary>
+            Constructor that takes a single line from a NameValue field
             </summary>
+            <param name="data"></param>
         </member>
-        <member name="F:OpenMetaverse.FieldType.Vector3d">
-            <summary>
-            </summary>
+        <member name="T:OpenMetaverse.NameValue.ValueType">
+            <summary>Type of the value</summary>
         </member>
-        <member name="F:OpenMetaverse.FieldType.Vector4">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.NameValue.ValueType.Unknown">
+            <summary>Unknown</summary>
         </member>
-        <member name="F:OpenMetaverse.FieldType.Quaternion">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.NameValue.ValueType.String">
+            <summary>String value</summary>
         </member>
-        <member name="F:OpenMetaverse.FieldType.IPADDR">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.NameValue.ValueType.F32">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.FieldType.IPPORT">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.NameValue.ValueType.S32">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.FieldType.Variable">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.NameValue.ValueType.VEC3">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.FieldType.Fixed">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.NameValue.ValueType.U32">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.FieldType.Single">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.NameValue.ValueType.CAMERA">
+            <summary>Deprecated</summary>
         </member>
-        <member name="F:OpenMetaverse.FieldType.Multiple">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.NameValue.ValueType.Asset">
+            <summary>String value, but designated as an asset</summary>
         </member>
-        <member name="T:OpenMetaverse.MapField">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.NameValue.ValueType.U64">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MapField.KeywordPosition">
+        <member name="T:OpenMetaverse.NameValue.ClassType">
             <summary>
+            
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MapField.Name">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.NameValue.ClassType.Unknown">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MapField.Type">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.NameValue.ClassType.ReadOnly">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MapField.Count">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.NameValue.ClassType.ReadWrite">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.MapField.CompareTo(System.Object)">
-            <summary>
-            </summary>
-            <param name="obj">
-            </param>
-            <returns>
-            </returns>
+        <member name="F:OpenMetaverse.NameValue.ClassType.Callback">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.MapBlock">
+        <member name="T:OpenMetaverse.NameValue.SendtoType">
             <summary>
+            
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MapBlock.KeywordPosition">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.NameValue.SendtoType.Unknown">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MapBlock.Name">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.NameValue.SendtoType.Sim">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MapBlock.Count">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.NameValue.SendtoType.DataSim">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MapBlock.Fields">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.NameValue.SendtoType.SimViewer">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.MapBlock.CompareTo(System.Object)">
-            <summary>
-            </summary>
-            <param name="obj">
-            </param>
-            <returns>
-            </returns>
+        <member name="F:OpenMetaverse.NameValue.SendtoType.DataSimViewer">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.MapPacket">
+        <member name="T:OpenMetaverse.Rendering.LindenMesh.LODMesh">
             <summary>
+            Level of Detail mesh
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MapPacket.ID">
+        <member name="T:OpenMetaverse.Assets.TarArchiveWriter">
             <summary>
+            Temporary code to produce a tar archive in tar v7 format
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MapPacket.Name">
+        <member name="F:OpenMetaverse.Assets.TarArchiveWriter.m_bw">
             <summary>
+            Binary writer for the underlying stream
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MapPacket.Frequency">
+        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.WriteDir(System.String)">
             <summary>
+            Write a directory entry to the tar archive.  We can only handle one path level right now!
             </summary>
+            <param name="dirName"></param>
         </member>
-        <member name="F:OpenMetaverse.MapPacket.Trusted">
+        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.WriteFile(System.String,System.String)">
             <summary>
+            Write a file to the tar archive
             </summary>
+            <param name="filePath"></param>
+            <param name="data"></param>
         </member>
-        <member name="F:OpenMetaverse.MapPacket.Encoded">
+        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.WriteFile(System.String,System.Byte[])">
             <summary>
+            Write a file to the tar archive
             </summary>
+            <param name="filePath"></param>
+            <param name="data"></param>
         </member>
-        <member name="F:OpenMetaverse.MapPacket.Blocks">
+        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.Close">
             <summary>
+            Finish writing the raw tar archive data to a stream.  The stream will be closed on completion.
             </summary>
         </member>
-        <member name="T:OpenMetaverse.ProtocolManager">
+        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.WriteEntry(System.String,System.Byte[],System.Char)">
             <summary>
+            Write a particular entry
             </summary>
+            <param name="filePath"></param>
+            <param name="data"></param>
+            <param name="fileType"></param>
         </member>
-        <member name="M:OpenMetaverse.ProtocolManager.#ctor(System.String,OpenMetaverse.GridClient)">
+        <member name="T:OpenMetaverse.Assets.TarArchiveReader">
             <summary>
+            Temporary code to do the bare minimum required to read a tar archive for our purposes
             </summary>
-            <param name="mapFile">
-            </param>
-            <param name="client">
-            </param>
         </member>
-        <member name="F:OpenMetaverse.ProtocolManager.TypeSizes">
+        <member name="F:OpenMetaverse.Assets.TarArchiveReader.m_br">
             <summary>
+            Binary reader for the underlying stream
             </summary>
         </member>
-        <member name="F:OpenMetaverse.ProtocolManager.KeywordPositions">
+        <member name="F:OpenMetaverse.Assets.TarArchiveReader.m_nullCharArray">
             <summary>
+            Used to trim off null chars
             </summary>
         </member>
-        <member name="F:OpenMetaverse.ProtocolManager.LowMaps">
+        <member name="F:OpenMetaverse.Assets.TarArchiveReader.m_spaceCharArray">
             <summary>
+            Used to trim off space chars
             </summary>
         </member>
-        <member name="F:OpenMetaverse.ProtocolManager.MediumMaps">
+        <member name="M:OpenMetaverse.Assets.TarArchiveReader.#ctor(System.IO.Stream)">
             <summary>
+            Generate a tar reader which reads from the given stream.
             </summary>
+            <param name="s"></param>
         </member>
-        <member name="F:OpenMetaverse.ProtocolManager.HighMaps">
+        <member name="M:OpenMetaverse.Assets.TarArchiveReader.ReadEntry(System.String@,OpenMetaverse.Assets.TarArchiveReader.TarEntryType@)">
             <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.ProtocolManager.Command(System.String)">
+        <member name="M:OpenMetaverse.Assets.TarArchiveReader.ReadHeader">
             <summary>
+            Read the next 512 byte chunk of data as a tar header.
             </summary>
-            <param name="command">
-            </param>
-            <returns>
-            </returns>
+            <returns>A tar header struct.  null if we have reached the end of the archive.</returns>
         </member>
-        <member name="M:OpenMetaverse.ProtocolManager.Command(System.Byte[])">
+        <member name="M:OpenMetaverse.Assets.TarArchiveReader.ReadData(System.Int32)">
             <summary>
+            Read data following a header
             </summary>
-            <param name="data">
-            </param>
-            <returns>
-            </returns>
+            <param name="fileSize"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.ProtocolManager.Command(System.UInt16,OpenMetaverse.PacketFrequency)">
+        <member name="M:OpenMetaverse.Assets.TarArchiveReader.ConvertOctalBytesToDecimal(System.Byte[],System.Int32,System.Int32)">
             <summary>
+            Convert octal bytes to a decimal representation
             </summary>
-            <param name="command">
-            </param>
-            <param name="frequency">
-            </param>
-            <returns>
-            </returns>
+            <param name="bytes"></param>
+            <param name="count"></param>
+            <param name="startIndex"></param>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.ProtocolManager.PrintMap">
+        <member name="T:OpenMetaverse.VisualColorOperation">
             <summary>
+            Operation to apply when applying color to texture
             </summary>
         </member>
-        <member name="M:OpenMetaverse.ProtocolManager.PrintOneMap(OpenMetaverse.MapPacket[],System.String)">
+        <member name="T:OpenMetaverse.VisualColorParam">
             <summary>
+            Information needed to translate visual param value to RGBA color
             </summary>
-            <param name="map">
-            </param>
-            <param name="frequency">
-            </param>
         </member>
-        <member name="M:OpenMetaverse.ProtocolManager.DecodeMapFile(System.String,System.String)">
+        <member name="M:OpenMetaverse.VisualColorParam.#ctor(OpenMetaverse.VisualColorOperation,OpenMetaverse.Color4[])">
             <summary>
+            Construct VisualColorParam
             </summary>
-            <param name="mapFile">
-            </param>
-            <param name="outputFile">
-            </param>
+            <param name="operation">Operation to apply when applying color to texture</param>
+            <param name="colors">Colors</param>
         </member>
-        <member name="M:OpenMetaverse.ProtocolManager.LoadMapFile(System.String)">
+        <member name="T:OpenMetaverse.VisualAlphaParam">
             <summary>
+            Represents alpha blending and bump infor for a visual parameter
+            such as sleive length
             </summary>
-            <param name="mapFile">
-            </param>
         </member>
-        <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 name="F:OpenMetaverse.VisualAlphaParam.Domain">
+            <summary>Stregth of the alpha to apply</summary>
         </member>
-        <member name="M:OpenMetaverse.Settings.#ctor(OpenMetaverse.GridClient)">
-            <summary>Constructor</summary>
-            <param name="client">Reference to a GridClient object</param>
+        <member name="F:OpenMetaverse.VisualAlphaParam.TGAFile">
+            <summary>File containing the alpha channel</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.AGNI_LOGIN_SERVER">
-            <summary>Main grid login server</summary>
+        <member name="F:OpenMetaverse.VisualAlphaParam.SkipIfZero">
+            <summary>Skip blending if parameter value is 0</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.ADITI_LOGIN_SERVER">
-            <summary>Beta grid login server</summary>
+        <member name="F:OpenMetaverse.VisualAlphaParam.MultiplyBlend">
+            <summary>Use miltiply insted of alpha blending</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.ENABLE_INVENTORY_STORE">
+        <member name="M:OpenMetaverse.VisualAlphaParam.#ctor(System.Single,System.String,System.Boolean,System.Boolean)">
             <summary>
-            InventoryManager requests inventory information on login,
-            GridClient initializes an Inventory store for main inventory.
+            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:OpenMetaverse.Settings.ENABLE_LIBRARY_STORE">
+        <member name="T:OpenMetaverse.VisualParam">
             <summary>
-            InventoryManager requests library information on login,
-            GridClient initializes an Inventory store for the library.
+            A single visual characteristic of an avatar mesh, such as eyebrow height
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.PING_INTERVAL">
-            <summary>Number of milliseconds between sending pings to each sim</summary>
-        </member>
-        <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 name="F:OpenMetaverse.VisualParam.ParamID">
+            <summary>Index of this visual param</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.VisualParam.Name">
+            <summary>Internal name</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.VisualParam.Group">
+            <summary>Group ID this parameter belongs to</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.VisualParam.Wearable">
+            <summary>Name of the wearable this parameter belongs to</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.VisualParam.Label">
+            <summary>Displayable label of this characteristic</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.ENABLE_SIMSTATS">
-            <summary>Whether to decode sim stats</summary>
+        <member name="F:OpenMetaverse.VisualParam.LabelMin">
+            <summary>Displayable label for the minimum value of this characteristic</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="F:OpenMetaverse.VisualParam.LabelMax">
+            <summary>Displayable label for the maximum value of this characteristic</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 name="F:OpenMetaverse.VisualParam.DefaultValue">
+            <summary>Default value</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="F:OpenMetaverse.VisualParam.MinValue">
+            <summary>Minimum value</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="F:OpenMetaverse.VisualParam.MaxValue">
+            <summary>Maximum value</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 name="F:OpenMetaverse.VisualParam.IsBumpAttribute">
+            <summary>Is this param used for creation of bump layer?</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.VisualParam.AlphaParams">
+            <summary>Alpha blending/bump info</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.TRACK_UTILIZATION">
-            <summary>
-            If true, utilization statistics will be tracked. There is a minor penalty
-            in CPU time for enabling this option.
-            </summary>
+        <member name="F:OpenMetaverse.VisualParam.ColorParams">
+            <summary>Color information</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="F:OpenMetaverse.VisualParam.Drivers">
+            <summary>Array of param IDs that are drivers for this parameter</summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.ALWAYS_REQUEST_PARCEL_ACL">
+        <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>
-            If true, an incoming parcel properties reply will automatically send
-            a request for the parcel access list
+            Set all the values through the constructor
             </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>
         </member>
-        <member name="F:OpenMetaverse.Settings.ALWAYS_REQUEST_PARCEL_DWELL">
+        <member name="T:OpenMetaverse.VisualParams">
             <summary>
-            if true, an incoming parcel properties reply will automatically send
-            a request for the traffic count.
+            Holds the Params array of all the avatar appearance parameters
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.USE_ASSET_CACHE">
+        <member name="T:OpenMetaverse.UDPBase">
             <summary>
-            If true, images, and other assets downloaded from the server
-            will be cached in a local directory
+            
             </summary>
         </member>
-        <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">
+        <member name="M:OpenMetaverse.UDPBase.#ctor(System.Int32)">
             <summary>
-            Download textures using GetTexture capability when available
+            Initialize the UDP packet handler in server mode
             </summary>
+            <param name="port">Port to listening for incoming UDP packets on</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>
-        <member name="F:OpenMetaverse.Settings.PIPELINE_REFRESH_INTERVAL">
+        <member name="M:OpenMetaverse.UDPBase.#ctor(System.Net.IPEndPoint)">
             <summary>
-            The Refresh timer inteval is used to set the delay between checks for stalled texture downloads
+            Initialize the UDP packet handler in client mode
             </summary>
-            <remarks>This is a static variable which applies to all instances</remarks>
+            <param name="endPoint">Remote UDP server to connect to</param>
         </member>
-        <member name="F:OpenMetaverse.Settings.PIPELINE_REQUEST_TIMEOUT">
+        <member name="M:OpenMetaverse.UDPBase.Start">
             <summary>
-            Textures taking longer than this value will be flagged as timed out and removed from the pipeline
+            
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Settings.LOG_LEVEL">
+        <member name="M:OpenMetaverse.UDPBase.Stop">
             <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
+            
             </summary>
         </member>
-        <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">
+        <member name="P:OpenMetaverse.UDPBase.IsRunning">
             <summary>
-            Simulator (region) properties
+            
             </summary>
         </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="T:OpenMetaverse.Helpers">
             <summary>
-            Access level for a simulator
+            Static helper functions and global variables
             </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 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.SimAccess.Down">
-            <summary>Simulator is offline</summary>
+        <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.SimAccess.NonExistent">
-            <summary>Simulator does not exist</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="T:OpenMetaverse.Simulator">
-            <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="M:OpenMetaverse.Simulator.#ctor(OpenMetaverse.GridClient,System.Net.IPEndPoint,System.UInt64)">
+        <member name="M:OpenMetaverse.Helpers.TEOffsetShort(System.Single)">
             <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>
+            <param name="offset"></param>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Simulator.SimStats">
+        <member name="M:OpenMetaverse.Helpers.TEOffsetFloat(System.Byte[],System.Int32)">
             <summary>
-            Simulator Statistics
+            
             </summary>
+            <param name="bytes"></param>
+            <param name="pos"></param>
+            <returns></returns>
         </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">
+        <member name="M:OpenMetaverse.Helpers.TERotationShort(System.Single)">
             <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>
+            <param name="rotation"></param>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.OutgoingBPS">
+        <member name="M:OpenMetaverse.Helpers.TERotationFloat(System.Byte[],System.Int32)">
             <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>
+            <param name="bytes"></param>
+            <param name="pos"></param>
+            <returns></returns>
         </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">
+        <member name="M:OpenMetaverse.Helpers.GlobalPosToRegionHandle(System.Single,System.Single,System.Single@,System.Single@)">
             <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
             </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.Simulator.SimStats.MissedPings">
+        <member name="M:OpenMetaverse.Helpers.FloatToTerseString(System.Single)">
             <summary>
+            Converts a floating point number to a terse string format used for
+            transmitting numbers in wearable asset files
             </summary>
+            <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="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">
+        <member name="M:OpenMetaverse.Helpers.FieldToString(System.Text.StringBuilder,System.Byte[],System.String)">
             <summary>
+            Convert a variable length field (byte array) to a string, with a
+            field name prepended to each line of the output
             </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>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.FrameTime">
+        <member name="M:OpenMetaverse.Helpers.ZeroDecode(System.Byte[],System.Int32,System.Byte[])">
             <summary>
+            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="F:OpenMetaverse.Simulator.SimStats.NetTime">
+        <member name="M:OpenMetaverse.Helpers.ZeroEncode(System.Byte[],System.Int32,System.Byte[])">
             <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.
             </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="F:OpenMetaverse.Simulator.SimStats.PhysicsTime">
+        <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>
+            Calculates the CRC (cyclic redundancy check) needed to upload inventory.
             </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>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.ImageTime">
+        <member name="M:OpenMetaverse.Helpers.GetResourceStream(System.String)">
             <summary>
+            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.Simulator.SimStats.ScriptTime">
+        <member name="M:OpenMetaverse.Helpers.GetResourceStream(System.String,System.String)">
             <summary>
+            Attempts to load a file either embedded in the assembly or found in
+            a given search path
             </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>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.AgentTime">
+        <member name="M:OpenMetaverse.Helpers.PrimListToOSD(System.Collections.Generic.List{OpenMetaverse.Primitive})">
             <summary>
+            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.Simulator.SimStats.OtherTime">
+        <member name="M:OpenMetaverse.Helpers.OSDToPrimList(OpenMetaverse.StructuredData.OSD)">
             <summary>
+            Deserializes OSD in to a list of primitives
             </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="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 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>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.INPPS">
+        <member name="T:OpenMetaverse.Helpers.LogLevel">
             <summary>
+            Passed to Logger.Log() to identify the severity of a log entry
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.OUTPPS">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Helpers.LogLevel.None">
+            <summary>No logging information will be output</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimStats.PendingDownloads">
-            <summary>Number of downloads pending</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.Simulator.SimStats.PendingUploads">
-            <summary>Number of uploads pending</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.Simulator.SimStats.VirtualSize">
-            <summary>
-            </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="F:OpenMetaverse.Simulator.SimStats.ResidentSize">
-            <summary>
+        <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.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 name="F:OpenMetaverse.Http.EventQueueClient.REQUEST_TIMEOUT">
+            <summary>=</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.Handle">
-            <summary>
-            </summary>
+        <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.Simulator.SimVersion">
-            <summary>The current version of software this simulator is running</summary>
+        <member name="F:OpenMetaverse.Http.EventQueueClient._random">
+            <summary>For exponential backoff on error.</summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.Name">
+        <member name="T:OpenMetaverse.Bumpiness">
             <summary>
+            The type of bump-mapping applied to a face
             </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 name="F:OpenMetaverse.Bumpiness.None">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.ParcelOverlaysReceived">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Bumpiness.Brightness">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainHeightRange00">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Bumpiness.Darkness">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainHeightRange01">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Bumpiness.Woodgrain">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainHeightRange10">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Bumpiness.Bark">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainHeightRange11">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Bumpiness.Bricks">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainStartHeight00">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Bumpiness.Checker">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainStartHeight01">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Bumpiness.Concrete">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainStartHeight10">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Bumpiness.Crustytile">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainStartHeight11">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Bumpiness.Cutstone">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.WaterHeight">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Bumpiness.Discs">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.SimOwner">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Bumpiness.Gravel">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainBase0">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Bumpiness.Petridish">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainBase1">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Bumpiness.Siding">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainBase2">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Bumpiness.Stonetile">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainBase3">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Bumpiness.Stucco">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainDetail0">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Bumpiness.Suction">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainDetail1">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Bumpiness.Weave">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainDetail2">
+        <member name="T:OpenMetaverse.Shininess">
             <summary>
+            The level of shininess applied to a face
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.TerrainDetail3">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Shininess.None">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.IsEstateManager">
-            <summary>true if your agent has Estate Manager rights on this region</summary>
+        <member name="F:OpenMetaverse.Shininess.Low">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.Flags">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Shininess.Medium">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.Access">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.Shininess.High">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.BillableFactor">
+        <member name="T:OpenMetaverse.MappingType">
             <summary>
+            The texture mapping style used for a face
             </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 name="F:OpenMetaverse.MappingType.Default">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.ObjectsAvatars">
-            <summary>
-            A thread-safe dictionary containing avatars in a simulator
-            </summary>
+        <member name="F:OpenMetaverse.MappingType.Planar">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.ObjectsPrimitives">
-            <summary>
-            A thread-safe dictionary containing primitives in a simulator
-            </summary>
+        <member name="F:OpenMetaverse.MappingType.Spherical">
+            <summary></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 name="F:OpenMetaverse.MappingType.Cylindrical">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.AgentMovementComplete">
+        <member name="T:OpenMetaverse.TextureAttributes">
             <summary>
-            Is it safe to send agent updates to this sim
-            AgentMovementComplete message received
+            Flags in the TextureEntry block that describe which properties are 
+            set
             </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 name="F:OpenMetaverse.TextureAttributes.None">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.PacketArchive">
-            <summary>Sequence numbers of packets we've received
-            (for duplicate checking)</summary>
+        <member name="F:OpenMetaverse.TextureAttributes.TextureID">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.NeedAck">
-            <summary>Packets we sent out that need ACKs from the simulator</summary>
+        <member name="F:OpenMetaverse.TextureAttributes.RGBA">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.pauseSerial">
-            <summary>Sequence number for pause/resume</summary>
+        <member name="F:OpenMetaverse.TextureAttributes.RepeatU">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Simulator.handshakeComplete">
-            <summary>Indicates if UDP connection to the sim is fully established</summary>
+        <member name="F:OpenMetaverse.TextureAttributes.RepeatV">
+            <summary></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 name="F:OpenMetaverse.TextureAttributes.OffsetU">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.Simulator.IPEndPoint">
-            <summary>The IP address and port of the server</summary>
+        <member name="F:OpenMetaverse.TextureAttributes.OffsetV">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.Simulator.Connected">
-            <summary>Whether there is a working connection to the simulator or
-            not</summary>
+        <member name="F:OpenMetaverse.TextureAttributes.Rotation">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.Simulator.AvatarPositions">
-            <summary>Coarse locations of avatars in this simulator</summary>
+        <member name="F:OpenMetaverse.TextureAttributes.Material">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.Simulator.PreyID">
-            <summary>AvatarPositions key representing TrackAgent target</summary>
+        <member name="F:OpenMetaverse.TextureAttributes.Media">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.Simulator.HandshakeComplete">
-            <summary>Indicates if UDP connection to the sim is fully established</summary>
+        <member name="F:OpenMetaverse.TextureAttributes.Glow">
+            <summary></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 name="F:OpenMetaverse.TextureAttributes.MaterialID">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Simulator.Dispose">
-            <summary>
-            Called when this Simulator object is being destroyed
-            </summary>
+        <member name="F:OpenMetaverse.TextureAttributes.All">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Simulator.Connect(System.Boolean)">
+        <member name="T:OpenMetaverse.BitPack">
             <summary>
-            Attempt to connect to this simulator
+            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>
-            <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 name="F:OpenMetaverse.BitPack.Data">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Simulator.Disconnect(System.Boolean)">
+        <member name="M:OpenMetaverse.BitPack.#ctor(System.Byte[],System.Int32)">
             <summary>
-            Disconnect from this simulator
+            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="M:OpenMetaverse.Simulator.Pause">
+        <member name="M:OpenMetaverse.BitPack.PackFloat(System.Single)">
             <summary>
-            Instructs the simulator to stop sending update (and possibly other) packets
+            Pack a floating point value in to the data
             </summary>
+            <param name="data">Floating point value to pack</param>
         </member>
-        <member name="M:OpenMetaverse.Simulator.Resume">
+        <member name="M:OpenMetaverse.BitPack.PackBits(System.Int32,System.Int32)">
             <summary>
-            Instructs the simulator to resume sending update packets (unpause)
+            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="M:OpenMetaverse.Simulator.TerrainHeightAtPoint(System.Int32,System.Int32,System.Single@)">
+        <member name="M:OpenMetaverse.BitPack.PackBits(System.UInt32,System.Int32)">
             <summary>
-            Retrieve the terrain height at a given coordinate
+            Pack part or all of an unsigned integer in to the data
             </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>
+            <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="M:OpenMetaverse.Simulator.SendPacket(OpenMetaverse.Packets.Packet)">
+        <member name="M:OpenMetaverse.BitPack.PackBit(System.Boolean)">
             <summary>
-            Sends a packet
+            Pack a single bit in to the data
             </summary>
-            <param name="packet">Packet to be sent</param>
+            <param name="bit">Bit to pack</param>
         </member>
-        <member name="M:OpenMetaverse.Simulator.SendPing">
+        <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>
-        <member name="M:OpenMetaverse.Simulator.ToString">
+        <member name="M:OpenMetaverse.BitPack.PackUUID(OpenMetaverse.UUID)">
             <summary>
-            Returns Simulator Name as a String
+            
             </summary>
-            <returns>
-            </returns>
+            <param name="data"></param>
         </member>
-        <member name="M:OpenMetaverse.Simulator.GetHashCode">
+        <member name="M:OpenMetaverse.BitPack.PackColor(OpenMetaverse.Color4)">
             <summary>
+            
             </summary>
-            <returns>
-            </returns>
+            <param name="data"></param>
         </member>
-        <member name="M:OpenMetaverse.Simulator.Equals(System.Object)">
+        <member name="M:OpenMetaverse.BitPack.UnpackFloat">
             <summary>
+            Unpacking a floating point value from the data
             </summary>
-            <param name="obj">
-            </param>
-            <returns>
-            </returns>
+            <returns>Unpacked floating point value</returns>
         </member>
-        <member name="M:OpenMetaverse.Simulator.SendAcks">
+        <member name="M:OpenMetaverse.BitPack.UnpackBits(System.Int32)">
             <summary>
-            Sends out pending acknowledgements
+            Unpack a variable number of bits from the data in to integer format
             </summary>
-            <returns>Number of ACKs sent</returns>
+            <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="M:OpenMetaverse.Simulator.ResendUnacked">
+        <member name="M:OpenMetaverse.BitPack.UnpackUBits(System.Int32)">
             <summary>
-            Resend unacknowledged packets
+            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="T:OpenMetaverse.SoundManager">
+        <member name="M:OpenMetaverse.BitPack.UnpackShort">
             <summary>
+            Unpack a 16-bit signed integer
             </summary>
+            <returns>16-bit signed integer</returns>
         </member>
-        <member name="M:OpenMetaverse.SoundManager.#ctor(OpenMetaverse.GridClient)">
+        <member name="M:OpenMetaverse.BitPack.UnpackUShort">
             <summary>
-            Construct a new instance of the SoundManager class, used for playing and receiving
-            sound assets
+            Unpack a 16-bit unsigned integer
             </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>
+            <returns>16-bit unsigned integer</returns>
         </member>
-        <member name="M:OpenMetaverse.SoundManager.PlaySound(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.BitPack.UnpackInt">
             <summary>
-            Plays a sound in the current region at full volume from avatar position
+            Unpack a 32-bit signed integer
             </summary>
-            <param name="soundID">UUID of the sound to be played</param>
+            <returns>32-bit signed integer</returns>
         </member>
-        <member name="M:OpenMetaverse.SoundManager.SendSoundTrigger(OpenMetaverse.UUID,OpenMetaverse.Vector3)">
+        <member name="M:OpenMetaverse.BitPack.UnpackUInt">
             <summary>
-            Plays a sound in the current region at full volume
+            Unpack a 32-bit unsigned integer
             </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>
+            <returns>32-bit unsigned integer</returns>
         </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 name="P:OpenMetaverse.BitPack.BytePos">
+            <summary></summary>
         </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 name="P:OpenMetaverse.BitPack.BitPos">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.SoundManager.SendSoundTrigger(OpenMetaverse.UUID,System.UInt64,OpenMetaverse.Vector3,System.Single)">
+        <member name="T:OpenMetaverse.ScriptPermission">
             <summary>
-            Play a sound asset
+            Permission request flags, asked when a script wants to control an Avatar
             </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 name="F:OpenMetaverse.ScriptPermission.None">
+            <summary>Placeholder for empty values, shouldn't ever see this</summary>
         </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 name="F:OpenMetaverse.ScriptPermission.Debit">
+            <summary>Script wants ability to take money from you</summary>
         </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 name="F:OpenMetaverse.ScriptPermission.TakeControls">
+            <summary>Script wants to take camera controls for you</summary>
         </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 name="F:OpenMetaverse.ScriptPermission.RemapControls">
+            <summary>Script wants to remap avatars controls</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 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.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 name="F:OpenMetaverse.ScriptPermission.Attach">
+            <summary>Script wants to attach or detach the prim or primset to your avatar</summary>
         </member>
-        <member name="P:OpenMetaverse.AttachedSoundEventArgs.Simulator">
-            <summary>Simulator where the event originated</summary>
+        <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="P:OpenMetaverse.AttachedSoundEventArgs.SoundID">
-            <summary>Get the sound asset id</summary>
+        <member name="F:OpenMetaverse.ScriptPermission.ChangeLinks">
+            <summary>Script wants ability to link/delink with other prims</summary>
         </member>
-        <member name="P:OpenMetaverse.AttachedSoundEventArgs.OwnerID">
-            <summary>Get the ID of the owner</summary>
+        <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="P:OpenMetaverse.AttachedSoundEventArgs.ObjectID">
-            <summary>Get the ID of the Object</summary>
+        <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="P:OpenMetaverse.AttachedSoundEventArgs.Gain">
-            <summary>Get the volume level</summary>
+        <member name="F:OpenMetaverse.ScriptPermission.TrackCamera">
+            <summary>Script wants to track avatars camera position and rotation </summary>
         </member>
-        <member name="P:OpenMetaverse.AttachedSoundEventArgs.Flags">
-            <summary>Get the <see cref="T:OpenMetaverse.SoundFlags" /></summary>
+        <member name="F:OpenMetaverse.ScriptPermission.ControlCamera">
+            <summary>Script wants to control your camera</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.ScriptPermission.Teleport">
+            <summary>Script wants the ability to teleport you</summary>
         </member>
-        <member name="M:OpenMetaverse.AttachedSoundGainChangeEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.UUID,System.Single)">
+        <member name="T:OpenMetaverse.InstantMessageDialog">
             <summary>
-            Construct a new instance of the AttachedSoundGainChangedEventArgs class
+            Special commands used in Instant Messages
             </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.InstantMessageDialog.MessageFromAgent">
+            <summary>Indicates a regular IM from another agent</summary>
         </member>
-        <member name="P:OpenMetaverse.AttachedSoundGainChangeEventArgs.ObjectID">
-            <summary>Get the ID of the Object</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.MessageBox">
+            <summary>Simple notification box with an OK button</summary>
         </member>
-        <member name="P:OpenMetaverse.AttachedSoundGainChangeEventArgs.Gain">
-            <summary>Get the volume level</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.GroupInvitation">
+            <summary>You've been invited to join a group.</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="F:OpenMetaverse.InstantMessageDialog.InventoryOffered">
+            <summary>Inventory offer</summary>
         </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 name="F:OpenMetaverse.InstantMessageDialog.InventoryAccepted">
+            <summary>Accepted inventory offer</summary>
         </member>
-        <member name="P:OpenMetaverse.SoundTriggerEventArgs.Simulator">
-            <summary>Simulator where the event originated</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.InventoryDeclined">
+            <summary>Declined inventory offer</summary>
         </member>
-        <member name="P:OpenMetaverse.SoundTriggerEventArgs.SoundID">
-            <summary>Get the sound asset id</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.GroupVote">
+            <summary>Group vote</summary>
         </member>
-        <member name="P:OpenMetaverse.SoundTriggerEventArgs.OwnerID">
-            <summary>Get the ID of the owner</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.TaskInventoryOffered">
+            <summary>An object is offering its inventory</summary>
         </member>
-        <member name="P:OpenMetaverse.SoundTriggerEventArgs.ObjectID">
-            <summary>Get the ID of the Object</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.TaskInventoryAccepted">
+            <summary>Accept an inventory offer from an object</summary>
         </member>
-        <member name="P:OpenMetaverse.SoundTriggerEventArgs.ParentID">
-            <summary>Get the ID of the objects parent</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.TaskInventoryDeclined">
+            <summary>Decline an inventory offer from an object</summary>
         </member>
-        <member name="P:OpenMetaverse.SoundTriggerEventArgs.Gain">
-            <summary>Get the volume level</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.NewUserDefault">
+            <summary>Unknown</summary>
         </member>
-        <member name="P:OpenMetaverse.SoundTriggerEventArgs.RegionHandle">
-            <summary>Get the regionhandle</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.SessionAdd">
+            <summary>Start a session, or add users to a session</summary>
         </member>
-        <member name="P:OpenMetaverse.SoundTriggerEventArgs.Position">
-            <summary>Get the source position</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.SessionOfflineAdd">
+            <summary>Start a session, but don't prune offline users</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.InstantMessageDialog.SessionGroupStart">
+            <summary>Start a session with your group</summary>
         </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 name="F:OpenMetaverse.InstantMessageDialog.SessionCardlessStart">
+            <summary>Start a session without a calling card (finder or objects)</summary>
         </member>
-        <member name="P:OpenMetaverse.PreloadSoundEventArgs.Simulator">
-            <summary>Simulator where the event originated</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.SessionSend">
+            <summary>Send a message to a session</summary>
         </member>
-        <member name="P:OpenMetaverse.PreloadSoundEventArgs.SoundID">
-            <summary>Get the sound asset id</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.SessionDrop">
+            <summary>Leave a session</summary>
         </member>
-        <member name="P:OpenMetaverse.PreloadSoundEventArgs.OwnerID">
-            <summary>Get the ID of the owner</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.MessageFromObject">
+            <summary>Indicates that the IM is from an object</summary>
         </member>
-        <member name="P:OpenMetaverse.PreloadSoundEventArgs.ObjectID">
-            <summary>Get the ID of the Object</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.BusyAutoResponse">
+            <summary>Sent an IM to a busy user, this is the auto response</summary>
         </member>
-        <member name="T:OpenMetaverse.Sounds">
-            <summary>
-            pre-defined built in sounds
-            </summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.ConsoleAndChatHistory">
+            <summary>Shows the message in the console and chat history</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.BELL_TING">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.RequestTeleport">
+            <summary>Send a teleport lure</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.CLICK">
-            <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.Sounds.HEALTH_REDUCTION_FEMALE">
-            <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.Sounds.HEALTH_REDUCTION_MALE">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.GodLikeRequestTeleport">
+            <summary>Only useful if you have Linden permissions</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.IM_START">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.RequestLure">
+            <summary>Request a teleport lure</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.INSTANT_MESSAGE_NOTIFICATION">
-            <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.Sounds.INVALID_OPERATION">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.Session911Start">
+            <summary>IM for help</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.KEYBOARD_LOOP">
-            <summary>
-            </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.Sounds.MONEY_REDUCTION_COINS">
-            <summary>coins</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.FromTaskAsAlert">
+            <summary>Like an IM but won't go to email</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.MONEY_INCREASE_CASH_REGISTER_BELL">
-            <summary>cash register bell</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.GroupNotice">
+            <summary>IM from a group officer to all group members</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.NULL_KEYSTROKE">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.GroupNoticeInventoryAccepted">
+            <summary>Unknown</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.GroupNoticeInventoryDeclined">
+            <summary>Unknown</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_RUBBER">
-            <summary>rubber</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.GroupInvitationAccept">
+            <summary>Accept a group invitation</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_PLASTIC">
-            <summary>plastic</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.GroupInvitationDecline">
+            <summary>Decline a group invitation</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_FLESH">
-            <summary>flesh</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.GroupNoticeRequested">
+            <summary>Unknown</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_WOOD_SPLINTERING">
-            <summary>wood splintering?</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.FriendshipOffered">
+            <summary>An avatar is offering you friendship</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_GLASS_BREAK">
-            <summary>glass break</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.FriendshipAccepted">
+            <summary>An avatar has accepted your friendship offer</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_COLLISION_METAL_CLUNK">
-            <summary>metal clunk</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.FriendshipDeclined">
+            <summary>An avatar has declined your friendship offer</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_CREATE_WHOOSH">
-            <summary>whoosh</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.StartTyping">
+            <summary>Indicates that a user has started typing</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_DELETE_SHAKE">
-            <summary>shake</summary>
+        <member name="F:OpenMetaverse.InstantMessageDialog.StopTyping">
+            <summary>Indicates that a user has stopped typing</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.OBJECT_REZ">
+        <member name="T:OpenMetaverse.InstantMessageOnline">
             <summary>
+            Flag in Instant Messages, whether the IM should be delivered to
+            offline avatars as well
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_APPEAR_DING">
-            <summary>ding</summary>
+        <member name="F:OpenMetaverse.InstantMessageOnline.Online">
+            <summary>Only deliver to online avatars</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT">
-            <summary>
-            </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.Sounds.PIE_MENU_SLICE_HIGHLIGHT1">
+        <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.Sounds.PIE_MENU_SLICE_HIGHLIGHT2">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.ChatType.Whisper">
+            <summary>Whisper (5m radius)</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT3">
-            <summary>
-            </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.Sounds.PIE_MENU_SLICE_HIGHLIGHT4">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.ChatType.Shout">
+            <summary>Shouting! (100m radius)</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT5">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.ChatType.StartTyping">
+            <summary>Event message when an Avatar has begun to type</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT6">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.ChatType.StopTyping">
+            <summary>Event message when an Avatar has stopped typing</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.PIE_MENU_SLICE_HIGHLIGHT7">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.ChatType.Debug">
+            <summary>Send the message to the debug channel</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.SNAPSHOT">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.ChatType.OwnerSay">
+            <summary>Event message when an object uses llOwnerSay</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.TELEPORT_TEXTURE_APPLY">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.ChatType.RegionSay">
+            <summary>Special value to support llRegionSay, never sent to the client</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.THUNDER">
+        <member name="T:OpenMetaverse.ChatSourceType">
             <summary>
+            Identifies the source of a chat message
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.WINDOW_CLOSE">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.ChatSourceType.System">
+            <summary>Chat from the grid or simulator</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.WINDOW_OPEN">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.ChatSourceType.Agent">
+            <summary>Chat from another avatar</summary>
         </member>
-        <member name="F:OpenMetaverse.Sounds.ZIPPER">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.ChatSourceType.Object">
+            <summary>Chat from an object</summary>
         </member>
-        <member name="M:OpenMetaverse.Sounds.ToDictionary">
+        <member name="T:OpenMetaverse.ChatAudibleLevel">
             <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 name="F:OpenMetaverse.ChatAudibleLevel.Not">
+            <summary></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 name="F:OpenMetaverse.ChatAudibleLevel.Barely">
+            <summary></summary>
         </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 name="F:OpenMetaverse.ChatAudibleLevel.Fully">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.TerrainManager.#ctor(OpenMetaverse.GridClient)">
+        <member name="T:OpenMetaverse.EffectType">
             <summary>
-            Default constructor
+            Effect type used in ViewerEffect packets
             </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 name="F:OpenMetaverse.EffectType.Text">
+            <summary></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 name="F:OpenMetaverse.EffectType.Icon">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.Simulator">
-            <summary>Simulator from that sent tha data</summary>
+        <member name="F:OpenMetaverse.EffectType.Connector">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.X">
-            <summary>Sim coordinate of the patch</summary>
+        <member name="F:OpenMetaverse.EffectType.FlexibleObject">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.Y">
-            <summary>Sim coordinate of the patch</summary>
+        <member name="F:OpenMetaverse.EffectType.AnimalControls">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.PatchSize">
-            <summary>Size of tha patch</summary>
+        <member name="F:OpenMetaverse.EffectType.AnimationObject">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.LandPatchReceivedEventArgs.HeightMap">
-            <summary>Heightmap for the patch</summary>
+        <member name="F:OpenMetaverse.EffectType.Cloth">
+            <summary></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 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.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 name="F:OpenMetaverse.EffectType.Glow">
+            <summary></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 name="F:OpenMetaverse.EffectType.Point">
+            <summary></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.EffectType.Trail">
+            <summary></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.EffectType.Sphere">
+            <summary>Create a swirl of particles around an object</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.EffectType.Spiral">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.TextureRequestState.Aborted">
-            <summary>The texture request was aborted by request of the agent</summary>
+        <member name="F:OpenMetaverse.EffectType.Edit">
+            <summary></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.EffectType.LookAt">
+            <summary>Cause an avatar to look at an object</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 name="F:OpenMetaverse.EffectType.PointAt">
+            <summary>Cause an avatar to point at an object</summary>
         </member>
-        <member name="M:OpenMetaverse.TexturePipeline.#ctor(OpenMetaverse.GridClient)">
+        <member name="T:OpenMetaverse.LookAtType">
             <summary>
-            Default constructor, Instantiates a new copy of the TexturePipeline class
+            The action an avatar is doing when looking at something, used in 
+            ViewerEffect packets for the LookAt effect
             </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 name="F:OpenMetaverse.LookAtType.None">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.TexturePipeline.Startup">
-            <summary>
-            Initialize callbacks required for the TexturePipeline to operate
-            </summary>
+        <member name="F:OpenMetaverse.LookAtType.Idle">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.TexturePipeline.Shutdown">
-            <summary>
-            Shutdown the TexturePipeline and cleanup any callbacks or transfers
-            </summary>
+        <member name="F:OpenMetaverse.LookAtType.AutoListen">
+            <summary></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.LookAtType.FreeLook">
+            <summary></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.LookAtType.Respond">
+            <summary></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.LookAtType.Hover">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.TexturePipeline.DownloadThread">
-            <summary>
-            Master Download Thread, Queues up downloads in the threadpool
-            </summary>
+        <member name="F:OpenMetaverse.LookAtType.Conversation">
+            <summary>Deprecated</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.LookAtType.Select">
+            <summary></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.LookAtType.Focus">
+            <summary></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.LookAtType.Mouselook">
+            <summary></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.LookAtType.Clear">
+            <summary></summary>
         </member>
-        <member name="T:ThreadUtil">
+        <member name="T:OpenMetaverse.PointAtType">
             <summary>
+            The action an avatar is doing when pointing at something, used in
+            ViewerEffect packets for the PointAt effect
             </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 name="F:OpenMetaverse.PointAtType.None">
+            <summary></summary>
         </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 name="F:OpenMetaverse.PointAtType.Select">
+            <summary></summary>
         </member>
-        <member name="F:ThreadUtil.callback">
-            <summary>
-            Callback used to call EndInvoke on the asynchronously
-            invoked DelegateWrapper
-            </summary>
+        <member name="F:OpenMetaverse.PointAtType.Grab">
+            <summary></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 name="F:OpenMetaverse.PointAtType.Clear">
+            <summary></summary>
         </member>
-        <member name="M:ThreadUtil.InvokeWrappedDelegate(System.Delegate,System.Object[])">
+        <member name="T:OpenMetaverse.MoneyTransactionType">
             <summary>
-            Invokes the wrapped delegate synchronously
+            Money transaction types
             </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 name="F:OpenMetaverse.MoneyTransactionType.None">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.UDPBase">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.FailSimulatorTimeout">
+            <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 name="F:OpenMetaverse.MoneyTransactionType.FailDataserverTimeout">
+            <summary></summary>
         </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 name="F:OpenMetaverse.MoneyTransactionType.ObjectClaim">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.UDPBase.IsRunning">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.LandClaim">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.UDPBase.Start">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.GroupCreate">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.UDPBase.Stop">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectPublicClaim">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.PacketFrequency">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.GroupJoin">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.PacketFrequency.Low">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.TeleportCharge">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.PacketFrequency.Medium">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.UploadCharge">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.PacketFrequency.High">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.LandAuction">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MalformedDataException">
-            <summary>
-            Thrown when a packet could not be successfully deserialized
-            </summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.ClassifiedCharge">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Packets.MalformedDataException.#ctor">
-            <summary>
-            Default constructor
-            </summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectTax">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Packets.MalformedDataException.#ctor(System.String)">
-            <summary>
-            Constructor that takes an additional error message
-            </summary>
-            <param name="Message">An error message to attach to this exception</param>
+        <member name="F:OpenMetaverse.MoneyTransactionType.LandTax">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.Header">
-            <summary>
-            The header of a message template packet. Holds packet flags, sequence
-            number, packet ID, and any ACKs that will be appended at the end of
-            the packet
-            </summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.LightTax">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Packets.Header.AcksToBytes(System.Byte[],System.Int32@)">
-            <summary>
-            Convert the AckList to a byte array, used for packet serializing
-            </summary>
-            <param name="bytes">Reference to the target byte array</param>
-            <param name="i">Beginning position to start writing to in the byte
-            array, will be updated with the ending position of the ACK list</param>
+        <member name="F:OpenMetaverse.MoneyTransactionType.ParcelDirFee">
+            <summary></summary>
         </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>
+        <member name="F:OpenMetaverse.MoneyTransactionType.GroupTax">
+            <summary></summary>
         </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>
+        <member name="F:OpenMetaverse.MoneyTransactionType.ClassifiedRenew">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PacketBlock">
-            <summary>
-            A block of data in a packet. Packets are composed of one or more blocks,
-            each block containing one or more fields
-            </summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.GiveInventory">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.Packets.PacketBlock.Length">
-            <summary>Current length of the data in this packet</summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectSale">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Packets.PacketBlock.FromBytes(System.Byte[],System.Int32@)">
-            <summary>
-            Create a block from a byte array
-            </summary>
-            <param name="bytes">Byte array containing the serialized block</param>
-            <param name="i">Starting position of the block in the byte array.
-            This will point to the data after the end of the block when the
-            call returns</param>
+        <member name="F:OpenMetaverse.MoneyTransactionType.Gift">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Packets.PacketBlock.ToBytes(System.Byte[],System.Int32@)">
-            <summary>
-            Serialize this block into a byte array
-            </summary>
-            <param name="bytes">Byte array to serialize this block into</param>
-            <param name="i">Starting position in the byte array to serialize to.
-            This will point to the position directly after the end of the
-            serialized block when the call returns</param>
+        <member name="F:OpenMetaverse.MoneyTransactionType.LandSale">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.Packets.PacketType.Default">
-            <summary>A generic value, not an actual packet type</summary>
+        <member name="F:OpenMetaverse.MoneyTransactionType.ReferBonus">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TestMessagePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.MoneyTransactionType.InventorySale">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TestMessagePacket.TestBlock1Block">
-            <exclude />
+        <member name="F:OpenMetaverse.MoneyTransactionType.RefundPurchase">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TestMessagePacket.NeighborBlockBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MoneyTransactionType.LandPassSale">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UseCircuitCodePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.MoneyTransactionType.DwellBonus">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UseCircuitCodePacket.CircuitCodeBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MoneyTransactionType.PayObject">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TelehubInfoPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectPays">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TelehubInfoPacket.TelehubBlockBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MoneyTransactionType.GroupLandDeed">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TelehubInfoPacket.SpawnPointBlockBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MoneyTransactionType.GroupObjectDeed">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EconomyDataRequestPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.MoneyTransactionType.GroupLiability">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EconomyDataPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.MoneyTransactionType.GroupDividend">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EconomyDataPacket.InfoBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MoneyTransactionType.GroupMembershipDues">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPickerRequestPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectRelease">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPickerRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MoneyTransactionType.LandRelease">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPickerRequestPacket.DataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectDelete">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPickerReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectPublicDecay">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPickerReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MoneyTransactionType.ObjectPublicDelete">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPickerReplyPacket.DataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MoneyTransactionType.LindenAdjustment">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PlacesQueryPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.MoneyTransactionType.LindenGrant">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PlacesQueryPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MoneyTransactionType.LindenPenalty">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PlacesQueryPacket.TransactionDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MoneyTransactionType.EventFee">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PlacesQueryPacket.QueryDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MoneyTransactionType.EventPrize">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PlacesReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.MoneyTransactionType.StipendBasic">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PlacesReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MoneyTransactionType.StipendDeveloper">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PlacesReplyPacket.TransactionDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MoneyTransactionType.StipendAlways">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PlacesReplyPacket.QueryDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MoneyTransactionType.StipendDaily">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirFindQueryPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.MoneyTransactionType.StipendRating">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirFindQueryPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MoneyTransactionType.StipendDelta">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirFindQueryPacket.QueryDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.TransactionFlags">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPlacesQueryPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.TransactionFlags.None">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPlacesQueryPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.TransactionFlags.SourceGroup">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPlacesQueryPacket.QueryDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.TransactionFlags.DestGroup">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPlacesReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.TransactionFlags.OwnerGroup">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPlacesReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.TransactionFlags.SimultaneousContribution">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPlacesReplyPacket.QueryDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.TransactionFlags.ContributionRemoval">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPlacesReplyPacket.QueryRepliesBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.MeanCollisionType">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPlacesReplyPacket.StatusDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MeanCollisionType.None">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPeopleReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.MeanCollisionType.Bump">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPeopleReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MeanCollisionType.LLPushObject">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPeopleReplyPacket.QueryDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MeanCollisionType.SelectedObjectCollide">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPeopleReplyPacket.QueryRepliesBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MeanCollisionType.ScriptedObjectCollide">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirEventsReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.MeanCollisionType.PhysicalObjectCollide">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirEventsReplyPacket.AgentDataBlock">
-            <exclude />
+        <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>
-        <member name="T:OpenMetaverse.Packets.DirEventsReplyPacket.QueryDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ScriptControlChange.None">
+            <summary>No Flags set</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirEventsReplyPacket.QueryRepliesBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ScriptControlChange.Forward">
+            <summary>Forward (W or up Arrow)</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirEventsReplyPacket.StatusDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ScriptControlChange.Back">
+            <summary>Back (S or down arrow)</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirGroupsReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.ScriptControlChange.Left">
+            <summary>Move left (shift+A or left arrow)</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirGroupsReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ScriptControlChange.Right">
+            <summary>Move right (shift+D or right arrow)</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirGroupsReplyPacket.QueryDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ScriptControlChange.Up">
+            <summary>Up (E or PgUp)</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirGroupsReplyPacket.QueryRepliesBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ScriptControlChange.Down">
+            <summary>Down (C or PgDown)</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirClassifiedQueryPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.ScriptControlChange.RotateLeft">
+            <summary>Rotate left (A or left arrow)</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirClassifiedQueryPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ScriptControlChange.RotateRight">
+            <summary>Rotate right (D or right arrow)</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirClassifiedQueryPacket.QueryDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ScriptControlChange.LeftButton">
+            <summary>Left Mouse Button</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirClassifiedReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.ScriptControlChange.MouseLookLeftButton">
+            <summary>Left Mouse button in MouseLook</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirClassifiedReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.AgentFlags">
+            <summary>
+            Currently only used to hide your group title
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirClassifiedReplyPacket.QueryDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.AgentFlags.None">
+            <summary>No flags set</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirClassifiedReplyPacket.QueryRepliesBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.AgentFlags.HideTitle">
+            <summary>Hide your group title</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirClassifiedReplyPacket.StatusDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.AgentState">
+            <summary>
+            Action state of the avatar, which can currently be typing and
+            editing
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarClassifiedReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.AgentState.None">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarClassifiedReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.AgentState.Typing">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarClassifiedReplyPacket.DataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.AgentState.Editing">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedInfoRequestPacket">
-            <exclude />
+        <member name="T:OpenMetaverse.TeleportStatus">
+            <summary>
+            Current teleport status
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedInfoRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.TeleportStatus.None">
+            <summary>Unknown status</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedInfoRequestPacket.DataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.TeleportStatus.Start">
+            <summary>Teleport initialized</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedInfoReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.TeleportStatus.Progress">
+            <summary>Teleport in progress</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedInfoReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.TeleportStatus.Failed">
+            <summary>Teleport failed</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedInfoReplyPacket.DataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.TeleportStatus.Finished">
+            <summary>Teleport completed</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedInfoUpdatePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.TeleportStatus.Cancelled">
+            <summary>Teleport cancelled</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedInfoUpdatePacket.AgentDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.TeleportFlags">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedInfoUpdatePacket.DataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.TeleportFlags.Default">
+            <summary>No flags set, or teleport failed</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedDeletePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.TeleportFlags.SetHomeToTarget">
+            <summary>Set when newbie leaves help island for first time</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedDeletePacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.TeleportFlags.SetLastToTarget">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedDeletePacket.DataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.TeleportFlags.ViaLure">
+            <summary>Via Lure</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedGodDeletePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.TeleportFlags.ViaLandmark">
+            <summary>Via Landmark</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedGodDeletePacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.TeleportFlags.ViaLocation">
+            <summary>Via Location</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClassifiedGodDeletePacket.DataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.TeleportFlags.ViaHome">
+            <summary>Via Home</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirLandQueryPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.TeleportFlags.ViaTelehub">
+            <summary>Via Telehub</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirLandQueryPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.TeleportFlags.ViaLogin">
+            <summary>Via Login</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirLandQueryPacket.QueryDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.TeleportFlags.ViaGodlikeLure">
+            <summary>Linden Summoned</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirLandReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.TeleportFlags.Godlike">
+            <summary>Linden Forced me</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirLandReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.TeleportFlags.NineOneOne">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirLandReplyPacket.QueryDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.TeleportFlags.DisableCancel">
+            <summary>Agent Teleported Home via Script</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirLandReplyPacket.QueryRepliesBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.TeleportFlags.ViaRegionID">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPopularQueryPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.TeleportFlags.IsFlying">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPopularQueryPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.TeleportFlags.ResetHome">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPopularQueryPacket.QueryDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.TeleportFlags.ForceRedirect">
+            <summary>forced to new location for example when avatar is banned or ejected</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPopularReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.TeleportFlags.FinishedViaLure">
+            <summary>Teleport Finished via a Lure</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPopularReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.TeleportFlags.FinishedViaNewSim">
+            <summary>Finished, Sim Changed</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPopularReplyPacket.QueryDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.TeleportFlags.FinishedViaSameSim">
+            <summary>Finished, Same Sim</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DirPopularReplyPacket.QueryRepliesBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.TeleportLureFlags">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelInfoRequestPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.TeleportLureFlags.NormalLure">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelInfoRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.TeleportLureFlags.GodlikeLure">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelInfoRequestPacket.DataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.TeleportLureFlags.GodlikePursuit">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelInfoReplyPacket">
-            <exclude />
+        <member name="T:OpenMetaverse.ScriptSensorTypeFlags">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelInfoReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ScriptSensorTypeFlags.Agent">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelInfoReplyPacket.DataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ScriptSensorTypeFlags.Active">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelObjectOwnersRequestPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.ScriptSensorTypeFlags.Passive">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelObjectOwnersRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ScriptSensorTypeFlags.Scripted">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelObjectOwnersRequestPacket.ParcelDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.MuteType">
+            <summary>
+            Type of mute entry
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelObjectOwnersReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.MuteType.ByName">
+            <summary>Object muted by name</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelObjectOwnersReplyPacket.DataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MuteType.Resident">
+            <summary>Muted residet</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupNoticesListRequestPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.MuteType.Object">
+            <summary>Object muted by UUID</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupNoticesListRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MuteType.Group">
+            <summary>Muted group</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupNoticesListRequestPacket.DataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MuteType.External">
+            <summary>Muted external entry</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupNoticesListReplyPacket">
-            <exclude />
+        <member name="T:OpenMetaverse.MuteFlags">
+            <summary>
+            Flags of mute entry
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupNoticesListReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MuteFlags.Default">
+            <summary>No exceptions</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupNoticesListReplyPacket.DataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MuteFlags.TextChat">
+            <summary>Don't mute text chat</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupNoticeRequestPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.MuteFlags.VoiceChat">
+            <summary>Don't mute voice chat</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupNoticeRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MuteFlags.Particles">
+            <summary>Don't mute particles</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupNoticeRequestPacket.DataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MuteFlags.ObjectSounds">
+            <summary>Don't mute sounds</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportRequestPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.MuteFlags.All">
+            <summary>Don't mute</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.InstantMessage">
+            <summary>
+            Instant Message
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportRequestPacket.InfoBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.InstantMessage.FromAgentID">
+            <summary>Key of sender</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportLocationRequestPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.InstantMessage.FromAgentName">
+            <summary>Name of sender</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportLocationRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.InstantMessage.ToAgentID">
+            <summary>Key of destination avatar</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportLocationRequestPacket.InfoBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.InstantMessage.ParentEstateID">
+            <summary>ID of originating estate</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportLocalPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.InstantMessage.RegionID">
+            <summary>Key of originating region</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportLocalPacket.InfoBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.InstantMessage.Position">
+            <summary>Coordinates in originating region</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportLandmarkRequestPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.InstantMessage.Dialog">
+            <summary>Instant message type</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportLandmarkRequestPacket.InfoBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.InstantMessage.GroupIM">
+            <summary>Group IM session toggle</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportProgressPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.InstantMessage.IMSessionID">
+            <summary>Key of IM session, for Group Messages, the groups UUID</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportProgressPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.InstantMessage.Timestamp">
+            <summary>Timestamp of the instant message</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportProgressPacket.InfoBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.InstantMessage.Message">
+            <summary>Instant message text</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportFinishPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.InstantMessage.Offline">
+            <summary>Whether this message is held for offline avatars</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportFinishPacket.InfoBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.InstantMessage.BinaryBucket">
+            <summary>Context specific packed data</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.StartLurePacket">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.StartLurePacket.AgentDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.MuteEntry">
+            <summary>Represents muted object or resident</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.StartLurePacket.InfoBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MuteEntry.Type">
+            <summary>Type of the mute entry</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.StartLurePacket.TargetDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MuteEntry.ID">
+            <summary>UUID of the mute etnry</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportLureRequestPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.MuteEntry.Name">
+            <summary>Mute entry name</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportLureRequestPacket.InfoBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MuteEntry.Flags">
+            <summary>Mute flags</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportCancelPacket">
-            <exclude />
+        <member name="T:OpenMetaverse.TransactionInfo">
+            <summary>Transaction detail sent with MoneyBalanceReply message</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportCancelPacket.InfoBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.TransactionInfo.TransactionType">
+            <summary>Type of the transaction</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportStartPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.TransactionInfo.SourceID">
+            <summary>UUID of the transaction source</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportStartPacket.InfoBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.TransactionInfo.IsSourceGroup">
+            <summary>Is the transaction source a group</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportFailedPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.TransactionInfo.DestID">
+            <summary>UUID of the transaction destination</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportFailedPacket.InfoBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.TransactionInfo.IsDestGroup">
+            <summary>Is transaction destination a group</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TeleportFailedPacket.AlertInfoBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.TransactionInfo.Amount">
+            <summary>Transaction amount</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UndoPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.TransactionInfo.ItemDescription">
+            <summary>Transaction description</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UndoPacket.AgentDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.ChatEventArgs">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UndoPacket.ObjectDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.ChatEventArgs.#ctor(OpenMetaverse.Simulator,System.String,OpenMetaverse.ChatAudibleLevel,OpenMetaverse.ChatType,OpenMetaverse.ChatSourceType,System.String,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.Vector3)">
+            <summary>
+            Construct a new instance of the ChatEventArgs object
+            </summary>
+            <param name="simulator">Sim from which the message originates</param>
+            <param name="message">The message sent</param>
+            <param name="audible">The audible level of the message</param>
+            <param name="type">The type of message sent: whisper, shout, etc</param>
+            <param name="sourceType">The source type of the message sender</param>
+            <param name="fromName">The name of the agent or object sending the message</param>
+            <param name="sourceId">The ID of the agent or object sending the message</param>
+            <param name="ownerid">The ID of the object owner, or the agent ID sending the message</param>
+            <param name="position">The position of the agent or object sending the message</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.RedoPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.ChatEventArgs.Simulator">
+            <summary>Get the simulator sending the message</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RedoPacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.ChatEventArgs.Message">
+            <summary>Get the message sent</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RedoPacket.ObjectDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.ChatEventArgs.AudibleLevel">
+            <summary>Get the audible level of the message</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UndoLandPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.ChatEventArgs.Type">
+            <summary>Get the type of message sent: whisper, shout, etc</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UndoLandPacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.ChatEventArgs.SourceType">
+            <summary>Get the source type of the message sender</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentPausePacket">
-            <exclude />
+        <member name="P:OpenMetaverse.ChatEventArgs.FromName">
+            <summary>Get the name of the agent or object sending the message</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentPausePacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.ChatEventArgs.SourceID">
+            <summary>Get the ID of the agent or object sending the message</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentResumePacket">
-            <exclude />
+        <member name="P:OpenMetaverse.ChatEventArgs.OwnerID">
+            <summary>Get the ID of the object owner, or the agent ID sending the message</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentResumePacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.ChatEventArgs.Position">
+            <summary>Get the position of the agent or object sending the message</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChatFromViewerPacket">
-            <exclude />
+        <member name="T:OpenMetaverse.ScriptDialogEventArgs">
+            <summary>Contains the data sent when a primitive opens a dialog with this agent</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChatFromViewerPacket.AgentDataBlock">
-            <exclude />
+        <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>
+            <param name="message">The dialog message</param>
+            <param name="objectName">The name of the object that sent the dialog request</param>
+            <param name="imageID">The ID of the image to be displayed</param>
+            <param name="objectID">The ID of the primitive sending the dialog</param>
+            <param name="firstName">The first name of the senders owner</param>
+            <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="T:OpenMetaverse.Packets.ChatFromViewerPacket.ChatDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.ScriptDialogEventArgs.Message">
+            <summary>Get the dialog message</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentThrottlePacket">
-            <exclude />
+        <member name="P:OpenMetaverse.ScriptDialogEventArgs.ObjectName">
+            <summary>Get the name of the object that sent the dialog request</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentThrottlePacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.ScriptDialogEventArgs.ImageID">
+            <summary>Get the ID of the image to be displayed</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentThrottlePacket.ThrottleBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.ScriptDialogEventArgs.ObjectID">
+            <summary>Get the ID of the primitive sending the dialog</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentFOVPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.ScriptDialogEventArgs.FirstName">
+            <summary>Get the first name of the senders owner</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentFOVPacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.ScriptDialogEventArgs.LastName">
+            <summary>Get the last name of the senders owner</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentFOVPacket.FOVBlockBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.ScriptDialogEventArgs.Channel">
+            <summary>Get the communication channel the dialog was sent on, responses
+            should also send responses on this same channel</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentHeightWidthPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.ScriptDialogEventArgs.ButtonLabels">
+            <summary>Get the string labels containing the options presented in this dialog</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentHeightWidthPacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.ScriptDialogEventArgs.OwnerID">
+            <summary>UUID of the scritped object owner</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentHeightWidthPacket.HeightWidthBlockBlock">
-            <exclude />
+        <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>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket">
-            <exclude />
+        <member name="M:OpenMetaverse.ScriptQuestionEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,System.String,OpenMetaverse.ScriptPermission)">
+            <summary>
+            Construct a new instance of the ScriptQuestionEventArgs
+            </summary>
+            <param name="simulator">The simulator containing the object sending the request</param>
+            <param name="taskID">The ID of the script making the request</param>
+            <param name="itemID">The ID of the primitive containing the script making the request</param>
+            <param name="objectName">The name of the primitive making the request</param>
+            <param name="objectOwner">The name of the owner of the object making the request</param>
+            <param name="questions">The permissions being requested</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.ScriptQuestionEventArgs.Simulator">
+            <summary>Get the simulator containing the object sending the request</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket.WearableDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.ScriptQuestionEventArgs.TaskID">
+            <summary>Get the ID of the script making the request</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket.ObjectDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.ScriptQuestionEventArgs.ItemID">
+            <summary>Get the ID of the primitive containing the script making the request</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentSetAppearancePacket.VisualParamBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.ScriptQuestionEventArgs.ObjectName">
+            <summary>Get the name of the primitive making the request</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentQuitCopyPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.ScriptQuestionEventArgs.ObjectOwnerName">
+            <summary>Get the name of the owner of the object making the request</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentQuitCopyPacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.ScriptQuestionEventArgs.Questions">
+            <summary>Get the permissions being requested</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentQuitCopyPacket.FuseBlockBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.LoadUrlEventArgs">
+            <summary>Contains the data sent when a primitive sends a request 
+            to an agent to open the specified URL</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ImageNotInDatabasePacket">
-            <exclude />
+        <member name="M:OpenMetaverse.LoadUrlEventArgs.#ctor(System.String,OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean,System.String,System.String)">
+            <summary>
+            Construct a new instance of the LoadUrlEventArgs
+            </summary>
+            <param name="objectName">The name of the object sending the request</param>
+            <param name="objectID">The ID of the object sending the request</param>
+            <param name="ownerID">The ID of the owner of the object sending the request</param>
+            <param name="ownerIsGroup">True if the object is owned by a group</param>
+            <param name="message">The message sent with the request</param>
+            <param name="URL">The URL the object sent</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ImageNotInDatabasePacket.ImageIDBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.LoadUrlEventArgs.ObjectName">
+            <summary>Get the name of the object sending the request</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RebakeAvatarTexturesPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.LoadUrlEventArgs.ObjectID">
+            <summary>Get the ID of the object sending the request</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RebakeAvatarTexturesPacket.TextureDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.LoadUrlEventArgs.OwnerID">
+            <summary>Get the ID of the owner of the object sending the request</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetAlwaysRunPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.LoadUrlEventArgs.OwnerIsGroup">
+            <summary>True if the object is owned by a group</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetAlwaysRunPacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.LoadUrlEventArgs.Message">
+            <summary>Get the message sent with the request</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDeletePacket">
-            <exclude />
+        <member name="P:OpenMetaverse.LoadUrlEventArgs.URL">
+            <summary>Get the URL the object sent</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDeletePacket.AgentDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.InstantMessageEventArgs">
+            <summary>The date received from an ImprovedInstantMessage</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDeletePacket.ObjectDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.InstantMessageEventArgs.#ctor(OpenMetaverse.InstantMessage,OpenMetaverse.Simulator)">
+            <summary>
+            Construct a new instance of the InstantMessageEventArgs object
+            </summary>
+            <param name="im">the InstantMessage object</param>
+            <param name="simulator">the simulator where the InstantMessage origniated</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDuplicatePacket">
-            <exclude />
+        <member name="P:OpenMetaverse.InstantMessageEventArgs.IM">
+            <summary>Get the InstantMessage object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDuplicatePacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.InstantMessageEventArgs.Simulator">
+            <summary>Get the simulator where the InstantMessage origniated</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDuplicatePacket.SharedDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.BalanceEventArgs">
+            <summary>Contains the currency balance</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDuplicatePacket.ObjectDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.BalanceEventArgs.#ctor(System.Int32)">
+            <summary>
+            Construct a new BalanceEventArgs object
+            </summary>
+            <param name="balance">The currenct balance</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDuplicateOnRayPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.BalanceEventArgs.Balance">
+            <summary>
+            Get the currenct balance
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDuplicateOnRayPacket.AgentDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.MoneyBalanceReplyEventArgs">
+            <summary>Contains the transaction summary when an item is purchased, 
+            money is given, or land is purchased</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDuplicateOnRayPacket.ObjectDataBlock">
-            <exclude />
+        <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>
+            <param name="transactionID">The ID of the transaction</param>
+            <param name="transactionSuccess">True of the transaction was successful</param>
+            <param name="balance">The current currency balance</param>
+            <param name="metersCredit">The meters credited</param>
+            <param name="metersCommitted">The meters comitted</param>
+            <param name="description">A brief description of the transaction</param>
+            <param name="transactionInfo">Transaction info</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectScalePacket">
-            <exclude />
+        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.TransactionID">
+            <summary>Get the ID of the transaction</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectScalePacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.Success">
+            <summary>True of the transaction was successful</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectScalePacket.ObjectDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.Balance">
+            <summary>Get the remaining currency balance</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectRotationPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.MetersCredit">
+            <summary>Get the meters credited</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectRotationPacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.MetersCommitted">
+            <summary>Get the meters comitted</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectRotationPacket.ObjectDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.Description">
+            <summary>Get the description of the transaction</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectFlagUpdatePacket">
-            <exclude />
+        <member name="P:OpenMetaverse.MoneyBalanceReplyEventArgs.TransactionInfo">
+            <summary>Detailed transaction information</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectFlagUpdatePacket.AgentDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.AgentDataReplyEventArgs">
+            <summary>Data sent from the simulator containing information about your agent and active group information</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectFlagUpdatePacket.ExtraPhysicsBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.AgentDataReplyEventArgs.#ctor(System.String,System.String,OpenMetaverse.UUID,System.String,OpenMetaverse.GroupPowers,System.String)">
+            <summary>
+            Construct a new instance of the AgentDataReplyEventArgs object
+            </summary>
+            <param name="firstName">The agents first name</param>
+            <param name="lastName">The agents last name</param>
+            <param name="activeGroupID">The agents active group ID</param>
+            <param name="groupTitle">The group title of the agents active group</param>
+            <param name="groupPowers">The combined group powers the agent has in the active group</param>
+            <param name="groupName">The name of the group the agent has currently active</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectClickActionPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.FirstName">
+            <summary>Get the agents first name</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectClickActionPacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.LastName">
+            <summary>Get the agents last name</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectClickActionPacket.ObjectDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.ActiveGroupID">
+            <summary>Get the active group ID of your agent</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectImagePacket">
-            <exclude />
+        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.GroupTitle">
+            <summary>Get the active groups title of your agent</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectImagePacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.GroupPowers">
+            <summary>Get the combined group powers of your agent</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectImagePacket.ObjectDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.AgentDataReplyEventArgs.GroupName">
+            <summary>Get the active group name of your agent</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectMaterialPacket">
-            <exclude />
+        <member name="T:OpenMetaverse.AnimationsChangedEventArgs">
+            <summary>Data sent by the simulator to indicate the active/changed animations
+            applied to your agent</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectMaterialPacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.AnimationsChangedEventArgs.#ctor(OpenMetaverse.InternalDictionary{OpenMetaverse.UUID,System.Int32})">
+            <summary>
+            Construct a new instance of the AnimationsChangedEventArgs class
+            </summary>
+            <param name="agentAnimations">The dictionary that contains the changed animations</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectMaterialPacket.ObjectDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.AnimationsChangedEventArgs.Animations">
+            <summary>Get the dictionary that contains the changed animations</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectShapePacket">
-            <exclude />
+        <member name="T:OpenMetaverse.MeanCollisionEventArgs">
+            <summary>
+            Data sent from a simulator indicating a collision with your agent
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectShapePacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.MeanCollisionEventArgs.#ctor(OpenMetaverse.MeanCollisionType,OpenMetaverse.UUID,OpenMetaverse.UUID,System.Single,System.DateTime)">
+            <summary>
+            Construct a new instance of the MeanCollisionEventArgs class
+            </summary>
+            <param name="type">The type of collision that occurred</param>
+            <param name="perp">The ID of the agent or object that perpetrated the agression</param>
+            <param name="victim">The ID of the Victim</param>
+            <param name="magnitude">The strength of the collision</param>
+            <param name="time">The Time the collision occurred</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectShapePacket.ObjectDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.MeanCollisionEventArgs.Type">
+            <summary>Get the Type of collision</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectExtraParamsPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.MeanCollisionEventArgs.Aggressor">
+            <summary>Get the ID of the agent or object that collided with your agent</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectExtraParamsPacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.MeanCollisionEventArgs.Victim">
+            <summary>Get the ID of the agent that was attacked</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectExtraParamsPacket.ObjectDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.MeanCollisionEventArgs.Magnitude">
+            <summary>A value indicating the strength of the collision</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectOwnerPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.MeanCollisionEventArgs.Time">
+            <summary>Get the time the collision occurred</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectOwnerPacket.AgentDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.RegionCrossedEventArgs">
+            <summary>Data sent to your agent when it crosses region boundaries</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectOwnerPacket.HeaderDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.RegionCrossedEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.Simulator)">
+            <summary>
+            Construct a new instance of the RegionCrossedEventArgs class
+            </summary>
+            <param name="oldSim">The simulator your agent just left</param>
+            <param name="newSim">The simulator your agent is now in</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectOwnerPacket.ObjectDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.RegionCrossedEventArgs.OldSimulator">
+            <summary>Get the simulator your agent just left</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectGroupPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.RegionCrossedEventArgs.NewSimulator">
+            <summary>Get the simulator your agent is now in</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectGroupPacket.AgentDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.GroupChatJoinedEventArgs">
+            <summary>Data sent from the simulator when your agent joins a group chat session</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectGroupPacket.ObjectDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupChatJoinedEventArgs.#ctor(OpenMetaverse.UUID,System.String,OpenMetaverse.UUID,System.Boolean)">
+            <summary>
+            Construct a new instance of the GroupChatJoinedEventArgs class
+            </summary>
+            <param name="groupChatSessionID">The ID of the session</param>
+            <param name="sessionName">The name of the session</param>
+            <param name="tmpSessionID">A temporary session id used for establishing new sessions</param>
+            <param name="success">True of your agent successfully joined the session</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectBuyPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupChatJoinedEventArgs.SessionID">
+            <summary>Get the ID of the group chat session</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectBuyPacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupChatJoinedEventArgs.SessionName">
+            <summary>Get the name of the session</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectBuyPacket.ObjectDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupChatJoinedEventArgs.TmpSessionID">
+            <summary>Get the temporary session ID used for establishing new sessions</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.BuyObjectInventoryPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupChatJoinedEventArgs.Success">
+            <summary>True if your agent successfully joined the session</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.BuyObjectInventoryPacket.AgentDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.AlertMessageEventArgs">
+            <summary>Data sent by the simulator containing urgent messages</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.BuyObjectInventoryPacket.DataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.AlertMessageEventArgs.#ctor(System.String)">
+            <summary>
+            Construct a new instance of the AlertMessageEventArgs class
+            </summary>
+            <param name="message">The alert message</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.DerezContainerPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.AlertMessageEventArgs.Message">
+            <summary>Get the alert message</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DerezContainerPacket.DataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.ScriptControlEventArgs">
+            <summary>Data sent by a script requesting to take or release specified controls to your agent</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectPermissionsPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.ScriptControlEventArgs.#ctor(OpenMetaverse.ScriptControlChange,System.Boolean,System.Boolean)">
+            <summary>
+            Construct a new instance of the ScriptControlEventArgs class
+            </summary>
+            <param name="controls">The controls the script is attempting to take or release to the agent</param>
+            <param name="pass">True if the script is passing controls back to the agent</param>
+            <param name="take">True if the script is requesting controls be released to the script</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectPermissionsPacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.ScriptControlEventArgs.Controls">
+            <summary>Get the controls the script is attempting to take or release to the agent</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectPermissionsPacket.HeaderDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.ScriptControlEventArgs.Pass">
+            <summary>True if the script is passing controls back to the agent</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectPermissionsPacket.ObjectDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.ScriptControlEventArgs.Take">
+            <summary>True if the script is requesting controls be released to the script</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectSaleInfoPacket">
-            <exclude />
+        <member name="T:OpenMetaverse.CameraConstraintEventArgs">
+            <summary>
+            Data sent from the simulator to an agent to indicate its view limits
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectSaleInfoPacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.CameraConstraintEventArgs.#ctor(OpenMetaverse.Vector4)">
+            <summary>
+            Construct a new instance of the CameraConstraintEventArgs class
+            </summary>
+            <param name="collidePlane">The collision plane</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectSaleInfoPacket.ObjectDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.CameraConstraintEventArgs.CollidePlane">
+            <summary>Get the collision plane</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectNamePacket">
-            <exclude />
+        <member name="T:OpenMetaverse.ScriptSensorReplyEventArgs">
+            <summary>
+            Data containing script sensor requests which allow an agent to know the specific details
+            of a primitive sending script sensor requests
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectNamePacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.ScriptSensorReplyEventArgs.#ctor(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.Vector3,System.Single,OpenMetaverse.Quaternion,OpenMetaverse.ScriptSensorTypeFlags,OpenMetaverse.Vector3)">
+            <summary>
+            Construct a new instance of the ScriptSensorReplyEventArgs
+            </summary>
+            <param name="requestorID">The ID of the primitive sending the sensor</param>
+            <param name="groupID">The ID of the group associated with the primitive</param>
+            <param name="name">The name of the primitive sending the sensor</param>
+            <param name="objectID">The ID of the primitive sending the sensor</param>
+            <param name="ownerID">The ID of the owner of the primitive sending the sensor</param>
+            <param name="position">The position of the primitive sending the sensor</param>
+            <param name="range">The range the primitive specified to scan</param>
+            <param name="rotation">The rotation of the primitive sending the sensor</param>
+            <param name="type">The type of sensor the primitive sent</param>
+            <param name="velocity">The velocity of the primitive sending the sensor</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectNamePacket.ObjectDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.RequestorID">
+            <summary>Get the ID of the primitive sending the sensor</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDescriptionPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.GroupID">
+            <summary>Get the ID of the group associated with the primitive</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDescriptionPacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Name">
+            <summary>Get the name of the primitive sending the sensor</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDescriptionPacket.ObjectDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.ObjectID">
+            <summary>Get the ID of the primitive sending the sensor</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectCategoryPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.OwnerID">
+            <summary>Get the ID of the owner of the primitive sending the sensor</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectCategoryPacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Position">
+            <summary>Get the position of the primitive sending the sensor</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectCategoryPacket.ObjectDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Range">
+            <summary>Get the range the primitive specified to scan</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectSelectPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Rotation">
+            <summary>Get the rotation of the primitive sending the sensor</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectSelectPacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Type">
+            <summary>Get the type of sensor the primitive sent</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectSelectPacket.ObjectDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.ScriptSensorReplyEventArgs.Velocity">
+            <summary>Get the velocity of the primitive sending the sensor</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDeselectPacket">
-            <exclude />
+        <member name="T:OpenMetaverse.AvatarSitResponseEventArgs">
+            <summary>Contains the response data returned from the simulator in response to a <see cref="!:RequestSit"/></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDeselectPacket.AgentDataBlock">
-            <exclude />
+        <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>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDeselectPacket.ObjectDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.ObjectID">
+            <summary>Get the ID of the primitive the agent will be sitting on</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectAttachPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.Autopilot">
+            <summary>True if the simulator Autopilot functions were involved</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectAttachPacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.CameraAtOffset">
+            <summary>Get the camera offset of the agent when seated</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectAttachPacket.ObjectDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.CameraEyeOffset">
+            <summary>Get the camera eye offset of the agent when seated</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDetachPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.ForceMouselook">
+            <summary>True of the agent will be in mouselook mode when seated</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDetachPacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.SitPosition">
+            <summary>Get the position of the agent when seated</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDetachPacket.ObjectDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.AvatarSitResponseEventArgs.SitRotation">
+            <summary>Get the rotation of the agent when seated</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDropPacket">
-            <exclude />
+        <member name="T:OpenMetaverse.ChatSessionMemberAddedEventArgs">
+            <summary>Data sent when an agent joins a chat session your agent is currently participating in</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDropPacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.ChatSessionMemberAddedEventArgs.#ctor(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+            <summary>
+            Construct a new instance of the ChatSessionMemberAddedEventArgs object
+            </summary>
+            <param name="sessionID">The ID of the chat session</param>
+            <param name="agentID">The ID of the agent joining</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDropPacket.ObjectDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.ChatSessionMemberAddedEventArgs.SessionID">
+            <summary>Get the ID of the chat session</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectLinkPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.ChatSessionMemberAddedEventArgs.AgentID">
+            <summary>Get the ID of the agent that joined</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectLinkPacket.AgentDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.ChatSessionMemberLeftEventArgs">
+            <summary>Data sent when an agent exits a chat session your agent is currently participating in</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectLinkPacket.ObjectDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.ChatSessionMemberLeftEventArgs.#ctor(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+            <summary>
+            Construct a new instance of the ChatSessionMemberLeftEventArgs object
+            </summary>
+            <param name="sessionID">The ID of the chat session</param>
+            <param name="agentID">The ID of the Agent that left</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDelinkPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.ChatSessionMemberLeftEventArgs.SessionID">
+            <summary>Get the ID of the chat session</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDelinkPacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.ChatSessionMemberLeftEventArgs.AgentID">
+            <summary>Get the ID of the agent that left</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDelinkPacket.ObjectDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.SetDisplayNameReplyEventArgs">
+            <summary>Event arguments with the result of setting display name operation</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectGrabPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.SetDisplayNameReplyEventArgs.#ctor(System.Int32,System.String,OpenMetaverse.AgentDisplayName)">
+            <summary>Default constructor</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectGrabPacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.SetDisplayNameReplyEventArgs.Status">
+            <summary>Status code, 200 indicates settign display name was successful</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectGrabPacket.ObjectDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.SetDisplayNameReplyEventArgs.Reason">
+            <summary>Textual description of the status</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectGrabPacket.SurfaceInfoBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.SetDisplayNameReplyEventArgs.DisplayName">
+            <summary>Details of the newly set display name</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectGrabUpdatePacket">
-            <exclude />
+        <member name="T:OpenMetaverse.Rendering.IRendering">
+            <summary>
+            Abstract base for rendering plugins
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectGrabUpdatePacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ObjectGrabUpdatePacket.ObjectDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ObjectGrabUpdatePacket.SurfaceInfoBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ObjectDeGrabPacket">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ObjectDeGrabPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ObjectDeGrabPacket.ObjectDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.Assets.AssetMesh">
+            <summary>
+            Represents Mesh asset
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectDeGrabPacket.SurfaceInfoBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Assets.AssetMesh.MeshData">
+            <summary>
+            Decoded mesh data
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectSpinStartPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.Assets.AssetMesh.#ctor">
+            <summary>Initializes a new instance of an AssetMesh object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectSpinStartPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ObjectSpinStartPacket.ObjectDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.Assets.AssetMesh.Encode">
+            <summary>
+            TODO: Encodes Collada file into LLMesh format
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectSpinUpdatePacket">
-            <exclude />
+        <member name="M:OpenMetaverse.Assets.AssetMesh.Decode">
+            <summary>
+            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.Packets.ObjectSpinUpdatePacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.Assets.AssetMesh.AssetType">
+            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectSpinUpdatePacket.ObjectDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.Assets.AssetsArchiver">
+            <summary>
+            Archives assets
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectSpinStopPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Assets.AssetsArchiver.m_assets">
+            <summary>
+            Archive assets
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectSpinStopPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ObjectSpinStopPacket.ObjectDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ObjectExportSelectedPacket">
-            <exclude />
+        <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.Packets.ObjectExportSelectedPacket.AgentDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.GroupMember">
+            <summary>
+            Avatar group management
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectExportSelectedPacket.ObjectDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupMember.ID">
+            <summary>Key of Group Member</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ModifyLandPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupMember.Contribution">
+            <summary>Total land contribution</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ModifyLandPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupMember.OnlineStatus">
+            <summary>Online status information</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ModifyLandPacket.ModifyBlockBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupMember.Powers">
+            <summary>Abilities that the Group Member has</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ModifyLandPacket.ParcelDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupMember.Title">
+            <summary>Current group title</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ModifyLandPacket.ModifyBlockExtendedBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupMember.IsOwner">
+            <summary>Is a group owner</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.VelocityInterpolateOnPacket">
-            <exclude />
+        <member name="T:OpenMetaverse.GroupRole">
+            <summary>
+            Role manager for a group
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.VelocityInterpolateOnPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupRole.GroupID">
+            <summary>Key of the group</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.VelocityInterpolateOffPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupRole.ID">
+            <summary>Key of Role</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.VelocityInterpolateOffPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupRole.Name">
+            <summary>Name of Role</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.StateSavePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupRole.Title">
+            <summary>Group Title associated with Role</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.StateSavePacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupRole.Description">
+            <summary>Description of Role</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.StateSavePacket.DataBlockBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupRole.Powers">
+            <summary>Abilities Associated with Role</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ReportAutosaveCrashPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupRole.ToString">
+            <summary>Returns the role's title</summary>
+            <returns>The role's title</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.ReportAutosaveCrashPacket.AutosaveDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.GroupTitle">
+            <summary>
+            Class to represent Group Title
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SimWideDeletesPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupTitle.GroupID">
+            <summary>Key of the group</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SimWideDeletesPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupTitle.RoleID">
+            <summary>ID of the role title belongs to</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SimWideDeletesPacket.DataBlockBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupTitle.Title">
+            <summary>Group Title</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TrackAgentPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupTitle.Selected">
+            <summary>Whether title is Active</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TrackAgentPacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupTitle.ToString">
+            <summary>Returns group title</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TrackAgentPacket.TargetDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.Group">
+            <summary>
+            Represents a group on the grid
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Group.ID">
+            <summary>Key of Group</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Group.InsigniaID">
+            <summary>Key of Group Insignia</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.DownloadTotalsBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Group.FounderID">
+            <summary>Key of Group Founder</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.NetStatsBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Group.OwnerRole">
+            <summary>Key of Group Role for Owners</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.FailStatsBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Group.Name">
+            <summary>Name of Group</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerStatsPacket.MiscStatsBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Group.Charter">
+            <summary>Text of Group Charter</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptAnswerYesPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Group.MemberTitle">
+            <summary>Title of "everyone" role</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptAnswerYesPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Group.OpenEnrollment">
+            <summary>Is the group open for enrolement to everyone</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptAnswerYesPacket.DataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Group.ShowInList">
+            <summary>Will group show up in search</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UserReportPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Group.Powers">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UserReportPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Group.AcceptNotices">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UserReportPacket.ReportDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Group.AllowPublish">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AlertMessagePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Group.MaturePublish">
+            <summary>Is the group Mature</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AlertMessagePacket.AlertDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Group.MembershipFee">
+            <summary>Cost of group membership</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AlertMessagePacket.AlertInfoBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Group.Money">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentAlertMessagePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Group.Contribution">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentAlertMessagePacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Group.GroupMembershipCount">
+            <summary>The total number of current members this group has</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentAlertMessagePacket.AlertDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Group.GroupRolesCount">
+            <summary>The number of roles this group has configured</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MeanCollisionAlertPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Group.ListInProfile">
+            <summary>Show this group in agent's profile</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MeanCollisionAlertPacket.MeanCollisionBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.Group.ToString">
+            <summary>Returns the name of the group</summary>
+            <returns>A string containing the name of the group</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerFrozenMessagePacket">
-            <exclude />
+        <member name="T:OpenMetaverse.Vote">
+            <summary>
+            A group Vote
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerFrozenMessagePacket.FrozenDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Vote.Candidate">
+            <summary>Key of Avatar who created Vote</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.HealthMessagePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Vote.VoteString">
+            <summary>Text of the Vote proposal</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.HealthMessagePacket.HealthDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Vote.NumVotes">
+            <summary>Total number of votes</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChatFromSimulatorPacket">
-            <exclude />
+        <member name="T:OpenMetaverse.GroupProposal">
+            <summary>
+            A group proposal
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChatFromSimulatorPacket.ChatDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupProposal.VoteText">
+            <summary>The Text of the proposal</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SimStatsPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupProposal.Quorum">
+            <summary>The minimum number of members that must vote before proposal passes or failes</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SimStatsPacket.RegionBlock">
-            <exclude />
+        <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>
-        <member name="T:OpenMetaverse.Packets.SimStatsPacket.StatBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupProposal.Duration">
+            <summary>The duration in days votes are accepted</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SimStatsPacket.PidStatBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.GroupAccountSummary">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestRegionInfoPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupAccountSummary.IntervalDays">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestRegionInfoPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupAccountSummary.CurrentInterval">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RegionInfoPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupAccountSummary.StartDate">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RegionInfoPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupAccountSummary.Balance">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RegionInfoPacket.RegionInfoBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupAccountSummary.TotalCredits">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RegionInfoPacket.RegionInfo2Block">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupAccountSummary.TotalDebits">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GodUpdateRegionInfoPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupAccountSummary.ObjectTaxCurrent">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GodUpdateRegionInfoPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupAccountSummary.LightTaxCurrent">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GodUpdateRegionInfoPacket.RegionInfoBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupAccountSummary.LandTaxCurrent">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RegionHandshakePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupAccountSummary.GroupTaxCurrent">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RegionHandshakePacket.RegionInfoBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupAccountSummary.ParcelDirFeeCurrent">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RegionHandshakePacket.RegionInfo2Block">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupAccountSummary.ObjectTaxEstimate">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RegionHandshakePacket.RegionInfo3Block">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupAccountSummary.LightTaxEstimate">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RegionHandshakeReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupAccountSummary.LandTaxEstimate">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RegionHandshakeReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupAccountSummary.GroupTaxEstimate">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RegionHandshakeReplyPacket.RegionInfoBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupAccountSummary.ParcelDirFeeEstimate">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SimulatorViewerTimeMessagePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupAccountSummary.NonExemptMembers">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SimulatorViewerTimeMessagePacket.TimeInfoBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupAccountSummary.LastTaxDate">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EnableSimulatorPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupAccountSummary.TaxDate">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EnableSimulatorPacket.SimulatorInfoBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.GroupNotice">
+            <summary>
+            Struct representing a group notice
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DisableSimulatorPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupNotice.Subject">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TransferRequestPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupNotice.Message">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TransferRequestPacket.TransferInfoBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupNotice.AttachmentID">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TransferInfoPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupNotice.OwnerID">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TransferInfoPacket.TransferInfoBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupNotice.SerializeAttachment">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.TransferAbortPacket">
-            <exclude />
+        <member name="T:OpenMetaverse.GroupNoticesListEntry">
+            <summary>
+            Struct representing a group notice list entry
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TransferAbortPacket.TransferInfoBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupNoticesListEntry.NoticeID">
+            <summary>Notice ID</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestXferPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupNoticesListEntry.Timestamp">
+            <summary>Creation timestamp of notice</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestXferPacket.XferIDBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupNoticesListEntry.FromName">
+            <summary>Agent name who created notice</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AbortXferPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupNoticesListEntry.Subject">
+            <summary>Notice subject</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AbortXferPacket.XferIDBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupNoticesListEntry.HasAttachment">
+            <summary>Is there an attachment?</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarAppearancePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupNoticesListEntry.AssetType">
+            <summary>Attachment Type</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarAppearancePacket.SenderBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.ChatSessionMember">
+            <summary>
+            Struct representing a member of a group chat session and their settings
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarAppearancePacket.ObjectDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ChatSessionMember.AvatarKey">
+            <summary>The <see cref="T:OpenMetaverse.UUID"/> of the Avatar</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarAppearancePacket.VisualParamBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ChatSessionMember.CanVoiceChat">
+            <summary>True if user has voice chat enabled</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetFollowCamPropertiesPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.ChatSessionMember.IsModerator">
+            <summary>True of Avatar has moderator abilities</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetFollowCamPropertiesPacket.ObjectDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ChatSessionMember.MuteText">
+            <summary>True if a moderator has muted this avatars chat</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetFollowCamPropertiesPacket.CameraPropertyBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ChatSessionMember.MuteVoice">
+            <summary>True if a moderator has muted this avatars voice</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClearFollowCamPropertiesPacket">
-            <exclude />
+        <member name="T:OpenMetaverse.GroupRoleUpdate">
+            <summary>
+            Role update flags
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ClearFollowCamPropertiesPacket.ObjectDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupRoleUpdate.NoUpdate">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestPayPricePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupRoleUpdate.UpdateData">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestPayPricePacket.ObjectDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupRoleUpdate.UpdatePowers">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PayPriceReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupRoleUpdate.UpdateAll">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PayPriceReplyPacket.ObjectDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupRoleUpdate.Create">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PayPriceReplyPacket.ButtonDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupRoleUpdate.Delete">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.KickUserPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.None">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.KickUserPacket.TargetBlockBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.Invite">
+            <summary>Can send invitations to groups default role</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.KickUserPacket.UserInfoBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.Eject">
+            <summary>Can eject members from group</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GodKickUserPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.ChangeOptions">
+            <summary>Can toggle 'Open Enrollment' and change 'Signup fee'</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GodKickUserPacket.UserInfoBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.MemberVisible">
+            <summary>Member is visible in the public member list</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EjectUserPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.CreateRole">
+            <summary>Can create new roles</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EjectUserPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.DeleteRole">
+            <summary>Can delete existing roles</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EjectUserPacket.DataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.RoleProperties">
+            <summary>Can change Role names, titles and descriptions</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.FreezeUserPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.AssignMemberLimited">
+            <summary>Can assign other members to assigners role</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.FreezeUserPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.AssignMember">
+            <summary>Can assign other members to any role</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.FreezeUserPacket.DataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.RemoveMember">
+            <summary>Can remove members from roles</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPropertiesRequestPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.ChangeActions">
+            <summary>Can assign and remove abilities in roles</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPropertiesRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.ChangeIdentity">
+            <summary>Can change group Charter, Insignia, 'Publish on the web' and which
+            members are publicly visible in group member listings</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPropertiesReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.LandDeed">
+            <summary>Can buy land or deed land to group</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPropertiesReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.LandRelease">
+            <summary>Can abandon group owned land to Governor Linden on mainland, or Estate owner for
+            private estates</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPropertiesReplyPacket.PropertiesDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.LandSetSale">
+            <summary>Can set land for-sale information on group owned parcels</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarInterestsReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.LandDivideJoin">
+            <summary>Can subdivide and join parcels</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarInterestsReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.JoinChat">
+            <summary>Can join group chat sessions</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarInterestsReplyPacket.PropertiesDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.AllowVoiceChat">
+            <summary>Can use voice chat in Group Chat sessions</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarGroupsReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.ModerateChat">
+            <summary>Can moderate group chat sessions</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarGroupsReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.FindPlaces">
+            <summary>Can toggle "Show in Find Places" and set search category</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarGroupsReplyPacket.GroupDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.LandChangeIdentity">
+            <summary>Can change parcel name, description, and 'Publish on web' settings</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarGroupsReplyPacket.NewGroupDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.SetLandingPoint">
+            <summary>Can set the landing point and teleport routing on group land</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPropertiesUpdatePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.ChangeMedia">
+            <summary>Can change music and media settings</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPropertiesUpdatePacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.LandEdit">
+            <summary>Can toggle 'Edit Terrain' option in Land settings</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPropertiesUpdatePacket.PropertiesDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.LandOptions">
+            <summary>Can toggle various About Land > Options settings</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarInterestsUpdatePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.AllowEditLand">
+            <summary>Can always terraform land, even if parcel settings have it turned off</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarInterestsUpdatePacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.AllowFly">
+            <summary>Can always fly while over group owned land</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarInterestsUpdatePacket.PropertiesDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.AllowRez">
+            <summary>Can always rez objects on group owned land</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarNotesReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.AllowLandmark">
+            <summary>Can always create landmarks for group owned parcels</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarNotesReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.AllowSetHome">
+            <summary>Can set home location on any group owned parcel</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarNotesReplyPacket.DataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.LandManageAllowed">
+            <summary>Can modify public access settings for group owned parcels</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarNotesUpdatePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.LandManageBanned">
+            <summary>Can manager parcel ban lists on group owned land</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarNotesUpdatePacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.LandManagePasses">
+            <summary>Can manage pass list sales information</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarNotesUpdatePacket.DataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.LandEjectAndFreeze">
+            <summary>Can eject and freeze other avatars on group owned land</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPicksReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.ReturnGroupSet">
+            <summary>Can return objects set to group</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPicksReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.ReturnNonGroup">
+            <summary>Can return non-group owned/set objects</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarPicksReplyPacket.DataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.ReturnGroupOwned">
+            <summary>Can return group owned objects</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventInfoRequestPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.LandGardening">
+            <summary>Can landscape using Linden plants</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventInfoRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.DeedObject">
+            <summary>Can deed objects to group</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventInfoRequestPacket.EventDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.ObjectManipulate">
+            <summary>Can move group owned objects</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventInfoReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.ObjectSetForSale">
+            <summary>Can set group owned objects for-sale</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventInfoReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.Accountable">
+            <summary>Pay group liabilities and receive group dividends</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventInfoReplyPacket.EventDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.HostEvent">
+            <summary>List and Host group events</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventNotificationAddRequestPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.SendNotices">
+            <summary>Can send group notices</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventNotificationAddRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.ReceiveNotices">
+            <summary>Can receive group notices</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventNotificationAddRequestPacket.EventDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.StartProposal">
+            <summary>Can create group proposals</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventNotificationRemoveRequestPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupPowers.VoteOnProposal">
+            <summary>Can vote on group proposals</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventNotificationRemoveRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.GroupManager">
+            <summary>
+            Handles all network traffic related to reading and writing group
+            information
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventNotificationRemoveRequestPacket.EventDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.m_CurrentGroups">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventGodDeletePacket">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.EventGodDeletePacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.m_CurrentGroupsLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventGodDeletePacket.EventDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.m_GroupNames">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.EventGodDeletePacket.QueryDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.PickInfoReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.m_GroupNamesLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PickInfoReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.m_GroupProfile">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PickInfoReplyPacket.DataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.PickInfoUpdatePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.m_GroupProfileLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PickInfoUpdatePacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.m_GroupMembers">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PickInfoUpdatePacket.DataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.PickDeletePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.m_GroupMembersLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PickDeletePacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.m_GroupRoles">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PickDeletePacket.DataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.PickGodDeletePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.m_GroupRolesLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PickGodDeletePacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.m_GroupRoleMembers">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PickGodDeletePacket.DataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ScriptQuestionPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.m_GroupRolesMembersLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptQuestionPacket.DataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.m_GroupTitles">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptControlChangePacket">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ScriptControlChangePacket.DataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.m_GroupTitlesLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptDialogPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.m_GroupAccountSummary">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptDialogPacket.DataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ScriptDialogPacket.ButtonsBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.m_GroupAccountSummaryLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptDialogPacket.OwnerDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.m_GroupCreated">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptDialogReplyPacket">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ScriptDialogReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.m_GroupCreatedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptDialogReplyPacket.DataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.m_GroupJoined">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ForceScriptControlReleasePacket">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ForceScriptControlReleasePacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.m_GroupJoinedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RevokePermissionsPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.m_GroupLeft">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RevokePermissionsPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.RevokePermissionsPacket.DataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.m_GroupLeftLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LoadURLPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.m_GroupDropped">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LoadURLPacket.DataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ScriptTeleportRequestPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.m_GroupDroppedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptTeleportRequestPacket.DataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.m_GroupMemberEjected">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelOverlayPacket">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ParcelOverlayPacket.ParcelDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.m_GroupMemberEjectedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestByIDPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.m_GroupNoticesListReply">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestByIDPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ParcelPropertiesRequestByIDPacket.ParcelDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.m_GroupNoticesListReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelPropertiesUpdatePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.m_GroupInvitation">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelPropertiesUpdatePacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ParcelPropertiesUpdatePacket.ParcelDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.m_GroupInvitationLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.Client">
+            <summary>A reference to the current <seealso cref="T:OpenMetaverse.GridClient"/> instance</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.GroupMembersRequests">
+            <summary>Currently-active group members requests</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket.ParcelDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.GroupRolesRequests">
+            <summary>Currently-active group roles requests</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket.TaskIDsBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.GroupRolesMembersRequests">
+            <summary>Currently-active group role-member requests</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelReturnObjectsPacket.OwnerIDsBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.TempGroupMembers">
+            <summary>Dictionary keeping group members while request is in progress</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelSetOtherCleanTimePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.TempGroupRolesMembers">
+            <summary>Dictionary keeping mebmer/role mapping while request is in progress</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelSetOtherCleanTimePacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.TempGroupRoles">
+            <summary>Dictionary keeping GroupRole information while request is in progress</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelSetOtherCleanTimePacket.ParcelDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.GroupManager.GroupName2KeyCache">
+            <summary>Caches group name lookups</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.RequestCurrentGroups">
+            <summary>
+            Request a current list of groups the avatar is a member of.
+            </summary>
+            <remarks>CAPS Event Queue must be running for this to work since the results
+            come across CAPS.</remarks>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket.ParcelDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.RequestGroupName(OpenMetaverse.UUID)">
+            <summary>
+            Lookup name of group based on groupID
+            </summary>
+            <param name="groupID">groupID of group to lookup name for.</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket.TaskIDsBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.RequestGroupNames(System.Collections.Generic.List{OpenMetaverse.UUID})">
+            <summary>
+            Request lookup of multiple group names
+            </summary>
+            <param name="groupIDs">List of group IDs to request.</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDisableObjectsPacket.OwnerIDsBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.RequestGroupProfile(OpenMetaverse.UUID)">
+            <summary>Lookup group profile data such as name, enrollment, founder, logo, etc</summary>
+            <remarks>Subscribe to <code>OnGroupProfile</code> event to receive the results.</remarks>
+            <param name="group">group ID (UUID)</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelSelectObjectsPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.RequestGroupMembers(OpenMetaverse.UUID)">
+            <summary>Request a list of group members.</summary>
+            <remarks>Subscribe to <code>OnGroupMembers</code> event to receive the results.</remarks>
+            <param name="group">group ID (UUID)</param>
+            <returns>UUID of the request, use to index into cache</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelSelectObjectsPacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.RequestGroupRoles(OpenMetaverse.UUID)">
+            <summary>Request group roles</summary>
+            <remarks>Subscribe to <code>OnGroupRoles</code> event to receive the results.</remarks>
+            <param name="group">group ID (UUID)</param>
+            <returns>UUID of the request, use to index into cache</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelSelectObjectsPacket.ParcelDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.RequestGroupRolesMembers(OpenMetaverse.UUID)">
+            <summary>Request members (members,role) role mapping for a group.</summary>
+            <remarks>Subscribe to <code>OnGroupRolesMembers</code> event to receive the results.</remarks>
+            <param name="group">group ID (UUID)</param>
+            <returns>UUID of the request, use to index into cache</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelSelectObjectsPacket.ReturnIDsBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.RequestGroupTitles(OpenMetaverse.UUID)">
+            <summary>Request a groups Titles</summary>
+            <remarks>Subscribe to <code>OnGroupTitles</code> event to receive the results.</remarks>
+            <param name="group">group ID (UUID)</param>
+            <returns>UUID of the request, use to index into cache</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.EstateCovenantRequestPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.RequestGroupAccountSummary(OpenMetaverse.UUID,System.Int32,System.Int32)">
+            <summary>Begin to get the group account summary</summary>
+            <remarks>Subscribe to the <code>OnGroupAccountSummary</code> event to receive the results.</remarks>
+            <param name="group">group ID (UUID)</param>
+            <param name="intervalDays">How long of an interval</param>
+            <param name="currentInterval">Which interval (0 for current, 1 for last)</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.EstateCovenantRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.Invite(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.UUID},OpenMetaverse.UUID)">
+            <summary>Invites a user to a group</summary>
+            <param name="group">The group to invite to</param>
+            <param name="roles">A list of roles to invite a person to</param>
+            <param name="personkey">Key of person to invite</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.EstateCovenantReplyPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.ActivateGroup(OpenMetaverse.UUID)">
+            <summary>Set a group as the current active group</summary>
+            <param name="id">group ID (UUID)</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.EstateCovenantReplyPacket.DataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.ActivateTitle(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+            <summary>Change the role that determines your active title</summary>
+            <param name="group">Group ID to use</param>
+            <param name="role">Role ID to change to</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ForceObjectSelectPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.SetGroupContribution(OpenMetaverse.UUID,System.Int32)">
+            <summary>Set this avatar's tier contribution</summary>
+            <param name="group">Group ID to change tier in</param>
+            <param name="contribution">amount of tier to donate</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ForceObjectSelectPacket.HeaderBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.SetGroupAcceptNotices(OpenMetaverse.UUID,System.Boolean,System.Boolean)">
+            <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="acceptNotices">Accept notices from this group</param>
+            <param name="listInProfile">List this group in the profile</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ForceObjectSelectPacket.DataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.RequestJoinGroup(OpenMetaverse.UUID)">
+            <summary>Request to join a group</summary>
+            <remarks>Subscribe to <code>OnGroupJoined</code> event for confirmation.</remarks>
+            <param name="id">group ID (UUID) to join.</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelBuyPassPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.RequestCreateGroup(OpenMetaverse.Group)">
+            <summary>
+            Request to create a new group. If the group is successfully
+            created, L$100 will automatically be deducted
+            </summary>
+            <remarks>Subscribe to <code>OnGroupCreated</code> event to receive confirmation.</remarks>
+            <param name="group">Group struct containing the new group info</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelBuyPassPacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.UpdateGroup(OpenMetaverse.UUID,OpenMetaverse.Group)">
+            <summary>Update a group's profile and other information</summary>
+            <param name="id">Groups ID (UUID) to update.</param>
+            <param name="group">Group struct to update.</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelBuyPassPacket.ParcelDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.EjectUser(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+            <summary>Eject a user from a group</summary>
+            <param name="group">Group ID to eject the user from</param>
+            <param name="member">Avatar's key to eject</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDeedToGroupPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.UpdateRole(OpenMetaverse.GroupRole)">
+            <summary>Update role information</summary>
+            <param name="role">Modified role to be updated</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDeedToGroupPacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.CreateRole(OpenMetaverse.UUID,OpenMetaverse.GroupRole)">
+            <summary>Create a new group role</summary>
+            <param name="group">Group ID to update</param>
+            <param name="role">Role to create</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDeedToGroupPacket.DataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.DeleteRole(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+            <summary>Delete a group role</summary>
+            <param name="group">Group ID to update</param>
+            <param name="roleID">Role to delete</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelReclaimPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.RemoveFromRole(OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID)">
+            <summary>Remove an avatar from a role</summary>
+            <param name="group">Group ID to update</param>
+            <param name="role">Role ID to be removed from</param>
+            <param name="member">Avatar's Key to remove</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelReclaimPacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.AddToRole(OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID)">
+            <summary>Assign an avatar to a role</summary>
+            <param name="group">Group ID to update</param>
+            <param name="role">Role ID to assign to</param>
+            <param name="member">Avatar's ID to assign to role</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelReclaimPacket.DataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.RequestGroupNoticesList(OpenMetaverse.UUID)">
+            <summary>Request the group notices list</summary>
+            <param name="group">Group ID to fetch notices for</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelClaimPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.RequestGroupNotice(OpenMetaverse.UUID)">
+            <summary>Request a group notice by key</summary>
+            <param name="noticeID">ID of group notice</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelClaimPacket.AgentDataBlock">
-            <exclude />
+        <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>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelClaimPacket.DataBlock">
-            <exclude />
+        <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>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelClaimPacket.ParcelDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.LeaveGroup(OpenMetaverse.UUID)">
+            <summary>Request to leave a group</summary>
+            <remarks>Subscribe to <code>OnGroupLeft</code> event to receive confirmation</remarks>
+            <param name="groupID">The group to leave</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelJoinPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.AgentDropGroupHandler(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.Packets.ParcelJoinPacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.GroupProfileReplyHandler(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.Packets.ParcelJoinPacket.ParcelDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.GroupNoticesListReplyHandler(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.Packets.ParcelDividePacket">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.GroupTitlesReplyHandler(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.Packets.ParcelDividePacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.GroupMembersHandler(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.Packets.ParcelDividePacket.ParcelDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.GroupRoleDataReplyHandler(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.Packets.ParcelReleasePacket">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.GroupRoleMembersReplyHandler(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.Packets.ParcelReleasePacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.GroupActiveProposalItemHandler(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.Packets.ParcelReleasePacket.DataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.GroupVoteHistoryItemHandler(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.Packets.ParcelBuyPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.GroupAccountSummaryReplyHandler(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.Packets.ParcelBuyPacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.CreateGroupReplyHandler(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.Packets.ParcelBuyPacket.DataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.JoinGroupReplyHandler(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.Packets.ParcelBuyPacket.ParcelDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.LeaveGroupReplyHandler(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.Packets.ParcelGodForceOwnerPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.UUIDGroupNameReplyHandler(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.Packets.ParcelGodForceOwnerPacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupManager.EjectGroupMemberReplyHandler(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.Packets.ParcelGodForceOwnerPacket.DataBlock">
-            <exclude />
+        <member name="E:OpenMetaverse.GroupManager.CurrentGroups">
+            <summary>Raised when the simulator sends us data containing
+            our current group membership</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelAccessListRequestPacket">
-            <exclude />
+        <member name="E:OpenMetaverse.GroupManager.GroupNamesReply">
+            <summary>Raised when the simulator responds to a RequestGroupName 
+            or RequestGroupNames request</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelAccessListRequestPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ParcelAccessListRequestPacket.DataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ParcelAccessListReplyPacket">
-            <exclude />
+        <member name="E:OpenMetaverse.GroupManager.GroupRoleDataReply">
+            <summary>Raised when the simulator responds to a <see cref="!:RequestGroupRoleData"/> request</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelAccessListReplyPacket.DataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ParcelAccessListReplyPacket.ListBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ParcelAccessListUpdatePacket">
-            <exclude />
+        <member name="E:OpenMetaverse.GroupManager.GroupAccountSummaryReply">
+            <summary>Raised when a response to a RequestGroupAccountSummary is returned
+            by the simulator</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelAccessListUpdatePacket.AgentDataBlock">
-            <exclude />
+        <member name="E:OpenMetaverse.GroupManager.GroupCreatedReply">
+            <summary>Raised when a request to create a group is successful</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelAccessListUpdatePacket.DataBlock">
-            <exclude />
+        <member name="E:OpenMetaverse.GroupManager.GroupJoinedReply">
+            <summary>Raised when a request to join a group either
+            fails or succeeds</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelAccessListUpdatePacket.ListBlock">
-            <exclude />
+        <member name="E:OpenMetaverse.GroupManager.GroupLeaveReply">
+            <summary>Raised when a request to leave a group either
+            fails or succeeds</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDwellRequestPacket">
-            <exclude />
+        <member name="E:OpenMetaverse.GroupManager.GroupDropped">
+            <summary>Raised when A group is removed from the group server</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDwellRequestPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ParcelDwellRequestPacket.DataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ParcelDwellReplyPacket">
-            <exclude />
+        <member name="E:OpenMetaverse.GroupManager.GroupInvitation">
+            <summary>Raised when another agent invites our avatar to join a group</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDwellReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.CurrentGroupsEventArgs">
+            <summary>Contains the current groups your agent is a member of</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelDwellReplyPacket.DataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.CurrentGroupsEventArgs.#ctor(System.Collections.Generic.Dictionary{OpenMetaverse.UUID,OpenMetaverse.Group})">
+            <summary>Construct a new instance of the CurrentGroupsEventArgs class</summary>
+            <param name="groups">The current groups your agent is a member of</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelGodMarkAsContentPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.CurrentGroupsEventArgs.Groups">
+            <summary>Get the current groups your agent is a member of</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelGodMarkAsContentPacket.AgentDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.GroupNamesEventArgs">
+            <summary>A Dictionary of group names, where the Key is the groups ID and the value is the groups name</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelGodMarkAsContentPacket.ParcelDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupNamesEventArgs.#ctor(System.Collections.Generic.Dictionary{OpenMetaverse.UUID,System.String})">
+            <summary>Construct a new instance of the GroupNamesEventArgs class</summary>
+            <param name="groupNames">The Group names dictionary</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerStartAuctionPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupNamesEventArgs.GroupNames">
+            <summary>Get the Group Names dictionary</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerStartAuctionPacket.AgentDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.GroupMembersReplyEventArgs">
+            <summary>Represents the members of a group</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerStartAuctionPacket.ParcelDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupMembersReplyEventArgs.#ctor(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Collections.Generic.Dictionary{OpenMetaverse.UUID,OpenMetaverse.GroupMember})">
+            <summary>
+            Construct a new instance of the GroupMembersReplyEventArgs class
+            </summary>
+            <param name="requestID">The ID of the request</param>
+            <param name="groupID">The ID of the group</param>
+            <param name="members">The membership list of the group</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.UUIDNameRequestPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupMembersReplyEventArgs.RequestID">
+            <summary>Get the ID as returned by the request to correlate
+            this result set and the request</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UUIDNameRequestPacket.UUIDNameBlockBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupMembersReplyEventArgs.GroupID">
+            <summary>Get the ID of the group</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UUIDNameReplyPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupMembersReplyEventArgs.Members">
+            <summary>Get the dictionary of members</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UUIDNameReplyPacket.UUIDNameBlockBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.GroupRolesDataReplyEventArgs">
+            <summary>Represents the roles associated with a group</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UUIDGroupNameRequestPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupRolesDataReplyEventArgs.#ctor(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Collections.Generic.Dictionary{OpenMetaverse.UUID,OpenMetaverse.GroupRole})">
+            <summary>Construct a new instance of the GroupRolesDataReplyEventArgs class</summary>
+            <param name="requestID">The ID as returned by the request to correlate
+            this result set and the request</param>
+            <param name="groupID">The ID of the group</param>
+            <param name="roles">The dictionary containing the roles</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.UUIDGroupNameRequestPacket.UUIDNameBlockBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupRolesDataReplyEventArgs.RequestID">
+            <summary>Get the ID as returned by the request to correlate
+            this result set and the request</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UUIDGroupNameReplyPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupRolesDataReplyEventArgs.GroupID">
+            <summary>Get the ID of the group</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UUIDGroupNameReplyPacket.UUIDNameBlockBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupRolesDataReplyEventArgs.Roles">
+            <summary>Get the dictionary containing the roles</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentDyingPacket">
-            <exclude />
+        <member name="T:OpenMetaverse.GroupRolesMembersReplyEventArgs">
+            <summary>Represents the Role to Member mappings for a group</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentDyingPacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupRolesMembersReplyEventArgs.#ctor(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Collections.Generic.List{System.Collections.Generic.KeyValuePair{OpenMetaverse.UUID,OpenMetaverse.UUID}})">
+            <summary>Construct a new instance of the GroupRolesMembersReplyEventArgs class</summary>
+            <param name="requestID">The ID as returned by the request to correlate
+            this result set and the request</param>
+            <param name="groupID">The ID of the group</param>
+            <param name="rolesMembers">The member to roles map</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentUnknownPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupRolesMembersReplyEventArgs.RequestID">
+            <summary>Get the ID as returned by the request to correlate
+            this result set and the request</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentUnknownPacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupRolesMembersReplyEventArgs.GroupID">
+            <summary>Get the ID of the group</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GetScriptRunningPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupRolesMembersReplyEventArgs.RolesMembers">
+            <summary>Get the member to roles map</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GetScriptRunningPacket.ScriptBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.GroupTitlesReplyEventArgs">
+            <summary>Represents the titles for a group</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptRunningReplyPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupTitlesReplyEventArgs.#ctor(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Collections.Generic.Dictionary{OpenMetaverse.UUID,OpenMetaverse.GroupTitle})">
+            <summary>Construct a new instance of the GroupTitlesReplyEventArgs class</summary>
+            <param name="requestID">The ID as returned by the request to correlate
+            this result set and the request</param>
+            <param name="groupID">The ID of the group</param>
+            <param name="titles">The titles</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptRunningReplyPacket.ScriptBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupTitlesReplyEventArgs.RequestID">
+            <summary>Get the ID as returned by the request to correlate
+            this result set and the request</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetScriptRunningPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupTitlesReplyEventArgs.GroupID">
+            <summary>Get the ID of the group</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetScriptRunningPacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupTitlesReplyEventArgs.Titles">
+            <summary>Get the titles</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetScriptRunningPacket.ScriptBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.GroupAccountSummaryReplyEventArgs">
+            <summary>Represents the summary data for a group</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptResetPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupAccountSummaryReplyEventArgs.#ctor(OpenMetaverse.UUID,OpenMetaverse.GroupAccountSummary)">
+            <summary>Construct a new instance of the GroupAccountSummaryReplyEventArgs class</summary>
+            <param name="groupID">The ID of the group</param>
+            <param name="summary">The summary data</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptResetPacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupAccountSummaryReplyEventArgs.GroupID">
+            <summary>Get the ID of the group</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptResetPacket.ScriptBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupAccountSummaryReplyEventArgs.Summary">
+            <summary>Get the summary data</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptSensorRequestPacket">
-            <exclude />
+        <member name="T:OpenMetaverse.GroupCreatedReplyEventArgs">
+            <summary>A response to a group create request</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptSensorRequestPacket.RequesterBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupCreatedReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Boolean,System.String)">
+            <summary>Construct a new instance of the GroupCreatedReplyEventArgs class</summary>
+            <param name="groupID">The ID of the group</param>
+            <param name="success">the success or faulure of the request</param>
+            <param name="messsage">A string containing additional information</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptSensorReplyPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupCreatedReplyEventArgs.GroupID">
+            <summary>Get the ID of the group</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptSensorReplyPacket.RequesterBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupCreatedReplyEventArgs.Success">
+            <summary>true of the  group was created successfully</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ScriptSensorReplyPacket.SensedDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupCreatedReplyEventArgs.Message">
+            <summary>A string containing the message</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CompleteAgentMovementPacket">
-            <exclude />
+        <member name="T:OpenMetaverse.GroupOperationEventArgs">
+            <summary>Represents a response to a request</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CompleteAgentMovementPacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupOperationEventArgs.#ctor(OpenMetaverse.UUID,System.Boolean)">
+            <summary>Construct a new instance of the GroupOperationEventArgs class</summary>
+            <param name="groupID">The ID of the group</param>
+            <param name="success">true of the request was successful</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentMovementCompletePacket">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupOperationEventArgs.GroupID">
+            <summary>Get the ID of the group</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentMovementCompletePacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupOperationEventArgs.Success">
+            <summary>true of the request was successful</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentMovementCompletePacket.DataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.GroupDroppedEventArgs">
+            <summary>Represents your agent leaving a group</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentMovementCompletePacket.SimDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupDroppedEventArgs.#ctor(OpenMetaverse.UUID)">
+            <summary>Construct a new instance of the GroupDroppedEventArgs class</summary>
+            <param name="groupID">The ID of the group</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.LogoutRequestPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupDroppedEventArgs.GroupID">
+            <summary>Get the ID of the group</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LogoutRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.GroupNoticesListReplyEventArgs">
+            <summary>Represents a list of active group notices</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LogoutReplyPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupNoticesListReplyEventArgs.#ctor(OpenMetaverse.UUID,System.Collections.Generic.List{OpenMetaverse.GroupNoticesListEntry})">
+            <summary>Construct a new instance of the GroupNoticesListReplyEventArgs class</summary>
+            <param name="groupID">The ID of the group</param>
+            <param name="notices">The list containing active notices</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.LogoutReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupNoticesListReplyEventArgs.GroupID">
+            <summary>Get the ID of the group</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LogoutReplyPacket.InventoryDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupNoticesListReplyEventArgs.Notices">
+            <summary>Get the notices list</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ImprovedInstantMessagePacket">
-            <exclude />
+        <member name="T:OpenMetaverse.GroupProfileEventArgs">
+            <summary>Represents the profile of a group</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ImprovedInstantMessagePacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.GroupProfileEventArgs.#ctor(OpenMetaverse.Group)">
+            <summary>Construct a new instance of the GroupProfileEventArgs class</summary>
+            <param name="group">The group profile</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ImprovedInstantMessagePacket.MessageBlockBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupProfileEventArgs.Group">
+            <summary>Get the group profile</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RetrieveInstantMessagesPacket">
-            <exclude />
+        <member name="T:OpenMetaverse.GroupInvitationEventArgs">
+            <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
+            to join a group.</remarks>
         </member>
-        <member name="T:OpenMetaverse.Packets.RetrieveInstantMessagesPacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupInvitationEventArgs.AgentID">
+            <summary>The ID of the Avatar sending the group invitation</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.FindAgentPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupInvitationEventArgs.FromName">
+            <summary>The name of the Avatar sending the group invitation</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.FindAgentPacket.AgentBlockBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupInvitationEventArgs.Message">
+            <summary>A message containing the request information which includes
+            the name of the group, the groups charter and the fee to join details</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.FindAgentPacket.LocationBlockBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupInvitationEventArgs.Simulator">
+            <summary>The Simulator</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestGodlikePowersPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.GroupInvitationEventArgs.Accept">
+            <summary>Set to true to accept invitation, false to decline</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestGodlikePowersPacket.AgentDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.Imaging.Baker">
+            <summary>
+            A set of textures that are layered on texture of each other and "baked"
+            in to a single texture, for avatar appearances
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestGodlikePowersPacket.RequestBlockBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Imaging.Baker.bakedTexture">
+            <summary>Final baked texture</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GrantGodlikePowersPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Imaging.Baker.textures">
+            <summary>Component layers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GrantGodlikePowersPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Imaging.Baker.bakeWidth">
+            <summary>Width of the final baked image and scratchpad</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GrantGodlikePowersPacket.GrantDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Imaging.Baker.bakeHeight">
+            <summary>Height of the final baked image and scratchpad</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GodlikeMessagePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Imaging.Baker.bakeType">
+            <summary>Bake type</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GodlikeMessagePacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.Imaging.Baker.#ctor(OpenMetaverse.BakeType)">
+            <summary>
+            Default constructor
+            </summary>
+            <param name="bakeType">Bake type</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.GodlikeMessagePacket.MethodDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.Imaging.Baker.AddTexture(OpenMetaverse.AppearanceManager.TextureData)">
+            <summary>
+            Adds layer for baking
+            </summary>
+            <param name="tdata">TexturaData struct that contains texture and its params</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.GodlikeMessagePacket.ParamListBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.Imaging.Baker.BakeTypeFor(OpenMetaverse.AvatarTextureIndex)">
+            <summary>
+            Converts avatar texture index (face) to Bake type
+            </summary>
+            <param name="index">Face number (AvatarTextureIndex)</param>
+            <returns>BakeType, layer to which this texture belongs to</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.EstateOwnerMessagePacket">
-            <exclude />
+        <member name="M:OpenMetaverse.Imaging.Baker.SanitizeLayers(OpenMetaverse.Imaging.ManagedImage,OpenMetaverse.Imaging.ManagedImage)">
+            <summary>
+            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.Packets.EstateOwnerMessagePacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.Imaging.Baker.InitBakedLayerColor(OpenMetaverse.Color4)">
+            <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
+            </summary>
+            <param name="color">Color of the base of this layer</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.EstateOwnerMessagePacket.MethodDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.Imaging.Baker.InitBakedLayerColor(System.Single,System.Single,System.Single)">
+            <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
+            </summary>
+            <param name="r">Red value</param>
+            <param name="g">Green value</param>
+            <param name="b">Blue value</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.EstateOwnerMessagePacket.ParamListBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.Imaging.Baker.BakedTexture">
+            <summary>Final baked texture</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GenericMessagePacket">
-            <exclude />
+        <member name="P:OpenMetaverse.Imaging.Baker.Textures">
+            <summary>Component layers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GenericMessagePacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.Imaging.Baker.BakeWidth">
+            <summary>Width of the final baked image and scratchpad</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GenericMessagePacket.MethodDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.Imaging.Baker.BakeHeight">
+            <summary>Height of the final baked image and scratchpad</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GenericMessagePacket.ParamListBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.Imaging.Baker.BakeType">
+            <summary>Bake type</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MuteListRequestPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.Imaging.Baker.IsSkin">
+            <summary>Is this one of the 3 skin bakes</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MuteListRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.Assets.AssetSound">
+            <summary>
+            Represents a Sound Asset
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MuteListRequestPacket.MuteDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.Assets.AssetSound.#ctor">
+            <summary>Initializes a new instance of an AssetSound object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateMuteListEntryPacket">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.UpdateMuteListEntryPacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.Assets.AssetSound.Encode">
+            <summary>
+            TODO: Encodes a sound file
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateMuteListEntryPacket.MuteDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.Assets.AssetSound.Decode">
+            <summary>
+            TODO: Decode a sound file
+            </summary>
+            <returns>true</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveMuteListEntryPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.Assets.AssetSound.AssetType">
+            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveMuteListEntryPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.RemoveMuteListEntryPacket.MuteDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.Assets.AssetBodypart.#ctor">
+            <summary>Initializes a new instance of an AssetBodyPart object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CopyInventoryFromNotecardPacket">
-            <exclude />
+        <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.Packets.CopyInventoryFromNotecardPacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.Assets.AssetBodypart.AssetType">
+            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CopyInventoryFromNotecardPacket.NotecardDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.ProfileFlags">
+            <summary>
+            Avatar profile flags
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CopyInventoryFromNotecardPacket.InventoryDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.Avatar">
+            <summary>
+            Represents an avatar (other than your own)
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateInventoryItemPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Avatar.Groups">
+            <summary>Groups that this avatar is a member of</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateInventoryItemPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Avatar.ProfileStatistics">
+            <summary>Positive and negative ratings</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateInventoryItemPacket.InventoryDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Avatar.ProfileProperties">
+            <summary>Avatar properties including about text, profile URL, image IDs and 
+            publishing settings</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateCreateInventoryItemPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Avatar.ProfileInterests">
+            <summary>Avatar interests including spoken languages, skills, and "want to"
+            choices</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateCreateInventoryItemPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.UpdateCreateInventoryItemPacket.InventoryDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Avatar.VisualParameters">
+            <summary>
+            Contains the visual parameters describing the deformation of the avatar
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MoveInventoryItemPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Avatar.AppearanceVersion">
+            <summary>
+            Appearance version. Value greater than 0 indicates using server side baking
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MoveInventoryItemPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Avatar.COFVersion">
+            <summary>
+            Version of the Current Outfit Folder that the appearance is based on
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MoveInventoryItemPacket.InventoryDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Avatar.AppearanceFlags">
+            <summary>
+            Appearance flags. Introduced with server side baking, currently unused.
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CopyInventoryItemPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Avatar.Animations">
+            <summary>
+            List of current avatar animations
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CopyInventoryItemPacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.Avatar.#ctor">
+            <summary>
+            Default constructor
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CopyInventoryItemPacket.InventoryDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.Avatar.FirstName">
+            <summary>First name</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveInventoryItemPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.Avatar.LastName">
+            <summary>Last name</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveInventoryItemPacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.Avatar.Name">
+            <summary>Full name</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveInventoryItemPacket.InventoryDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.Avatar.GroupName">
+            <summary>Active group</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChangeInventoryItemFlagsPacket">
-            <exclude />
+        <member name="T:OpenMetaverse.Avatar.Statistics">
+            <summary>
+            Positive and negative ratings
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChangeInventoryItemFlagsPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Avatar.Statistics.BehaviorPositive">
+            <summary>Positive ratings for Behavior</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChangeInventoryItemFlagsPacket.InventoryDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Avatar.Statistics.BehaviorNegative">
+            <summary>Negative ratings for Behavior</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SaveAssetIntoInventoryPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Avatar.Statistics.AppearancePositive">
+            <summary>Positive ratings for Appearance</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SaveAssetIntoInventoryPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Avatar.Statistics.AppearanceNegative">
+            <summary>Negative ratings for Appearance</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SaveAssetIntoInventoryPacket.InventoryDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Avatar.Statistics.BuildingPositive">
+            <summary>Positive ratings for Building</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateInventoryFolderPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Avatar.Statistics.BuildingNegative">
+            <summary>Negative ratings for Building</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateInventoryFolderPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Avatar.Statistics.GivenPositive">
+            <summary>Positive ratings given by this avatar</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateInventoryFolderPacket.FolderDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Avatar.Statistics.GivenNegative">
+            <summary>Negative ratings given by this avatar</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateInventoryFolderPacket">
-            <exclude />
+        <member name="T:OpenMetaverse.Avatar.AvatarProperties">
+            <summary>
+            Avatar properties including about text, profile URL, image IDs and 
+            publishing settings
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateInventoryFolderPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.FirstLifeText">
+            <summary>First Life about text</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateInventoryFolderPacket.FolderDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.FirstLifeImage">
+            <summary>First Life image ID</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MoveInventoryFolderPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.Partner">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MoveInventoryFolderPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.AboutText">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MoveInventoryFolderPacket.InventoryDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.BornOn">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveInventoryFolderPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.CharterMember">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveInventoryFolderPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.ProfileImage">
+            <summary>Profile image ID</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveInventoryFolderPacket.FolderDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.Flags">
+            <summary>Flags of the profile</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.FetchInventoryDescendentsPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Avatar.AvatarProperties.ProfileURL">
+            <summary>Web URL for this profile</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.FetchInventoryDescendentsPacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.Avatar.AvatarProperties.AllowPublish">
+            <summary>Should this profile be published on the web</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.FetchInventoryDescendentsPacket.InventoryDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.Avatar.AvatarProperties.Online">
+            <summary>Avatar Online Status</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.InventoryDescendentsPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.Avatar.AvatarProperties.MaturePublish">
+            <summary>Is this a mature profile</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.InventoryDescendentsPacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.Avatar.AvatarProperties.Identified">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.InventoryDescendentsPacket.FolderDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.Avatar.AvatarProperties.Transacted">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.InventoryDescendentsPacket.ItemDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.Avatar.Interests">
+            <summary>
+            Avatar interests including spoken languages, skills, and "want to"
+            choices
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.FetchInventoryPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Avatar.Interests.LanguagesText">
+            <summary>Languages profile field</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.FetchInventoryPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Avatar.Interests.SkillsMask">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.FetchInventoryPacket.InventoryDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Avatar.Interests.SkillsText">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.FetchInventoryReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Avatar.Interests.WantToMask">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.FetchInventoryReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Avatar.Interests.WantToText">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.FetchInventoryReplyPacket.InventoryDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.AvatarTextureIndex">
+            <summary>
+            Index of TextureEntry slots for avatar appearances
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.BulkUpdateInventoryPacket">
-            <exclude />
+        <member name="T:OpenMetaverse.BakeType">
+            <summary>
+            Bake layers for avatar appearance
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.BulkUpdateInventoryPacket.AgentDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.AppearanceFlags">
+            <summary>
+            Appearance Flags, introdued with server side baking, currently unused
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.BulkUpdateInventoryPacket.FolderDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.MAX_CONCURRENT_DOWNLOADS">
+            <summary>Maximum number of concurrent downloads for wearable assets and textures</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.BulkUpdateInventoryPacket.ItemDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.MAX_CONCURRENT_UPLOADS">
+            <summary>Maximum number of concurrent uploads for baked textures</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveInventoryObjectsPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.INVENTORY_TIMEOUT">
+            <summary>Timeout for fetching inventory listings</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveInventoryObjectsPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.WEARABLE_TIMEOUT">
+            <summary>Timeout for fetching a single wearable, or receiving a single packet response</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveInventoryObjectsPacket.FolderDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.TEXTURE_TIMEOUT">
+            <summary>Timeout for fetching a single texture</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveInventoryObjectsPacket.ItemDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.UPLOAD_TIMEOUT">
+            <summary>Timeout for uploading a single baked texture</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PurgeInventoryDescendentsPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.UPLOAD_RETRIES">
+            <summary>Number of times to retry bake upload</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PurgeInventoryDescendentsPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.PurgeInventoryDescendentsPacket.InventoryDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.WEARABLE_COUNT">
+            <summary>Total number of wearables for each avatar</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateTaskInventoryPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.BAKED_TEXTURE_COUNT">
+            <summary>Total number of baked textures on each avatar</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateTaskInventoryPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.WEARABLES_PER_LAYER">
+            <summary>Total number of wearables per bake layer</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateTaskInventoryPacket.UpdateDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.ATTACHMENT_ADD">
+            <summary>Mask for multiple attachments</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateTaskInventoryPacket.InventoryDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.BakeIndexToTextureIndex">
+            <summary>Mapping between BakeType and AvatarTextureIndex</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveTaskInventoryPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.WEARABLE_BAKE_MAP">
+            <summary>Map of what wearables are included in each bake</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveTaskInventoryPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.BAKED_TEXTURE_HASH">
+            <summary>Magic values to finalize the cache check hashes for each
+            bake</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RemoveTaskInventoryPacket.InventoryDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.MoveTaskInventoryPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.m_AgentWearablesReply">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MoveTaskInventoryPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.MoveTaskInventoryPacket.InventoryDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.m_AgentWearablesLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestTaskInventoryPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.m_AgentCachedBakesReply">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestTaskInventoryPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.RequestTaskInventoryPacket.InventoryDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.m_AgentCachedBakesLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ReplyTaskInventoryPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.m_AppearanceSet">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ReplyTaskInventoryPacket.InventoryDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.DeRezObjectPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.m_AppearanceSetLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DeRezObjectPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.m_RebakeAvatarReply">
+            <summary>The event subscribers. null if no subcribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DeRezObjectPacket.AgentBlockBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.DeRezObjectPacket.ObjectDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.m_RebakeAvatarLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DeRezAckPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.MyVisualParameters">
+            <summary>Visual parameters last sent to the sim</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DeRezAckPacket.TransactionDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.MyTextures">
+            <summary>Textures about this client sent to the sim</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezObjectPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.Wearables">
+            <summary>A cache of wearables currently being worn</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezObjectPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.Textures">
+            <summary>A cache of textures currently being worn</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezObjectPacket.RezDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.CacheCheckSerialNum">
+            <summary>Incrementing serial number for AgentCachedTexture packets</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezObjectPacket.InventoryDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.SetAppearanceSerialNum">
+            <summary>Incrementing serial number for AgentSetAppearance packets</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.GotWearables">
+            <summary>Indicates if WearablesRequest succeeded</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket.RezDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.Client">
+            <summary>Reference to our agent</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket.NotecardDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.RebakeScheduleTimer">
+            <summary>
+            Timer used for delaying rebake on changing outfit
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezObjectFromNotecardPacket.InventoryDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.AppearanceThread">
+            <summary>
+            Main appearance thread
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AcceptFriendshipPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.ServerBakingDone">
+            <summary>
+            Is server baking complete. It needs doing only once
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AcceptFriendshipPacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.AppearanceManager.#ctor(OpenMetaverse.GridClient)">
+            <summary>
+            Default constructor
+            </summary>
+            <param name="client">A reference to our agent</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.AcceptFriendshipPacket.TransactionBlockBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.AcceptFriendshipPacket.FolderDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.AppearanceManager.SetPreviousAppearance(System.Boolean)">
+            <summary>
+            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="T:OpenMetaverse.Packets.DeclineFriendshipPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.AppearanceManager.RequestSetAppearance">
+            <summary>
+            Starts the appearance setting thread
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.DeclineFriendshipPacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.AppearanceManager.RequestSetAppearance(System.Boolean)">
+            <summary>
+            Starts the appearance setting thread
+            </summary>
+            <param name="forceRebake">True to force rebaking, otherwise false</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.DeclineFriendshipPacket.TransactionBlockBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.AppearanceManager.ServerBakingRegion">
+            <summary>
+            Check if current region supports server side baking
+            </summary>
+            <returns>True if server side baking support is detected</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.TerminateFriendshipPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.AppearanceManager.RequestAgentWearables">
+            <summary>
+            Ask the server what textures our agent is currently wearing
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TerminateFriendshipPacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.AppearanceManager.RequestCachedBakes">
+            <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="T:OpenMetaverse.Packets.TerminateFriendshipPacket.ExBlockBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.OfferCallingCardPacket">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.OfferCallingCardPacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.AppearanceManager.AddToOutfit(OpenMetaverse.InventoryItem,System.Boolean)">
+            <summary>
+            Add a wearable to the current outfit and set appearance
+            </summary>
+            <param name="wearableItem">Wearable to be added to the outfit</param>
+            <param name="replace">Should existing item on the same point or of the same type be replaced</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.OfferCallingCardPacket.AgentBlockBlock">
-            <exclude />
+        <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>
+            <param name="replace">Should existing item on the same point or of the same type be replaced</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.AcceptCallingCardPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.AppearanceManager.AddToOutfit(System.Collections.Generic.List{OpenMetaverse.InventoryItem},System.Boolean)">
+            <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>
+            <param name="replace">Should existing item on the same point or of the same type be replaced</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.AcceptCallingCardPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.AcceptCallingCardPacket.TransactionBlockBlock">
-            <exclude />
+        <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.Packets.AcceptCallingCardPacket.FolderDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.AppearanceManager.ReplaceOutfit(System.Collections.Generic.List{OpenMetaverse.InventoryItem})">
+            <summary>
+            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="T:OpenMetaverse.Packets.DeclineCallingCardPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.AppearanceManager.ReplaceOutfit(System.Collections.Generic.List{OpenMetaverse.InventoryItem},System.Boolean)">
+            <summary>
+            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="T:OpenMetaverse.Packets.DeclineCallingCardPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.DeclineCallingCardPacket.TransactionBlockBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.RezScriptPacket">
-            <exclude />
+        <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.InventoryItem})"/> or
+            <seealso cref="M:OpenMetaverse.AppearanceManager.AddToOutfit(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="T:OpenMetaverse.Packets.RezScriptPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.RezScriptPacket.UpdateBlockBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.AppearanceManager.AddAttachments(System.Collections.Generic.List{OpenMetaverse.InventoryItem},System.Boolean,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
+            <param name="replace">If true replace existing attachment on this attachment point, otherwise add to it (multi-attachments)</param>
+            first</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezScriptPacket.InventoryBlockBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.CreateInventoryItemPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.AppearanceManager.Attach(OpenMetaverse.InventoryItem,OpenMetaverse.AttachmentPoint,System.Boolean)">
+            <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 
+            <param name="replace">If true replace existing attachment on this attachment point, otherwise add to it (multi-attachments)</param>
+            to attach the item to</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateInventoryItemPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.CreateInventoryItemPacket.InventoryBlockBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.AppearanceManager.Attach(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,System.String,OpenMetaverse.Permissions,System.UInt32,OpenMetaverse.AttachmentPoint,System.Boolean)">
+            <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
+            <param name="replace">If true replace existing attachment on this attachment point, otherwise add to it (multi-attachments)</param>
+            to attach the item to</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateLandmarkForEventPacket">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.CreateLandmarkForEventPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.CreateLandmarkForEventPacket.EventDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.AppearanceManager.SendAgentIsNowWearing">
+            <summary>
+            Inform the sim which wearables are part of our current outfit
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateLandmarkForEventPacket.InventoryBlockBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.RegionHandleRequestPacket">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.RegionHandleRequestPacket.RequestBlockBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.RegionIDAndHandleReplyPacket">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.RegionIDAndHandleReplyPacket.ReplyBlockBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.MoneyTransferRequestPacket">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.MoneyTransferRequestPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.MoneyTransferRequestPacket.MoneyDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.MoneyBalanceRequestPacket">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.MoneyBalanceRequestPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.MoneyBalanceRequestPacket.MoneyDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.MoneyBalanceReplyPacket">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.MoneyBalanceReplyPacket.MoneyDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.MoneyBalanceReplyPacket.TransactionInfoBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.AppearanceManager.UpdateAvatarAppearance">
+            <summary>
+            Initate server baking process
+            </summary>
+            <returns>True if the server baking was successful</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.RoutedMoneyBalanceReplyPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.AppearanceManager.GetCOF">
+            <summary>
+            Get the latest version of COF
+            </summary>
+            <returns>Current Outfit Folder (or null if getting the data failed)</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.RoutedMoneyBalanceReplyPacket.TargetBlockBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.RoutedMoneyBalanceReplyPacket.MoneyDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.RoutedMoneyBalanceReplyPacket.TransactionInfoBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ActivateGesturesPacket">
-            <exclude />
+        <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>
-        <member name="T:OpenMetaverse.Packets.ActivateGesturesPacket.AgentDataBlock">
-            <exclude />
+        <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.Packets.ActivateGesturesPacket.DataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.DeactivateGesturesPacket">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.DeactivateGesturesPacket.AgentDataBlock">
-            <exclude />
+        <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>
-        <member name="T:OpenMetaverse.Packets.DeactivateGesturesPacket.DataBlock">
-            <exclude />
+        <member name="E:OpenMetaverse.AppearanceManager.RebakeAvatarRequested">
+            <summary>
+            Triggered when the simulator requests the agent rebake its appearance.
+            </summary>
+            <seealso cref="!:RebakeAvatarRequest"/>
         </member>
-        <member name="T:OpenMetaverse.Packets.MuteListUpdatePacket">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.MuteListUpdatePacket.MuteDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.AppearanceManager.WearableData">
+            <summary>
+            Contains information about a wearable inventory item
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UseCachedMuteListPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.WearableData.ItemID">
+            <summary>Inventory ItemID of the wearable</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UseCachedMuteListPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.WearableData.AssetID">
+            <summary>AssetID of the wearable asset</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GrantUserRightsPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.WearableData.WearableType">
+            <summary>WearableType of the wearable</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GrantUserRightsPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.WearableData.AssetType">
+            <summary>AssetType of the wearable</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GrantUserRightsPacket.RightsBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.WearableData.Asset">
+            <summary>Asset data for the wearable</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChangeUserRightsPacket">
-            <exclude />
+        <member name="T:OpenMetaverse.AppearanceManager.ColorParamInfo">
+            <summary>
+            Data collected from visual params for each wearable
+            needed for the calculation of the color
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChangeUserRightsPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ChangeUserRightsPacket.RightsBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.TextureData.TextureID">
+            <summary>A texture AssetID</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.OnlineNotificationPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.TextureData.Texture">
+            <summary>Asset data for the texture</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.OnlineNotificationPacket.AgentBlockBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.TextureData.AlphaMasks">
+            <summary>Collection of alpha masks that needs applying</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.OfflineNotificationPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.TextureData.Color">
+            <summary>Tint that should be applied to the texture</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.OfflineNotificationPacket.AgentBlockBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.AppearanceManager.TextureData.TextureIndex">
+            <summary>Where on avatar does this texture belong</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetStartLocationRequestPacket">
-            <exclude />
+        <member name="T:OpenMetaverse.AgentWearablesReplyEventArgs">
+            <summary>Contains the Event data returned from the data server from an AgentWearablesRequest</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetStartLocationRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.AgentWearablesReplyEventArgs.#ctor">
+            <summary>Construct a new instance of the AgentWearablesReplyEventArgs class</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetStartLocationRequestPacket.StartLocationDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.AgentCachedBakesReplyEventArgs">
+            <summary>Contains the Event data returned from the data server from an AgentCachedTextureResponse</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AssetUploadRequestPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.AgentCachedBakesReplyEventArgs.#ctor">
+            <summary>Construct a new instance of the AgentCachedBakesReplyEventArgs class</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AssetUploadRequestPacket.AssetBlockBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.AppearanceSetEventArgs">
+            <summary>Contains the Event data returned from an AppearanceSetRequest</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AssetUploadCompletePacket">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.AssetUploadCompletePacket.AssetBlockBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.AppearanceSetEventArgs.Success">
+            <summary>Indicates whether appearance setting was successful</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateGroupRequestPacket">
-            <exclude />
+        <member name="T:OpenMetaverse.RebakeAvatarTexturesEventArgs">
+            <summary>Contains the Event data returned from the data server from an RebakeAvatarTextures</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateGroupRequestPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.CreateGroupRequestPacket.GroupDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.RebakeAvatarTexturesEventArgs.TextureID">
+            <summary>The ID of the Texture Layer to bake</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateGroupReplyPacket">
-            <exclude />
+        <member name="T:OpenMetaverse.Assets.AssetAnimation">
+            <summary>
+            Represents an Animation
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateGroupReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.Assets.AssetAnimation.#ctor">
+            <summary>Default Constructor</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateGroupReplyPacket.ReplyDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.Assets.AssetAnimation.#ctor(OpenMetaverse.UUID,System.Byte[])">
+            <summary>
+            Construct an Asset object of type Animation
+            </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.Packets.UpdateGroupInfoPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.Assets.AssetAnimation.AssetType">
+            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateGroupInfoPacket.AgentDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.DictionaryEventAction">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateGroupInfoPacket.GroupDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.DictionaryEventAction.Add">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleChangesPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.DictionaryEventAction.Remove">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleChangesPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.DictionaryEventAction.Change">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleChangesPacket.RoleChangeBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.DictionaryChangeCallback">
+            <summary>
+            
+            </summary>
+            <param name="action"></param>
+            <param name="entry"></param>
         </member>
-        <member name="T:OpenMetaverse.Packets.JoinGroupRequestPacket">
-            <exclude />
+        <member name="T:OpenMetaverse.ObservableDictionary`2">
+            <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.
+            </summary>
+            <typeparam name="TKey">Key <see langword="Tkey"/></typeparam>
+            <typeparam name="TValue">Value <see langword="TValue"/></typeparam>
         </member>
-        <member name="T:OpenMetaverse.Packets.JoinGroupRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ObservableDictionary`2.Delegates">
+            <summary>
+            A dictionary of callbacks to fire when specified action occurs
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.JoinGroupRequestPacket.GroupDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.JoinGroupReplyPacket">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.JoinGroupReplyPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.JoinGroupReplyPacket.GroupDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.EjectGroupMemberRequestPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.ObservableDictionary`2.#ctor">
+            <summary>
+            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.Packets.EjectGroupMemberRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.ObservableDictionary`2.#ctor(System.Int32)">
+            <summary>
+            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="T:OpenMetaverse.Packets.EjectGroupMemberRequestPacket.GroupDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.EjectGroupMemberRequestPacket.EjectDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.EjectGroupMemberReplyPacket">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.EjectGroupMemberReplyPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.EjectGroupMemberReplyPacket.GroupDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.EjectGroupMemberReplyPacket.EjectDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.LeaveGroupRequestPacket">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.LeaveGroupRequestPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.LeaveGroupRequestPacket.GroupDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.ObservableDictionary`2.Clear">
+            <summary>
+            Clear the contents of the dictionary
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LeaveGroupReplyPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.ObservableDictionary`2.GetEnumerator">
+            <summary>
+            Enumerator for iterating dictionary entries
+            </summary>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.LeaveGroupReplyPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.LeaveGroupReplyPacket.GroupDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.InviteGroupRequestPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.InventoryNode.#ctor">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.InviteGroupRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.InventoryNode.#ctor(OpenMetaverse.InventoryBase)">
+            <summary>
+            
+            </summary>
+            <param name="data"></param>
         </member>
-        <member name="T:OpenMetaverse.Packets.InviteGroupRequestPacket.GroupDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.InventoryNode.#ctor(OpenMetaverse.InventoryBase,OpenMetaverse.InventoryNode)">
+            <summary>
+            De-serialization constructor for the InventoryNode Class
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.InviteGroupRequestPacket.InviteDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.InventoryNode.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            Serialization handler for the InventoryNode Class
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupProfileRequestPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.InventoryNode.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
+            <summary>
+            De-serialization handler for the InventoryNode Class
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupProfileRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.InventoryNode.ToString">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupProfileRequestPacket.GroupDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.InventoryNode.Data">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupProfileReplyPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.InventoryNode.Parent">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupProfileReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.InventoryNode.ParentID">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupProfileReplyPacket.GroupDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.InventoryNode.Nodes">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountSummaryRequestPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.InventoryNode.NeedsUpdate">
+            <summary>
+            For inventory folder nodes specifies weather the folder needs to be
+            refreshed from the server
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountSummaryRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.Imaging.LoadTGAClass">
+            <summary>
+            Capability to load TGAs to Bitmap 
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountSummaryRequestPacket.MoneyDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.Assets.AssetNotecard">
+            <summary>
+            Represents a string of characters encoded with specific formatting properties
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountSummaryReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Assets.AssetNotecard.BodyText">
+            <summary>A text string containing main text of the notecard</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountSummaryReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Assets.AssetNotecard.EmbeddedItems">
+            <summary>List of <see cref="T:OpenMetaverse.InventoryItem"/>s embedded on the notecard</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountSummaryReplyPacket.MoneyDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.Assets.AssetNotecard.#ctor">
+            <summary>Construct an Asset of type Notecard</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsRequestPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.Assets.AssetNotecard.#ctor(OpenMetaverse.UUID,System.Byte[])">
+            <summary>
+            Construct an Asset object of type Notecard
+            </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.Packets.GroupAccountDetailsRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.Assets.AssetNotecard.Encode">
+            <summary>
+            Encode the raw contents of a string with the specific Linden Text properties
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsRequestPacket.MoneyDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.Assets.AssetNotecard.Decode">
+            <summary>
+            Decode the raw asset data including the Linden Text properties
+            </summary>
+            <returns>true if the AssetData was successfully decoded</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsReplyPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.Assets.AssetNotecard.AssetType">
+            <summary>Override the base classes AssetType</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.RegionFlags">
+            <summary>
+            Simulator (region) properties
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsReplyPacket.MoneyDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.RegionFlags.None">
+            <summary>No flags set</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountDetailsReplyPacket.HistoryDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.RegionFlags.AllowDamage">
+            <summary>Agents can take damage and be killed</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsRequestPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.RegionFlags.AllowLandmark">
+            <summary>Landmarks can be created here</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.RegionFlags.AllowSetHome">
+            <summary>Home position can be set in this sim</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsRequestPacket.MoneyDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.RegionFlags.ResetHomeOnTeleport">
+            <summary>Home position is reset when an agent teleports away</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.RegionFlags.SunFixed">
+            <summary>Sun does not move</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.RegionFlags.TaxFree">
+            <summary>No object, land, etc. taxes</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsReplyPacket.MoneyDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.RegionFlags.BlockTerraform">
+            <summary>Disable heightmap alterations (agents can still plant
+            foliage)</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupAccountTransactionsReplyPacket.HistoryDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.RegionFlags.BlockLandResell">
+            <summary>Land cannot be released, sold, or purchased</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupActiveProposalsRequestPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.RegionFlags.Sandbox">
+            <summary>All content is wiped nightly</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupActiveProposalsRequestPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.GroupActiveProposalsRequestPacket.GroupDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.GroupActiveProposalsRequestPacket.TransactionDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.RegionFlags.SkipUpdateInterestList">
+            <summary>Region does not update agent prim interest lists. Internal debugging option.</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupActiveProposalItemReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.RegionFlags.SkipCollisions">
+            <summary>No collision detection for non-agent objects</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupActiveProposalItemReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.RegionFlags.SkipScripts">
+            <summary>No scripts are ran</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupActiveProposalItemReplyPacket.TransactionDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.RegionFlags.SkipPhysics">
+            <summary>All physics processing is turned off</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupActiveProposalItemReplyPacket.ProposalDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.GroupVoteHistoryRequestPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.RegionFlags.MainlandVisible">
+            <summary>Region can be seen from mainland on world map. (Legacy world map option?) </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.RegionFlags.PublicAllowed">
+            <summary>Agents not explicitly on the access list can visit the region. </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryRequestPacket.GroupDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.RegionFlags.BlockDwell">
+            <summary>Traffic calculations are not run across entire region, overrides parcel settings. </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryRequestPacket.TransactionDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.RegionFlags.NoFly">
+            <summary>Flight is disabled (not currently enforced by the sim)</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryItemReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.RegionFlags.AllowDirectTeleport">
+            <summary>Allow direct (p2p) teleporting</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryItemReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.RegionFlags.EstateSkipScripts">
+            <summary>Estate owner has temporarily disabled scripting</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryItemReplyPacket.TransactionDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.RegionFlags.RestrictPushObject">
+            <summary>Restricts the usage of the LSL llPushObject function, applies to whole region.</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryItemReplyPacket.HistoryItemDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.RegionFlags.DenyAnonymous">
+            <summary>Deny agents with no payment info on file</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupVoteHistoryItemReplyPacket.VoteItemBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.RegionFlags.DenyIdentified">
+            <summary>Deny agents with payment info on file</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.StartGroupProposalPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.RegionFlags.DenyTransacted">
+            <summary>Deny agents who have made a monetary transaction</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.StartGroupProposalPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.StartGroupProposalPacket.ProposalDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.GroupProposalBallotPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.RegionFlags.AllowVoice">
+            <summary>Region is Voice Enabled</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupProposalBallotPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.GroupProposalBallotPacket.ProposalDataBlock">
-            <exclude />
+        <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.Packets.GroupMembersRequestPacket">
-            <exclude />
+        <member name="T:OpenMetaverse.RegionProtocols">
+            <summary>
+            Region protocol flags
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupMembersRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.SimAccess">
+            <summary>
+            Access level for a simulator
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupMembersRequestPacket.GroupDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.SimAccess.Unknown">
+            <summary>Unknown or invalid access level</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupMembersReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.SimAccess.Trial">
+            <summary>Trial accounts allowed</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupMembersReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.SimAccess.PG">
+            <summary>PG rating</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupMembersReplyPacket.GroupDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.SimAccess.Mature">
+            <summary>Mature rating</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupMembersReplyPacket.MemberDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.SimAccess.Adult">
+            <summary>Adult rating</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ActivateGroupPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.SimAccess.Down">
+            <summary>Simulator is offline</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ActivateGroupPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.SimAccess.NonExistent">
+            <summary>Simulator does not exist</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetGroupContributionPacket">
-            <exclude />
+        <member name="T:OpenMetaverse.Simulator">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetGroupContributionPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.Client">
+            <summary>A public reference to the client that this Simulator object
+            is attached to</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetGroupContributionPacket.DataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.ID">
+            <summary>A Unique Cache identifier for this simulator</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetGroupAcceptNoticesPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.Caps">
+            <summary>The capabilities for this simulator</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetGroupAcceptNoticesPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.Handle">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetGroupAcceptNoticesPacket.DataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimVersion">
+            <summary>The current version of software this simulator is running</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SetGroupAcceptNoticesPacket.NewDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.Name">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleDataRequestPacket">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.GroupRoleDataRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.ParcelOverlaysReceived">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleDataRequestPacket.GroupDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.TerrainHeightRange00">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleDataReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.TerrainHeightRange01">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleDataReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.TerrainHeightRange10">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleDataReplyPacket.GroupDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.TerrainHeightRange11">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleDataReplyPacket.RoleDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.TerrainStartHeight00">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleMembersRequestPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.TerrainStartHeight01">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleMembersRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.TerrainStartHeight10">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleMembersRequestPacket.GroupDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.TerrainStartHeight11">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleMembersReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.WaterHeight">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleMembersReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimOwner">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleMembersReplyPacket.MemberDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.TerrainBase0">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupTitlesRequestPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.TerrainBase1">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupTitlesRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.TerrainBase2">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupTitlesReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.TerrainBase3">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupTitlesReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.TerrainDetail0">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupTitlesReplyPacket.GroupDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.TerrainDetail1">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupTitleUpdatePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.TerrainDetail2">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupTitleUpdatePacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.TerrainDetail3">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleUpdatePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.IsEstateManager">
+            <summary>true if your agent has Estate Manager rights on this region</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleUpdatePacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.Flags">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupRoleUpdatePacket.RoleDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.Access">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LiveHelpGroupRequestPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.BillableFactor">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LiveHelpGroupRequestPacket.RequestDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.LiveHelpGroupReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.RegionID">
+            <summary>The regions Unique ID</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LiveHelpGroupReplyPacket.ReplyDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.AgentWearablesRequestPacket">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.AgentWearablesRequestPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.AgentWearablesUpdatePacket">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.AgentWearablesUpdatePacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.AgentWearablesUpdatePacket.WearableDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.Protocols">
+            <summary>
+            Flags indicating which protocols this region supports
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentIsNowWearingPacket">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.AgentIsNowWearingPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.ObjectsAvatars">
+            <summary>
+            A thread-safe dictionary containing avatars in a simulator        
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentIsNowWearingPacket.WearableDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.ObjectsPrimitives">
+            <summary>
+            A thread-safe dictionary containing primitives in a simulator
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentCachedTexturePacket">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.AgentCachedTexturePacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.AgentMovementComplete">
+            <summary>
+            Is it safe to send agent updates to this sim
+            AgentMovementComplete message received
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentCachedTexturePacket.WearableDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.DisconnectCandidate">
+            <summary>Used internally to track sim disconnections</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentCachedTextureResponsePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.ConnectedEvent">
+            <summary>Event that is triggered when the simulator successfully
+            establishes a connection</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentCachedTextureResponsePacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.AgentCachedTextureResponsePacket.WearableDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.avatarPositions">
+            <summary>Coarse locations of avatars in this simulator</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentDataUpdateRequestPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.preyID">
+            <summary>AvatarPositions key representing TrackAgent target</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentDataUpdateRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.PacketArchive">
+            <summary>Sequence numbers of packets we've received
+            (for duplicate checking)</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentDataUpdatePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.NeedAck">
+            <summary>Packets we sent out that need ACKs from the simulator</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentDataUpdatePacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.pauseSerial">
+            <summary>Sequence number for pause/resume</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupDataUpdatePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.handshakeComplete">
+            <summary>Indicates if UDP connection to the sim is fully established</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.GroupDataUpdatePacket.AgentGroupDataBlock">
-            <exclude />
+        <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.Packets.AgentGroupDataUpdatePacket">
-            <exclude />
+        <member name="M:OpenMetaverse.Simulator.Dispose">
+            <summary>
+            Called when this Simulator object is being destroyed
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentGroupDataUpdatePacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.AgentGroupDataUpdatePacket.GroupDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.AgentDropGroupPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.Simulator.Disconnect(System.Boolean)">
+            <summary>
+            Disconnect from this simulator
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentDropGroupPacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.Simulator.Pause">
+            <summary>
+            Instructs the simulator to stop sending update (and possibly other) packets
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezSingleAttachmentFromInvPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.Simulator.Resume">
+            <summary>
+            Instructs the simulator to resume sending update packets (unpause)
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezSingleAttachmentFromInvPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.RezSingleAttachmentFromInvPacket.ObjectDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.RezMultipleAttachmentsFromInvPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.Simulator.SendPing">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezMultipleAttachmentsFromInvPacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.Simulator.ToString">
+            <summary>
+            Returns Simulator Name as a String
+            </summary>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezMultipleAttachmentsFromInvPacket.HeaderDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.Simulator.GetHashCode">
+            <summary>
+            
+            </summary>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezMultipleAttachmentsFromInvPacket.ObjectDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.Simulator.Equals(System.Object)">
+            <summary>
+            
+            </summary>
+            <param name="obj"></param>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.DetachAttachmentIntoInvPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.Simulator.SendAcks">
+            <summary>
+            Sends out pending acknowledgements
+            </summary>
+            <returns>Number of ACKs sent</returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.DetachAttachmentIntoInvPacket.ObjectDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.Simulator.ResendUnacked">
+            <summary>
+            Resend unacknowledged packets
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateNewOutfitAttachmentsPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.Simulator.Parcels">
+            <summary>
+            Provides access to an internal thread-safe dictionary containing parcel
+            information found in this simulator
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateNewOutfitAttachmentsPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.CreateNewOutfitAttachmentsPacket.HeaderDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.Simulator.IPEndPoint">
+            <summary>The IP address and port of the server</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CreateNewOutfitAttachmentsPacket.ObjectDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.Simulator.Connected">
+            <summary>Whether there is a working connection to the simulator or 
+            not</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UserInfoRequestPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.Simulator.AvatarPositions">
+            <summary>Coarse locations of avatars in this simulator</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UserInfoRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="P:OpenMetaverse.Simulator.PreyID">
+            <summary>AvatarPositions key representing TrackAgent target</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UserInfoReplyPacket">
-            <exclude />
+        <member name="P:OpenMetaverse.Simulator.HandshakeComplete">
+            <summary>Indicates if UDP connection to the sim is fully established</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UserInfoReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.Simulator.SimStats">
+            <summary>
+            Simulator Statistics
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UserInfoReplyPacket.UserDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.SentPackets">
+            <summary>Total number of packets sent by this simulator to this agent</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateUserInfoPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.RecvPackets">
+            <summary>Total number of packets received by this simulator to this agent</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateUserInfoPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.SentBytes">
+            <summary>Total number of bytes sent by this simulator to this agent</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.UpdateUserInfoPacket.UserDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.RecvBytes">
+            <summary>Total number of bytes received by this simulator to this agent</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.InitiateDownloadPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.ConnectTime">
+            <summary>Time in seconds agent has been connected to simulator</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.InitiateDownloadPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.ResentPackets">
+            <summary>Total number of packets that have been resent</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.InitiateDownloadPacket.FileDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.ReceivedResends">
+            <summary>Total number of resent packets recieved</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapLayerRequestPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.SentPings">
+            <summary>Total number of pings sent to this simulator by this agent</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapLayerRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.ReceivedPongs">
+            <summary>Total number of ping replies sent to this agent by this simulator</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapLayerReplyPacket">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.MapLayerReplyPacket.AgentDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.MapLayerReplyPacket.LayerDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.LastPingSent">
+            <summary>Time last ping was sent</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapBlockRequestPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.LastPingID">
+            <summary>ID of last Ping sent</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapBlockRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.LastLag">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapBlockRequestPacket.PositionDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.MissedPings">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapNameRequestPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.Dilation">
+            <summary>Current time dilation of this simulator</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapNameRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.FPS">
+            <summary>Current Frames per second of simulator</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapNameRequestPacket.NameDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.PhysicsFPS">
+            <summary>Current Physics frames per second of simulator</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapBlockReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.AgentUpdates">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapBlockReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.FrameTime">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapBlockReplyPacket.DataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.NetTime">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapItemRequestPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.PhysicsTime">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapItemRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.ImageTime">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapItemRequestPacket.RequestDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.ScriptTime">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapItemReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.AgentTime">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapItemReplyPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.OtherTime">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapItemReplyPacket.RequestDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.Objects">
+            <summary>Total number of objects Simulator is simulating</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MapItemReplyPacket.DataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.ScriptedObjects">
+            <summary>Total number of Active (Scripted) objects running</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SendPostcardPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.Agents">
+            <summary>Number of agents currently in this simulator</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SendPostcardPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.ChildAgents">
+            <summary>Number of agents in neighbor simulators</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelMediaCommandMessagePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.ActiveScripts">
+            <summary>Number of Active scripts running in this simulator</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelMediaCommandMessagePacket.CommandBlockBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.LSLIPS">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelMediaUpdatePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.INPPS">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelMediaUpdatePacket.DataBlockBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.OUTPPS">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelMediaUpdatePacket.DataBlockExtendedBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.PendingDownloads">
+            <summary>Number of downloads pending</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LandStatRequestPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.PendingUploads">
+            <summary>Number of uploads pending</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LandStatRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.VirtualSize">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LandStatRequestPacket.RequestDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.ResidentSize">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LandStatReplyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.PendingLocalUploads">
+            <summary>Number of local uploads pending</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LandStatReplyPacket.RequestDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.Simulator.SimStats.UnackedBytes">
+            <summary>Unacknowledged bytes in queue</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LandStatReplyPacket.ReportDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.SimulatorDataPool.Handle">
+            <summary>
+            Simulator handle
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ErrorPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.SimulatorDataPool.ActiveClients">
+            <summary>
+            Number of GridClients using this datapool
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ErrorPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.SimulatorDataPool.InactiveSince">
+            <summary>
+            Time that the last client disconnected from the simulator
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ErrorPacket.DataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.SimulatorDataPool.PrimCache">
+            <summary>
+            The cache of prims used and unused in this simulator
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectIncludeInSearchPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.SimulatorDataPool.Parcels">
+            <summary>
+            Shared parcel info only when POOL_PARCEL_DATA == true
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectIncludeInSearchPacket.AgentDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.FieldType">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectIncludeInSearchPacket.ObjectDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.FieldType.U8">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezRestoreToWorldPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.FieldType.U16">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezRestoreToWorldPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.FieldType.U32">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RezRestoreToWorldPacket.InventoryDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.FieldType.U64">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LinkInventoryItemPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.FieldType.S8">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LinkInventoryItemPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.FieldType.S16">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LinkInventoryItemPacket.InventoryBlockBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.FieldType.S32">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PacketAckPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.FieldType.F32">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.PacketAckPacket.PacketsBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.FieldType.F64">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.OpenCircuitPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.FieldType.UUID">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.OpenCircuitPacket.CircuitInfoBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.FieldType.BOOL">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CloseCircuitPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.FieldType.Vector3">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectAddPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.FieldType.Vector3d">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectAddPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.FieldType.Vector4">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectAddPacket.ObjectDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.FieldType.Quaternion">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MultipleObjectUpdatePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.FieldType.IPADDR">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MultipleObjectUpdatePacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.FieldType.IPPORT">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.MultipleObjectUpdatePacket.ObjectDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.FieldType.Variable">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestMultipleObjectsPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.FieldType.Fixed">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestMultipleObjectsPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.FieldType.Single">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestMultipleObjectsPacket.ObjectDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.FieldType.Multiple">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectPositionPacket">
-            <exclude />
+        <member name="T:OpenMetaverse.MapField">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectPositionPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MapField.KeywordPosition">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectPositionPacket.ObjectDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MapField.Name">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestObjectPropertiesFamilyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.MapField.Type">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestObjectPropertiesFamilyPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MapField.Count">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestObjectPropertiesFamilyPacket.ObjectDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.MapField.CompareTo(System.Object)">
+            <summary>
+            
+            </summary>
+            <param name="obj"></param>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.CoarseLocationUpdatePacket">
-            <exclude />
+        <member name="T:OpenMetaverse.MapBlock">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CoarseLocationUpdatePacket.LocationBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MapBlock.KeywordPosition">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CoarseLocationUpdatePacket.IndexBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MapBlock.Name">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CoarseLocationUpdatePacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MapBlock.Count">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CrossedRegionPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.MapBlock.Fields">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CrossedRegionPacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.MapBlock.CompareTo(System.Object)">
+            <summary>
+            
+            </summary>
+            <param name="obj"></param>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.CrossedRegionPacket.RegionDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.MapPacket">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CrossedRegionPacket.InfoBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MapPacket.ID">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ConfirmEnableSimulatorPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.MapPacket.Name">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ConfirmEnableSimulatorPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MapPacket.Frequency">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectPropertiesPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.MapPacket.Trusted">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectPropertiesPacket.ObjectDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.MapPacket.Encoded">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectPropertiesFamilyPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.MapPacket.Blocks">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectPropertiesFamilyPacket.ObjectDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.ProtocolManager">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.ProtocolManager.TypeSizes">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ProtocolManager.KeywordPositions">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelPropertiesRequestPacket.ParcelDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ProtocolManager.LowMaps">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AttachedSoundPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.ProtocolManager.MediumMaps">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AttachedSoundPacket.DataBlockBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ProtocolManager.HighMaps">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AttachedSoundGainChangePacket">
-            <exclude />
+        <member name="M:OpenMetaverse.ProtocolManager.#ctor(System.String,OpenMetaverse.GridClient)">
+            <summary>
+            
+            </summary>
+            <param name="mapFile"></param>
+            <param name="client"></param>
         </member>
-        <member name="T:OpenMetaverse.Packets.AttachedSoundGainChangePacket.DataBlockBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.ProtocolManager.Command(System.String)">
+            <summary>
+            
+            </summary>
+            <param name="command"></param>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.PreloadSoundPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.ProtocolManager.Command(System.Byte[])">
+            <summary>
+            
+            </summary>
+            <param name="data"></param>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Packets.PreloadSoundPacket.DataBlockBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ViewerEffectPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.ProtocolManager.PrintMap">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerEffectPacket.AgentDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.ProtocolManager.PrintOneMap(OpenMetaverse.MapPacket[],System.String)">
+            <summary>
+            
+            </summary>
+            <param name="map"></param>
+            <param name="frequency"></param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ViewerEffectPacket.EffectBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.ProtocolManager.DecodeMapFile(System.String,System.String)">
+            <summary>
+            
+            </summary>
+            <param name="mapFile"></param>
+            <param name="outputFile"></param>
         </member>
-        <member name="T:OpenMetaverse.Packets.StartPingCheckPacket">
-            <exclude />
+        <member name="M:OpenMetaverse.ProtocolManager.LoadMapFile(System.String)">
+            <summary>
+            
+            </summary>
+            <param name="mapFile"></param>
         </member>
-        <member name="T:OpenMetaverse.Packets.StartPingCheckPacket.PingIDBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.ReportType">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CompletePingCheckPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.ReportType.None">
+            <summary>No report</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CompletePingCheckPacket.PingIDBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ReportType.Unknown">
+            <summary>Unknown report type</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentUpdatePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.ReportType.Bug">
+            <summary>Bug report</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentUpdatePacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ReportType.Complaint">
+            <summary>Complaint report</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentAnimationPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.ReportType.CustomerServiceRequest">
+            <summary>Customer service report</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentAnimationPacket.AgentDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.CompressedFlags">
+            <summary>
+            Bitflag field for ObjectUpdateCompressed data blocks, describing 
+            which options are present for each object
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentAnimationPacket.AnimationListBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.CompressedFlags.ScratchPad">
+            <summary>Unknown</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentAnimationPacket.PhysicalAvatarEventListBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.CompressedFlags.Tree">
+            <summary>Whether the object has a TreeSpecies</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentRequestSitPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.CompressedFlags.HasText">
+            <summary>Whether the object has floating text ala llSetText</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentRequestSitPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.CompressedFlags.HasParticles">
+            <summary>Whether the object has an active particle system</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentRequestSitPacket.TargetObjectBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.CompressedFlags.HasSound">
+            <summary>Whether the object has sound attached to it</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentSitPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.CompressedFlags.HasParent">
+            <summary>Whether the object is attached to a root object or not</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AgentSitPacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.CompressedFlags.TextureAnimation">
+            <summary>Whether the object has texture animation settings</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestImagePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.CompressedFlags.HasAngularVelocity">
+            <summary>Whether the object has an angular velocity</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestImagePacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.CompressedFlags.HasNameValues">
+            <summary>Whether the object has a name value pairs string</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.RequestImagePacket.RequestImageBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.CompressedFlags.MediaURL">
+            <summary>Whether the object has a Media URL set</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ImageDataPacket">
-            <exclude />
+        <member name="T:OpenMetaverse.UpdateType">
+            <summary>
+            Specific Flags for MultipleObjectUpdate requests
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ImageDataPacket.ImageIDBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.UpdateType.None">
+            <summary>None</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ImageDataPacket.ImageDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.UpdateType.Position">
+            <summary>Change position of prims</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ImagePacketPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.UpdateType.Rotation">
+            <summary>Change rotation of prims</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ImagePacketPacket.ImageIDBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.UpdateType.Scale">
+            <summary>Change size of prims</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ImagePacketPacket.ImageDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.UpdateType.Linked">
+            <summary>Perform operation on link set</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LayerDataPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.UpdateType.Uniform">
+            <summary>Scale prims uniformly, same as selecing ctrl+shift in the
+            viewer. Used in conjunction with Scale</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LayerDataPacket.LayerIDBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.PayPriceType">
+            <summary>
+            Special values in PayPriceReply. If the price is not one of these
+            literal value of the price should be use
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.LayerDataPacket.LayerDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.PayPriceType.Hide">
+            <summary>
+            Indicates that this pay option should be hidden
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectUpdatePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.PayPriceType.Default">
+            <summary>
+            Indicates that this pay option should have the default value
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectUpdatePacket.RegionDataBlock">
-            <exclude />
+        <member name="T:OpenMetaverse.ObjectMovementUpdate">
+            <summary>
+            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="T:OpenMetaverse.Packets.ObjectUpdatePacket.ObjectDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectMovementUpdate.Avatar">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectUpdateCompressedPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectMovementUpdate.CollisionPlane">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectUpdateCompressedPacket.RegionDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectMovementUpdate.State">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectUpdateCompressedPacket.ObjectDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectMovementUpdate.LocalID">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectUpdateCachedPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectMovementUpdate.Position">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectUpdateCachedPacket.RegionDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectMovementUpdate.Velocity">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ObjectUpdateCachedPacket.ObjectDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectMovementUpdate.Acceleration">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ImprovedTerseObjectUpdatePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectMovementUpdate.Rotation">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ImprovedTerseObjectUpdatePacket.RegionDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectMovementUpdate.AngularVelocity">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ImprovedTerseObjectUpdatePacket.ObjectDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectMovementUpdate.Textures">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.KillObjectPacket">
-            <exclude />
+        <member name="T:OpenMetaverse.ObjectManager">
+            <summary>
+            Handles all network traffic related to prims and avatar positions and 
+            movement.
+            </summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.KillObjectPacket.ObjectDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectManager.m_ObjectUpdate">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TransferPacketPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectManager.m_ObjectUpdateLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.TransferPacketPacket.TransferDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectManager.m_ObjectProperties">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SendXferPacketPacket">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.SendXferPacketPacket.XferIDBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectManager.m_ObjectPropertiesLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SendXferPacketPacket.DataPacketBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectManager.m_ObjectPropertiesUpdated">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ConfirmXferPacketPacket">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ConfirmXferPacketPacket.XferIDBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectManager.m_ObjectPropertiesUpdatedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectManager.m_ObjectPropertiesFamily">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket.SenderBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.AvatarAnimationPacket.AnimationListBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectManager.m_ObjectPropertiesFamilyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket.AnimationSourceListBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectManager.m_AvatarUpdate">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarAnimationPacket.PhysicalAvatarEventListBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.AvatarSitResponsePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectManager.m_AvatarUpdateLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarSitResponsePacket.SitObjectBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectManager.m_TerseObjectUpdate">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.AvatarSitResponsePacket.SitTransformBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectManager.m_TerseObjectUpdateLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CameraConstraintPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectManager.m_ObjectDataBlockUpdate">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.CameraConstraintPacket.CameraCollidePlaneBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ParcelPropertiesPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectManager.m_ObjectDataBlockUpdateLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelPropertiesPacket.ParcelDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectManager.m_KillObject">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ParcelPropertiesPacket.AgeVerificationBlockBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ChildAgentUpdatePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectManager.m_KillObjectLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectManager.m_KillObjects">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.GroupDataBlock">
-            <exclude />
+        <member name="M:OpenMetaverse.ObjectManager.OnKillObjects(OpenMetaverse.KillObjectsEventArgs)">
+            <summary>Raises the KillObjects Event</summary>
+             <param name="e">A KillObjectsEventArgs object containing
+             the data sent from the simulator</param>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.AnimationDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectManager.m_KillObjectsLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.GranterBlockBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectManager.m_AvatarSitChanged">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.NVPairDataBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.VisualParamBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectManager.m_AvatarSitChangedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.AgentAccessBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectManager.m_PayPriceReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentUpdatePacket.AgentInfoBlock">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ChildAgentAlivePacket">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectManager.m_PayPriceReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentAlivePacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectManager.m_PhysicsProperties">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.ChildAgentPositionUpdatePacket">
-            <exclude />
+        <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="T:OpenMetaverse.Packets.ChildAgentPositionUpdatePacket.AgentDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectManager.m_PhysicsPropertiesLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SoundTriggerPacket">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectManager.Client">
+            <summary>Reference to the GridClient object</summary>
         </member>
-        <member name="T:OpenMetaverse.Packets.SoundTriggerPacket.SoundDataBlock">
-            <exclude />
+        <member name="F:OpenMetaverse.ObjectManager.InterpolationTimer">
+            <summary>Does periodic dead reckoning calculation to convert
+            velocity and acceleration to new positions for objects</summary>
         </member>
-        <member name="T:OpenMetaverse.VisualColorOperation">
+        <member name="M:OpenMetaverse.ObjectManager.#ctor(OpenMetaverse.GridClient)">
             <summary>
-            Operation to apply when applying color to texture
+            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.VisualColorParam">
+        <member name="M:OpenMetaverse.ObjectManager.RequestObject(OpenMetaverse.Simulator,System.UInt32)">
             <summary>
-            Information needed to translate visual param value to RGBA color
+            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="localID">The Local ID of the object</param>
         </member>
-        <member name="M:OpenMetaverse.VisualColorParam.#ctor(OpenMetaverse.VisualColorOperation,OpenMetaverse.Color4[])">
+        <member name="M:OpenMetaverse.ObjectManager.RequestObjects(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32})">
             <summary>
-            Construct VisualColorParam
+            Request information for multiple objects contained in
+            the same simulator
             </summary>
-            <param name="operation">Operation to apply when applying color to texture</param>
-            <param name="colors">Colors</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="T:OpenMetaverse.VisualAlphaParam">
-            <summary>
-            Represents alpha blending and bump infor for a visual parameter
-            such as sleive length
-            </summary>
+        <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> 
+            </example>
         </member>
-        <member name="M:OpenMetaverse.VisualAlphaParam.#ctor(System.Single,System.String,System.Boolean,System.Boolean)">
+        <member name="M:OpenMetaverse.ObjectManager.RequestPayPrice(OpenMetaverse.Simulator,OpenMetaverse.UUID)">
             <summary>
-            Create new alhpa information for a visual param
+            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="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: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>
+            <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>
         </member>
-        <member name="T:OpenMetaverse.VisualParam">
+        <member name="M:OpenMetaverse.ObjectManager.SelectObject(OpenMetaverse.Simulator,System.UInt32)">
             <summary>
-            A single visual characteristic of an avatar mesh, such as eyebrow height
+            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"/>
         </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.ObjectManager.SelectObject(OpenMetaverse.Simulator,System.UInt32,System.Boolean)">
             <summary>
-            Set all the values through the constructor
+            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="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="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>
+            <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
+            made immediately following the request</param>
+            <seealso cref="T:OpenMetaverse.ObjectPropertiesFamilyEventArgs"/>
         </member>
-        <member name="F:OpenMetaverse.VisualParam.Drivers">
-            <summary>Array of param IDs that are drivers for this parameter</summary>
+        <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> 
+            <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"/>
         </member>
-        <member name="T:OpenMetaverse.VisualParams">
+        <member name="M:OpenMetaverse.ObjectManager.SelectObjects(OpenMetaverse.Simulator,System.UInt32[])">
             <summary>
-            Holds the Params array of all the avatar appearance parameters
-            </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> 
+            <param name="localIDs">An array containing the Local IDs of the objects</param>
+            <seealso cref="T:OpenMetaverse.ObjectPropertiesFamilyEventArgs"/>
         </member>
-        <member name="T:OpenMetaverse.Assets.Asset">
+        <member name="M:OpenMetaverse.ObjectManager.SetFlags(OpenMetaverse.Simulator,System.UInt32,System.Boolean,System.Boolean,System.Boolean,System.Boolean)">
             <summary>
-            Base class for all Asset types
+            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>
         </member>
-        <member name="M:OpenMetaverse.Assets.Asset.#ctor">
+        <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>
-            Construct a new Asset object
+            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.Assets.Asset.#ctor(OpenMetaverse.UUID,System.Byte[])">
+        <member name="M:OpenMetaverse.ObjectManager.SetSaleInfo(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.SaleType,System.Int32)">
             <summary>
-            Construct a new Asset object
+            Sets the sale properties of a single 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="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="P:OpenMetaverse.Assets.Asset.AssetID">
-            <summary>The assets unique ID</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="price">The price of the object</param>
         </member>
-        <member name="P:OpenMetaverse.Assets.Asset.AssetType">
+        <member name="M:OpenMetaverse.ObjectManager.SetSaleInfo(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32},OpenMetaverse.SaleType,System.Int32)">
             <summary>
-            The "type" of asset, Notecard, Animation, etc
-            </summary>
+            Sets the sale properties of multiple objects
+            </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="price">The price of the object</param>
         </member>
-        <member name="M:OpenMetaverse.Assets.Asset.Encode">
+        <member name="M:OpenMetaverse.ObjectManager.DeselectObject(OpenMetaverse.Simulator,System.UInt32)">
             <summary>
-            Regenerates the <code>AssetData</code> byte array from the properties
-            of the derived class.
+            Deselect 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>
         </member>
-        <member name="M:OpenMetaverse.Assets.Asset.Decode">
+        <member name="M:OpenMetaverse.ObjectManager.DeselectObjects(OpenMetaverse.Simulator,System.UInt32[])">
             <summary>
-            Decodes the AssetData, placing it in appropriate properties of the derived
-            class.
+            Deselect multiple objects.
             </summary>
-            <returns>True if the asset decoding succeeded, otherwise false</returns>
+            <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="T:OpenMetaverse.Assets.ArchiveConstants">
+        <member name="M:OpenMetaverse.ObjectManager.ClickObject(OpenMetaverse.Simulator,System.UInt32)">
             <summary>
-            Constants for the archiving module
+            Perform a click action on 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>
         </member>
-        <member name="F:OpenMetaverse.Assets.ArchiveConstants.CONTROL_FILE_PATH">
+        <member name="M:OpenMetaverse.ObjectManager.ClickObject(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Vector3,OpenMetaverse.Vector3,System.Int32,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
             <summary>
-            The location of the archive control file
+            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="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>
+            <param name="faceIndex">The face of the position to touch</param>
+            <param name="position">The region coordinates of the position to touch</param>
+            <param name="normal">The surface normal of the position to touch (A normal is a vector perpindicular to the surface)</param>
+            <param name="binormal">The surface binormal of the position to touch (A binormal is a vector tangen to the surface
+            pointing along the U direction of the tangent space</param>
         </member>
-        <member name="F:OpenMetaverse.Assets.ArchiveConstants.ASSETS_PATH">
+        <member name="M:OpenMetaverse.ObjectManager.AddPrim(OpenMetaverse.Simulator,OpenMetaverse.Primitive.ConstructionData,OpenMetaverse.UUID,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Quaternion)">
             <summary>
-            Path for the assets held in an archive
+            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="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>
+            <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 
+            follow up by moving the object after it has been created. This
+            function will not set textures, light and flexible data, or other 
+            extended primitive properties</remarks>
         </member>
-        <member name="F:OpenMetaverse.Assets.ArchiveConstants.OBJECTS_PATH">
+        <member name="M:OpenMetaverse.ObjectManager.AddPrim(OpenMetaverse.Simulator,OpenMetaverse.Primitive.ConstructionData,OpenMetaverse.UUID,OpenMetaverse.Vector3,OpenMetaverse.Vector3,OpenMetaverse.Quaternion,OpenMetaverse.PrimFlags)">
             <summary>
-            Path for the prims file
+            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="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>
+            <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 
+            follow up by moving the object after it has been created. This
+            function will not set textures, light and flexible data, or other 
+            extended primitive properties</remarks>
         </member>
-        <member name="F:OpenMetaverse.Assets.ArchiveConstants.TERRAINS_PATH">
+        <member name="M:OpenMetaverse.ObjectManager.AddTree(OpenMetaverse.Simulator,OpenMetaverse.Vector3,OpenMetaverse.Quaternion,OpenMetaverse.Vector3,OpenMetaverse.Tree,OpenMetaverse.UUID,System.Boolean)">
             <summary>
-            Path for terrains.  Technically these may be assets, but I think it's quite nice to split them out.
+            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="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, 
+            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>
-        <member name="F:OpenMetaverse.Assets.ArchiveConstants.SETTINGS_PATH">
+        <member name="M:OpenMetaverse.ObjectManager.AddGrass(OpenMetaverse.Simulator,OpenMetaverse.Vector3,OpenMetaverse.Quaternion,OpenMetaverse.Vector3,OpenMetaverse.Grass,OpenMetaverse.UUID)">
             <summary>
-            Path for region settings.
+            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="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, 
+            or UUID.Zero if no group is to be set</param>
         </member>
-        <member name="F:OpenMetaverse.Assets.ArchiveConstants.ASSET_EXTENSION_SEPARATOR">
+        <member name="M:OpenMetaverse.ObjectManager.SetTextures(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Primitive.TextureEntry)">
             <summary>
-            The character the separates the uuid from extension information in an archived asset filename
+            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="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>
-        <member name="F:OpenMetaverse.Assets.ArchiveConstants.ASSET_TYPE_TO_EXTENSION">
+        <member name="M:OpenMetaverse.ObjectManager.SetTextures(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Primitive.TextureEntry,System.String)">
             <summary>
-            Extensions used for asset types in the archive
+            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="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>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetsArchiver">
+        <member name="M:OpenMetaverse.ObjectManager.SetLight(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Primitive.LightData)">
             <summary>
-            Archives assets
+            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="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>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetsArchiver.m_assets">
+        <member name="M:OpenMetaverse.ObjectManager.SetFlexible(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Primitive.FlexibleData)">
             <summary>
-            Archive assets
+            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="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>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetsArchiver.Archive(OpenMetaverse.Assets.TarArchiveWriter)">
+        <member name="M:OpenMetaverse.ObjectManager.SetSculpt(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Primitive.SculptData)">
             <summary>
-            Archive the assets given to this archiver to the given archive.
+            Set the sculptie texture and data on an object
             </summary>
-            <param name="archive">
-            </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>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetsArchiver.WriteMetadata(OpenMetaverse.Assets.TarArchiveWriter)">
+        <member name="M:OpenMetaverse.ObjectManager.SetExtraParamOff(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.ExtraParamType)">
             <summary>
-            Write an assets metadata file to the given archive
+            Unset additional primitive parameters on an object
             </summary>
-            <param name="archive">
-            </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>
-        <member name="M:OpenMetaverse.Assets.AssetsArchiver.WriteData(OpenMetaverse.Assets.TarArchiveWriter)">
+        <member name="M:OpenMetaverse.ObjectManager.LinkPrims(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32})">
             <summary>
-            Write asset data files to the given archive
+            Link multiple prims into a linkset
             </summary>
-            <param name="archive">
-            </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>
-        <member name="T:OpenMetaverse.Assets.TarArchiveReader">
+        <member name="M:OpenMetaverse.ObjectManager.DelinkPrims(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32})">
             <summary>
-            Temporary code to do the bare minimum required to read a tar archive for our purposes
+            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="localIDs">An array which contains the IDs of the objects to delink</param>
         </member>
-        <member name="M:OpenMetaverse.Assets.TarArchiveReader.#ctor(System.IO.Stream)">
+        <member name="M:OpenMetaverse.ObjectManager.SetRotation(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Quaternion)">
             <summary>
-            Generate a tar reader which reads from the given stream.
+            Change the rotation of an object
             </summary>
-            <param name="s">
-            </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>
-        <member name="F:OpenMetaverse.Assets.TarArchiveReader.m_br">
+        <member name="M:OpenMetaverse.ObjectManager.SetName(OpenMetaverse.Simulator,System.UInt32,System.String)">
             <summary>
-            Binary reader for the underlying stream
+            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="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>
-        <member name="F:OpenMetaverse.Assets.TarArchiveReader.m_nullCharArray">
+        <member name="M:OpenMetaverse.ObjectManager.SetNames(OpenMetaverse.Simulator,System.UInt32[],System.String[])">
             <summary>
-            Used to trim off null chars
+            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="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>
-        <member name="F:OpenMetaverse.Assets.TarArchiveReader.m_spaceCharArray">
+        <member name="M:OpenMetaverse.ObjectManager.SetDescription(OpenMetaverse.Simulator,System.UInt32,System.String)">
             <summary>
-            Used to trim off space chars
+            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="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>
-        <member name="M:OpenMetaverse.Assets.TarArchiveReader.ReadEntry(System.String@,OpenMetaverse.Assets.TarArchiveReader.TarEntryType@)">
+        <member name="M:OpenMetaverse.ObjectManager.SetDescriptions(OpenMetaverse.Simulator,System.UInt32[],System.String[])">
             <summary>
-            Read the next entry in the tar file.
+            Set the descriptions of multiple objects
             </summary>
-            <param name="filePath">
-            </param>
-            <param name="entryType">
-            </param>
-            <returns>the data for the entry.  Returns null if there are no more entries</returns>
+            <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>
-        <member name="M:OpenMetaverse.Assets.TarArchiveReader.ReadHeader">
+        <member name="M:OpenMetaverse.ObjectManager.AttachObject(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.AttachmentPoint,OpenMetaverse.Quaternion)">
             <summary>
-            Read the next 512 byte chunk of data as a tar header.
+            Attach an object to this avatar
             </summary>
-            <returns>A tar header struct.  null if we have reached the end of the archive.</returns>
+            <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>
         </member>
-        <member name="M:OpenMetaverse.Assets.TarArchiveReader.ReadData(System.Int32)">
+        <member name="M:OpenMetaverse.ObjectManager.DropObject(OpenMetaverse.Simulator,System.UInt32)">
             <summary>
-            Read data following a header
+            Drop an attached object from this avatar
             </summary>
-            <param name="fileSize">
+            <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>
-            <returns>
-            </returns>
+            <param name="localID">The object's ID which is local to the simulator the object is in</param>
         </member>
-        <member name="M:OpenMetaverse.Assets.TarArchiveReader.ConvertOctalBytesToDecimal(System.Byte[],System.Int32,System.Int32)">
+        <member name="M:OpenMetaverse.ObjectManager.DetachObjects(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32})">
             <summary>
-            Convert octal bytes to a decimal representation
+            Detach an object from yourself
             </summary>
-            <param name="bytes">
-            </param>
-            <param name="count">
-            </param>
-            <param name="startIndex">
+            <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>
-            <returns>
-            </returns>
+            <param name="localIDs">An array which contains the IDs of the objects to detach</param>
         </member>
-        <member name="T:OpenMetaverse.Assets.TarArchiveWriter">
+        <member name="M:OpenMetaverse.ObjectManager.SetPosition(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Vector3)">
             <summary>
-            Temporary code to produce a tar archive in tar v7 format
+            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="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>
-        <member name="F:OpenMetaverse.Assets.TarArchiveWriter.m_bw">
+        <member name="M:OpenMetaverse.ObjectManager.SetPosition(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Vector3,System.Boolean)">
             <summary>
-            Binary writer for the underlying stream
+            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="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>
         </member>
-        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.WriteDir(System.String)">
+        <member name="M:OpenMetaverse.ObjectManager.SetScale(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Vector3,System.Boolean,System.Boolean)">
             <summary>
-            Write a directory entry to the tar archive.  We can only handle one path level right now!
+            Change the Scale (size) of an object
             </summary>
-            <param name="dirName">
-            </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>
+            <param name="uniform">True to resize prims uniformly</param>
         </member>
-        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.WriteFile(System.String,System.String)">
+        <member name="M:OpenMetaverse.ObjectManager.SetRotation(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Quaternion,System.Boolean)">
             <summary>
-            Write a file to the tar archive
+            Change the Rotation of an object that is either a child or a whole linkset
             </summary>
-            <param name="filePath">
-            </param>
-            <param name="data">
-            </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>
         </member>
-        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.WriteFile(System.String,System.Byte[])">
+        <member name="M:OpenMetaverse.ObjectManager.UpdateObject(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Vector3,OpenMetaverse.UpdateType)">
             <summary>
-            Write a file to the tar archive
+            Send a Multiple Object Update packet to change the size, scale or rotation of a primitive
             </summary>
-            <param name="filePath">
-            </param>
-            <param name="data">
-            </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>
         </member>
-        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.Close">
+        <member name="M:OpenMetaverse.ObjectManager.DeedObject(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.UUID)">
             <summary>
-            Finish writing the raw tar archive data to a stream.  The stream will be closed on completion.
+            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="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>
         </member>
-        <member name="M:OpenMetaverse.Assets.TarArchiveWriter.WriteEntry(System.String,System.Byte[],System.Char)">
+        <member name="M:OpenMetaverse.ObjectManager.DeedObjects(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32},OpenMetaverse.UUID)">
             <summary>
-            Write a particular entry
+            Deed multiple objects (prims) to a group, Objects must be shared with group which
+            can be accomplished with SetPermissions()
             </summary>
-            <param name="filePath">
-            </param>
-            <param name="data">
-            </param>
-            <param name="fileType">
-            </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>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetAnimation">
+        <member name="M:OpenMetaverse.ObjectManager.SetPermissions(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32},OpenMetaverse.PermissionWho,OpenMetaverse.PermissionMask,System.Boolean)">
             <summary>
-            Represents an Animation
+            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="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">Which permission to modify</param>
+            <param name="set">The new state of permission</param>
         </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.ObjectManager.RequestObjectPropertiesFamily(OpenMetaverse.Simulator,OpenMetaverse.UUID)">
             <summary>
-            Construct an Asset object of type Animation
+            Request additional properties for an 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>
+            <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="P:OpenMetaverse.Assets.AssetAnimation.AssetType">
-            <summary>Override the base classes AssetType</summary>
-        </member>
-        <member name="T:OpenMetaverse.Assets.AssetBodypart">
+        <member name="M:OpenMetaverse.ObjectManager.RequestObjectPropertiesFamily(OpenMetaverse.Simulator,OpenMetaverse.UUID,System.Boolean)">
             <summary>
-            Represents an <seealso cref="T:OpenMetaverse.Assets.AssetWearable" /> that represents an avatars body ie: Hair, Etc.
+            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">Absolute UUID of the object</param>
+            <param name="reliable">Whether to require server acknowledgement of this request</param>
         </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.Assets.AssetClothing">
+        <member name="M:OpenMetaverse.ObjectManager.SetObjectsGroup(OpenMetaverse.Simulator,System.Collections.Generic.List{System.UInt32},OpenMetaverse.UUID)">
             <summary>
-            Represents an <seealso cref="T:OpenMetaverse.Assets.AssetWearable" /> that can be worn on an avatar
-            such as a Shirt, Pants, etc.
+            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="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>
-        <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.Assets.GestureStepType">
+        <member name="M:OpenMetaverse.ObjectManager.NavigateObjectMedia(OpenMetaverse.UUID,System.Int32,System.String,OpenMetaverse.Simulator)">
             <summary>
-            Type of gesture step
+            Update current URL of the previously set prim media
             </summary>
+            <param name="primID">UUID of the prim</param>
+            <param name="newURL">Set current URL to this</param>
+            <param name="face">Prim face number</param>
+            <param name="sim">Simulator in which prim is located</param>
         </member>
-        <member name="T:OpenMetaverse.Assets.GestureStep">
+        <member name="M:OpenMetaverse.ObjectManager.UpdateObjectMedia(OpenMetaverse.UUID,OpenMetaverse.MediaEntry[],OpenMetaverse.Simulator)">
             <summary>
-            Base class for gesture steps
+            Set object media
             </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>
+            <param name="sim">Simulatior in which prim is located</param>
         </member>
-        <member name="P:OpenMetaverse.Assets.GestureStep.GestureStepType">
+        <member name="M:OpenMetaverse.ObjectManager.RequestObjectMedia(OpenMetaverse.UUID,OpenMetaverse.Simulator,OpenMetaverse.ObjectManager.ObjectMediaCallback)">
             <summary>
-            Retururns what kind of gesture step this is
+            Retrieve information about object media
             </summary>
+            <param name="primID">UUID of the primitive</param>
+            <param name="sim">Simulator where prim is located</param>
+            <param name="callback">Call this callback when done</param>
         </member>
-        <member name="T:OpenMetaverse.Assets.GestureStepAnimation">
-            <summary>
-            Describes animation step of a gesture
-            </summary>
+        <member name="M:OpenMetaverse.ObjectManager.ObjectUpdateHandler(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.Assets.GestureStepAnimation.AnimationStart">
+        <member name="M:OpenMetaverse.ObjectManager.ImprovedTerseObjectUpdateHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <summary>
-            If true, this step represents start of animation, otherwise animation stop
+            A terse object update, used when a transformation matrix or
+            velocity/acceleration for an object changes but nothing else
+            (scale/position/rotation/acceleration/velocity)
             </summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.Assets.GestureStepAnimation.ID">
-            <summary>
-            Animation asset <see cref="T:OpenMetaverse.UUID" /></summary>
+        <member name="M:OpenMetaverse.ObjectManager.ObjectUpdateCompressedHandler(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.Assets.GestureStepAnimation.Name">
-            <summary>
-            Animation inventory name
-            </summary>
+        <member name="M:OpenMetaverse.ObjectManager.ObjectUpdateCachedHandler(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="P:OpenMetaverse.Assets.GestureStepAnimation.GestureStepType">
-            <summary>
-            Returns what kind of gesture step this is
-            </summary>
+        <member name="M:OpenMetaverse.ObjectManager.KillObjectHandler(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.Assets.GestureStepSound">
-            <summary>
-            Describes sound step of a gesture
-            </summary>
+        <member name="M:OpenMetaverse.ObjectManager.ObjectPropertiesHandler(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.Assets.GestureStepSound.ID">
-            <summary>
-            Sound asset <see cref="T:OpenMetaverse.UUID" /></summary>
+        <member name="M:OpenMetaverse.ObjectManager.ObjectPropertiesFamilyHandler(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.Assets.GestureStepSound.Name">
-            <summary>
-            Sound inventory name
-            </summary>
+        <member name="M:OpenMetaverse.ObjectManager.PayPriceReplyHandler(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="P:OpenMetaverse.Assets.GestureStepSound.GestureStepType">
+        <member name="M:OpenMetaverse.ObjectManager.ObjectPhysicsPropertiesHandler(System.String,OpenMetaverse.Interfaces.IMessage,OpenMetaverse.Simulator)">
             <summary>
-            Returns what kind of gesture step this is
+            
             </summary>
+            <param name="capsKey"></param>
+            <param name="message"></param>
+            <param name="simulator"></param>
         </member>
-        <member name="T:OpenMetaverse.Assets.GestureStepChat">
+        <member name="M:OpenMetaverse.ObjectManager.BuildBasicShape(OpenMetaverse.PrimType)">
             <summary>
-            Describes sound step of a gesture
+            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>
         </member>
-        <member name="F:OpenMetaverse.Assets.GestureStepChat.Text">
+        <member name="M:OpenMetaverse.ObjectManager.SetAvatarSittingOn(OpenMetaverse.Simulator,OpenMetaverse.Avatar,System.UInt32,System.UInt32)">
             <summary>
-            Text to output in chat
+            
             </summary>
+            <param name="sim"></param>
+            <param name="av"></param>
+            <param name="localid"></param>
+            <param name="oldSeatID"></param>
         </member>
-        <member name="P:OpenMetaverse.Assets.GestureStepChat.GestureStepType">
+        <member name="M:OpenMetaverse.ObjectManager.UpdateDilation(OpenMetaverse.Simulator,System.UInt32)">
             <summary>
-            Returns what kind of gesture step this is
+            
             </summary>
+            <param name="s"></param>
+            <param name="dilation"></param>
         </member>
-        <member name="T:OpenMetaverse.Assets.GestureStepWait">
+        <member name="M:OpenMetaverse.ObjectManager.SetShape(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Primitive.ConstructionData)">
             <summary>
-            Describes sound step of a gesture
+            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="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>
-        <member name="F:OpenMetaverse.Assets.GestureStepWait.WaitForAnimation">
+        <member name="M:OpenMetaverse.ObjectManager.SetMaterial(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.Material)">
             <summary>
-            If true in this step we wait for all animations to finish
+            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="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="F:OpenMetaverse.Assets.GestureStepWait.WaitForTime">
+        <member name="M:OpenMetaverse.ObjectManager.GetPrimitive(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.UUID)">
             <summary>
-            If true gesture player should wait for the specified amount of time
+            
             </summary>
+            <param name="simulator"></param>
+            <param name="localID"></param>
+            <param name="fullID"></param>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.Assets.GestureStepWait.WaitTime">
+        <member name="M:OpenMetaverse.ObjectManager.GetPrimitive(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.UUID,System.Boolean)">
             <summary>
-            Time in seconds to wait if WaitForAnimation is false
+            
             </summary>
+            <param name="simulator"></param>
+            <param name="localID"></param>
+            <param name="fullID"></param>
+            <param name="createIfMissing"></param>
+            <returns></returns>
         </member>
-        <member name="P:OpenMetaverse.Assets.GestureStepWait.GestureStepType">
+        <member name="M:OpenMetaverse.ObjectManager.GetAvatar(OpenMetaverse.Simulator,System.UInt32,OpenMetaverse.UUID)">
             <summary>
-            Returns what kind of gesture step this is
+            
             </summary>
+            <param name="simulator"></param>
+            <param name="localID"></param>
+            <param name="fullID"></param>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Assets.GestureStepEOF">
-            <summary>
-            Describes the final step of a gesture
-            </summary>
+        <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="P:OpenMetaverse.Assets.GestureStepEOF.GestureStepType">
-            <summary>
-            Returns what kind of gesture step this is
-            </summary>
+        <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="T:OpenMetaverse.Assets.AssetGesture">
-            <summary>
-            Represents a sequence of animations, sounds, and chat actions
-            </summary>
+        <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="M:OpenMetaverse.Assets.AssetGesture.#ctor">
-            <summary>
-            Constructs guesture asset
-            </summary>
+        <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="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 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="F:OpenMetaverse.Assets.AssetGesture.TriggerKey">
-            <summary>
-            Keyboard key that triggers the gestyre
-            </summary>
+        <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="F:OpenMetaverse.Assets.AssetGesture.TriggerKeyMask">
-            <summary>
-            Modifier to the trigger key
-            </summary>
+        <member name="E:OpenMetaverse.ObjectManager.ObjectDataBlockUpdate">
+            <summary>Raised when the simulator sends us data containing
+            updates to an Objects DataBlock</summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetGesture.Trigger">
-            <summary>
-            String that triggers playing of the gesture sequence
-            </summary>
+        <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="F:OpenMetaverse.Assets.AssetGesture.ReplaceWith">
-            <summary>
-            Text that replaces trigger in chat once gesture is triggered
-            </summary>
+        <member name="E:OpenMetaverse.ObjectManager.KillObjects">
+            <summary>Raised when the simulator informs us when a group of <see cref="T:OpenMetaverse.Primitive"/>
+            or <see cref="T:OpenMetaverse.Avatar"/> is no longer within view</summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetGesture.Sequence">
-            <summary>
-            Sequence of gesture steps
-            </summary>
+        <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="P:OpenMetaverse.Assets.AssetGesture.AssetType">
-            <summary>
-            Returns asset type
-            </summary>
+        <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="M:OpenMetaverse.Assets.AssetGesture.Encode">
-            <summary>
-            Encodes gesture asset suitable for uplaod
-            </summary>
+        <member name="E:OpenMetaverse.ObjectManager.PhysicsProperties">
+            <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="M:OpenMetaverse.Assets.AssetGesture.Decode">
+        <member name="T:OpenMetaverse.ObjectManager.ObjectMediaCallback">
             <summary>
-            Decodes gesture assset into play sequence
+            Callback for getting object media data via CAP
             </summary>
-            <returns>true if the asset data was decoded successfully</returns>
+            <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="T:OpenMetaverse.Assets.AssetLandmark">
+        <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"/>
+        </member>
+        <member name="M:OpenMetaverse.PrimEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.Primitive,System.UInt16,System.Boolean,System.Boolean)">
             <summary>
-            Represents a Landmark with RegionID and Position vector
+            Construct a new instance of the PrimEventArgs class
             </summary>
+            <param name="simulator">The simulator the object originated from</param>
+            <param name="prim">The Primitive</param>
+            <param name="timeDilation">The simulator time dilation</param>
+            <param name="isNew">The prim was not in the dictionary before this update</param>
+            <param name="isAttachment">true if the primitive represents an attachment to an agent</param>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetLandmark.#ctor">
-            <summary>Construct an Asset of type Landmark</summary>
+        <member name="P:OpenMetaverse.PrimEventArgs.Simulator">
+            <summary>Get the simulator the <see cref="T:OpenMetaverse.Primitive"/> originated from</summary>
         </member>
-        <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 name="P:OpenMetaverse.PrimEventArgs.Prim">
+            <summary>Get the <see cref="T:OpenMetaverse.Primitive"/> details</summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetLandmark.RegionID">
-            <summary>UUID of the Landmark target region</summary>
+        <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>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetLandmark.Position">
-            <summary> Local position of the target </summary>
+        <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>
         </member>
-        <member name="P:OpenMetaverse.Assets.AssetLandmark.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <member name="P:OpenMetaverse.PrimEventArgs.TimeDilation">
+            <summary>Get the simulator Time Dilation</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetLandmark.Encode">
-            <summary>
-            Encode the raw contents of a string with the specific Landmark format
-            </summary>
+        <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"/>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetLandmark.Decode">
+        <member name="M:OpenMetaverse.AvatarUpdateEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.Avatar,System.UInt16,System.Boolean)">
             <summary>
-            Decode the raw asset data, populating the RegionID and Position
+            Construct a new instance of the AvatarUpdateEventArgs class
             </summary>
-            <returns>true if the AssetData was successfully decoded to a UUID and Vector</returns>
+            <param name="simulator">The simulator the packet originated from</param>
+            <param name="avatar">The <see cref="P:OpenMetaverse.AvatarUpdateEventArgs.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>
-        <member name="T:OpenMetaverse.Assets.AssetMesh">
-            <summary>
-            Represents Mesh asset
-            </summary>
+        <member name="P:OpenMetaverse.AvatarUpdateEventArgs.Simulator">
+            <summary>Get the simulator the object originated from</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetMesh.#ctor">
-            <summary>Initializes a new instance of an AssetMesh object</summary>
+        <member name="P:OpenMetaverse.AvatarUpdateEventArgs.Avatar">
+            <summary>Get the <see cref="P:OpenMetaverse.AvatarUpdateEventArgs.Avatar"/> data</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 name="P:OpenMetaverse.AvatarUpdateEventArgs.TimeDilation">
+            <summary>Get the simulator time dilation</summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetMesh.MeshData">
-            <summary>
-            Decoded mesh data
-            </summary>
+        <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>
         </member>
-        <member name="P:OpenMetaverse.Assets.AssetMesh.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <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
+            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"/>
+            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>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetMesh.Encode">
+        <member name="M:OpenMetaverse.ObjectPropertiesEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.Primitive.ObjectProperties)">
             <summary>
-            TODO: Encodes Collada file into LLMesh format
+            Construct a new instance of the ObjectPropertiesEventArgs class
             </summary>
+            <param name="simulator">The simulator the object is located</param>
+            <param name="props">The primitive Properties</param>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetMesh.Decode">
-            <summary>
-            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 name="P:OpenMetaverse.ObjectPropertiesEventArgs.Simulator">
+            <summary>Get the simulator the object is located</summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetNotecard">
-            <summary>
-            Represents a string of characters encoded with specific formatting properties
-            </summary>
+        <member name="P:OpenMetaverse.ObjectPropertiesEventArgs.Properties">
+            <summary>Get the primitive properties</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetNotecard.#ctor">
-            <summary>Construct an Asset of type Notecard</summary>
+        <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="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)"/> request is
+            made and <see cref="F:OpenMetaverse.Settings.OBJECT_TRACKING"/> is enabled</para>    
+            </remarks>    
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetNotecard.#ctor(OpenMetaverse.UUID,System.Byte[])">
+        <member name="M:OpenMetaverse.ObjectPropertiesUpdatedEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.Primitive,OpenMetaverse.Primitive.ObjectProperties)">
             <summary>
-            Construct an Asset object of type Notecard
-            </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.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>
+            Construct a new instance of the ObjectPropertiesUpdatedEvenrArgs class
+            </summary>                
+            <param name="simulator">The simulator the object is located</param>
+            <param name="prim">The Primitive</param>
+            <param name="props">The primitive Properties</param>
         </member>
-        <member name="P:OpenMetaverse.Assets.AssetNotecard.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <member name="P:OpenMetaverse.ObjectPropertiesUpdatedEventArgs.Prim">
+            <summary>Get the primitive details</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetNotecard.Encode">
-            <summary>
-            Encode the raw contents of a string with the specific Linden Text properties
-            </summary>
+        <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
+            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
+            made, the viewer equivalent is hovering the mouse cursor over an object</para>
+            </remarks>    
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetNotecard.Decode">
-            <summary>
-            Decode the raw asset data including the Linden Text properties
-            </summary>
-            <returns>true if the AssetData was successfully decoded</returns>
+        <member name="P:OpenMetaverse.ObjectPropertiesFamilyEventArgs.Simulator">
+            <summary>Get the simulator the object is located</summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetPrim">
-            <summary>
-            A linkset asset, containing a parent primitive and zero or more children
-            </summary>
+        <member name="P:OpenMetaverse.ObjectPropertiesFamilyEventArgs.Properties">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetPrim.#ctor">
-            <summary>Initializes a new instance of an AssetPrim object</summary>
+        <member name="P:OpenMetaverse.ObjectPropertiesFamilyEventArgs.Type">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetPrim.#ctor(OpenMetaverse.UUID,System.Byte[])">
-            <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 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>        
+            </remarks>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetPrim.ProfileShape">
-            <summary>
-            Only used internally for XML serialization/deserialization
-            </summary>
+        <member name="P:OpenMetaverse.TerseObjectUpdateEventArgs.Simulator">
+            <summary>Get the simulator the object is located</summary>
         </member>
-        <member name="P:OpenMetaverse.Assets.AssetPrim.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <member name="P:OpenMetaverse.TerseObjectUpdateEventArgs.Prim">
+            <summary>Get the primitive details</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetPrim.Encode">
-            <summary>
-            </summary>
+        <member name="P:OpenMetaverse.TerseObjectUpdateEventArgs.Update">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetPrim.Decode">
-            <summary>
-            </summary>
-            <returns>
-            </returns>
+        <member name="P:OpenMetaverse.TerseObjectUpdateEventArgs.TimeDilation">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.PrimObject">
+        <member name="T:OpenMetaverse.ObjectDataBlockUpdateEventArgs">
             <summary>
-            The deserialized form of a single primitive in a linkset asset
+            
             </summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetScriptBinary">
-            <summary>
-            Represents an AssetScriptBinary object containing the
-            LSO compiled bytecode of an LSL script
-            </summary>
+        <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.Simulator">
+            <summary>Get the simulator the object is located</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetScriptBinary.#ctor">
-            <summary>Initializes a new instance of an AssetScriptBinary object</summary>
+        <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.Prim">
+            <summary>Get the primitive details</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="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.ConstructionData">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.Assets.AssetScriptBinary.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.Block">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetScriptBinary.Encode">
-            <summary>
-            TODO: Encodes a scripts contents into a LSO Bytecode file
-            </summary>
+        <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.Update">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetScriptBinary.Decode">
-            <summary>
-            TODO: Decode LSO Bytecode into a string
-            </summary>
-            <returns>true</returns>
+        <member name="P:OpenMetaverse.ObjectDataBlockUpdateEventArgs.NameValues">
+            <summary></summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetScriptText">
-            <summary>
-            Represents an LSL Text object containing a string of UTF encoded characters
-            </summary>
+        <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>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetScriptText.#ctor">
-            <summary>Initializes a new AssetScriptText object</summary>
+        <member name="P:OpenMetaverse.KillObjectEventArgs.Simulator">
+            <summary>Get the simulator the object is located</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetScriptText.#ctor(OpenMetaverse.UUID,System.Byte[])">
-            <summary>
-            Initializes a new AssetScriptText 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.KillObjectEventArgs.ObjectLocalID">
+            <summary>The LocalID of the object</summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetScriptText.Source">
-            <summary>A string of characters represting the script contents</summary>
+        <member name="T:OpenMetaverse.KillObjectsEventArgs">
+            <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.KillObjects"/> event</summary>
         </member>
-        <member name="P:OpenMetaverse.Assets.AssetScriptText.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <member name="P:OpenMetaverse.KillObjectsEventArgs.Simulator">
+            <summary>Get the simulator the object is located</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetScriptText.Encode">
-            <summary>
-            Encode a string containing the scripts contents into byte encoded AssetData
-            </summary>
+        <member name="P:OpenMetaverse.KillObjectsEventArgs.ObjectLocalIDs">
+            <summary>The LocalID of the object</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetScriptText.Decode">
+        <member name="T:OpenMetaverse.AvatarSitChangedEventArgs">
             <summary>
-            Decode a byte array containing the scripts contents into a string
+            Provides updates sit position data
             </summary>
-            <returns>true if decoding is successful</returns>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetSound">
-            <summary>
-            Represents a Sound Asset
-            </summary>
+        <member name="P:OpenMetaverse.AvatarSitChangedEventArgs.Simulator">
+            <summary>Get the simulator the object is located</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetSound.#ctor">
-            <summary>Initializes a new instance of an AssetSound object</summary>
+        <member name="P:OpenMetaverse.AvatarSitChangedEventArgs.Avatar">
+            <summary></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 name="P:OpenMetaverse.AvatarSitChangedEventArgs.SittingOn">
+            <summary></summary>
         </member>
-        <member name="P:OpenMetaverse.Assets.AssetSound.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <member name="P:OpenMetaverse.AvatarSitChangedEventArgs.OldSeat">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetSound.Encode">
+        <member name="T:OpenMetaverse.PayPriceReplyEventArgs">
             <summary>
-            TODO: Encodes a sound file
+            
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetSound.Decode">
-            <summary>
-            TODO: Decode a sound file
-            </summary>
-            <returns>true</returns>
+        <member name="P:OpenMetaverse.PayPriceReplyEventArgs.Simulator">
+            <summary>Get the simulator the object is located</summary>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetTexture">
-            <summary>
-            Represents a texture
-            </summary>
+        <member name="P:OpenMetaverse.PayPriceReplyEventArgs.ObjectID">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetTexture.#ctor">
-            <summary>Initializes a new instance of an AssetTexture object</summary>
+        <member name="P:OpenMetaverse.PayPriceReplyEventArgs.DefaultPrice">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetTexture.#ctor(OpenMetaverse.UUID,System.Byte[])">
+        <member name="P:OpenMetaverse.PayPriceReplyEventArgs.ButtonPrices">
+            <summary></summary>
+        </member>
+        <member name="P:OpenMetaverse.ObjectMediaEventArgs.Success">
             <summary>
-            Initializes a new instance of an AssetTexture object
+            Indicates if the operation was successful
             </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="P:OpenMetaverse.ObjectMediaEventArgs.Version">
             <summary>
-            Initializes a new instance of an AssetTexture object
+            Media version string
             </summary>
-            <param name="image">A <seealso cref="T:OpenMetaverse.Imaging.ManagedImage" /> object containing texture data</param>
-        </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">
+        <member name="P:OpenMetaverse.ObjectMediaEventArgs.FaceMedia">
             <summary>
+            Array of media entries indexed by face number
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetTexture.Components">
+        <member name="T:OpenMetaverse.PhysicsPropertiesEventArgs">
             <summary>
+            Set when simulator sends us infomation on primitive's physical properties
             </summary>
         </member>
-        <member name="P:OpenMetaverse.Assets.AssetTexture.AssetType">
-            <summary>Override the base classes AssetType</summary>
+        <member name="F:OpenMetaverse.PhysicsPropertiesEventArgs.Simulator">
+            <summary>Simulator where the message originated</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetTexture.Encode">
-            <summary>
-            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 name="F:OpenMetaverse.PhysicsPropertiesEventArgs.PhysicsProperties">
+            <summary>Updated physical properties</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetTexture.Decode">
+        <member name="M:OpenMetaverse.PhysicsPropertiesEventArgs.#ctor(OpenMetaverse.Simulator,OpenMetaverse.Primitive.PhysicsProperties)">
             <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>
+            Constructor
+            </summary>
+            <param name="sim">Simulator where the message originated</param>
+            <param name="props">Updated physical properties</param>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetTexture.DecodeLayerBoundaries">
+        <member name="T:OpenMetaverse.InventoryException">
             <summary>
-            Decodes the begin and end byte positions for each quality layer in
-            the image
+            Exception class to identify inventory exceptions
             </summary>
-            <returns>
-            </returns>
         </member>
-        <member name="T:OpenMetaverse.Assets.AssetWearable">
+        <member name="T:OpenMetaverse.Inventory">
             <summary>
-            Represents a Wearable Asset, Clothing, Hair, Skin, Etc
+            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>
         </member>
-        <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 name="F:OpenMetaverse.Inventory.m_InventoryObjectUpdated">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.Creator">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID" /> of the assets creator</summary>
+        <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.Assets.AssetWearable.Owner">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID" /> of the assets current owner</summary>
+        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectUpdatedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.LastOwner">
-            <summary>The <seealso cref="T:OpenMetaverse.UUID" /> of the assets prior owner</summary>
+        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectRemoved">
+            <summary>The event subscribers, null of no subscribers</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="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.Assets.AssetWearable.GroupOwned">
-            <summary>True if the asset is owned by a <seealso cref="T:OpenMetaverse.Group" /></summary>
+        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectRemovedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.Permissions">
-            <summary>The Permissions mask of the asset</summary>
+        <member name="F:OpenMetaverse.Inventory.m_InventoryObjectAdded">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Assets.AssetWearable.Params">
-            <summary>A Dictionary containing Key/Value pairs of the objects parameters</summary>
+        <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.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="F:OpenMetaverse.Inventory.m_InventoryObjectAddedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.Assets.AssetWearable.Decode">
+        <member name="M:OpenMetaverse.Inventory.GetContents(OpenMetaverse.UUID)">
             <summary>
-            Decode an assets byte encoded data to a string
+            Returns the contents of the specified folder
             </summary>
-            <returns>true if the asset data was decoded successfully</returns>
+            <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.Assets.AssetWearable.Encode">
+        <member name="M:OpenMetaverse.Inventory.UpdateNodeFor(OpenMetaverse.InventoryBase)">
             <summary>
-            Encode the assets string represantion into a format consumable by the asset server
+            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="item">The InventoryObject to store</param>
         </member>
-        <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">
+        <member name="M:OpenMetaverse.Inventory.RemoveNodeFor(OpenMetaverse.InventoryBase)">
             <summary>
-            A set of textures that are layered on texture of each other and "baked"
-            in to a single texture, for avatar appearances
+            Removes the InventoryObject and all related node data from Inventory.
             </summary>
+            <param name="item">The InventoryObject to remove.</param>
         </member>
-        <member name="M:OpenMetaverse.Imaging.Baker.#ctor(OpenMetaverse.BakeType)">
+        <member name="M:OpenMetaverse.Inventory.Contains(OpenMetaverse.UUID)">
             <summary>
-            Default constructor
+            Used to find out if Inventory contains the InventoryObject
+            specified by <code>uuid</code>.
             </summary>
-            <param name="bakeType">Bake type</param>
-        </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="P:OpenMetaverse.Imaging.Baker.BakedTexture">
-            <summary>Final baked texture</summary>
+            <param name="uuid">The UUID to check.</param>
+            <returns>true if inventory contains uuid, false otherwise</returns>
         </member>
-        <member name="P:OpenMetaverse.Imaging.Baker.Textures">
-            <summary>Component layers</summary>
+        <member name="M:OpenMetaverse.Inventory.SaveToDisk(System.String)">
+            <summary>
+            Saves the current inventory structure to a cache file
+            </summary>
+            <param name="filename">Name of the cache file to save to</param>
         </member>
-        <member name="P:OpenMetaverse.Imaging.Baker.BakeWidth">
-            <summary>Width of the final baked image and scratchpad</summary>
+        <member name="M:OpenMetaverse.Inventory.RestoreFromDisk(System.String)">
+            <summary>
+            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="P:OpenMetaverse.Imaging.Baker.BakeHeight">
-            <summary>Height of the final baked image and scratchpad</summary>
+        <member name="E:OpenMetaverse.Inventory.InventoryObjectUpdated">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="P:OpenMetaverse.Imaging.Baker.BakeType">
-            <summary>Bake type</summary>
+        <member name="E:OpenMetaverse.Inventory.InventoryObjectRemoved">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="P:OpenMetaverse.Imaging.Baker.IsSkin">
-            <summary>Is this one of the 3 skin bakes</summary>
+        <member name="E:OpenMetaverse.Inventory.InventoryObjectAdded">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
         </member>
-        <member name="M:OpenMetaverse.Imaging.Baker.AddTexture(OpenMetaverse.AppearanceManager.TextureData)">
+        <member name="P:OpenMetaverse.Inventory.RootFolder">
             <summary>
-            Adds layer for baking
+            The root folder of this avatars inventory
             </summary>
-            <param name="tdata">TexturaData struct that contains texture and its params</param>
         </member>
-        <member name="M:OpenMetaverse.Imaging.Baker.BakeTypeFor(OpenMetaverse.AvatarTextureIndex)">
+        <member name="P:OpenMetaverse.Inventory.LibraryFolder">
             <summary>
-            Converts avatar texture index (face) to Bake type
+            The default shared library folder
             </summary>
-            <param name="index">Face number (AvatarTextureIndex)</param>
-            <returns>BakeType, layer to which this texture belongs to</returns>
         </member>
-        <member name="M:OpenMetaverse.Imaging.Baker.SanitizeLayers(OpenMetaverse.Imaging.ManagedImage,OpenMetaverse.Imaging.ManagedImage)">
+        <member name="P:OpenMetaverse.Inventory.RootNode">
             <summary>
-            Make sure images exist, resize source if needed to match the destination
+            The root node of the avatars inventory
             </summary>
-            <param name="dest">Destination image</param>
-            <param name="src">Source image</param>
-            <returns>Sanitization was succefull</returns>
         </member>
-        <member name="M:OpenMetaverse.Imaging.Baker.InitBakedLayerColor(OpenMetaverse.Color4)">
+        <member name="P:OpenMetaverse.Inventory.LibraryRootNode">
             <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
+            The root node of the default shared library
             </summary>
-            <param name="color">Color of the base of this layer</param>
         </member>
-        <member name="M:OpenMetaverse.Imaging.Baker.InitBakedLayerColor(System.Single,System.Single,System.Single)">
+        <member name="P:OpenMetaverse.Inventory.Item(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
+            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="r">Red value</param>
-            <param name="g">Green value</param>
-            <param name="b">Blue value</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.Imaging.ManagedImage.#ctor(System.Int32,System.Int32,OpenMetaverse.Imaging.ManagedImage.ImageChannels)">
+        <member name="T:OpenMetaverse.InternalDictionary`2">
             <summary>
-            Create a new blank image
+            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 
+            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>
-            <param name="width">width</param>
-            <param name="height">height</param>
-            <param name="channels">channel flags</param>
+            <typeparam name="TKey">Key <see langword="Tkey"/></typeparam>
+            <typeparam name="TValue">Value <see langword="TValue"/></typeparam>
         </member>
-        <member name="M:OpenMetaverse.Imaging.ManagedImage.#ctor(System.Drawing.Bitmap)">
+        <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="M:OpenMetaverse.InternalDictionary`2.#ctor">
             <summary>
+            Initializes a new instance of the <seealso cref="T:InternalDictionary"/> Class 
+            with the specified key/value, has the default initial capacity.
             </summary>
-            <param name="bitmap">
-            </param>
+            <example>
+            <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>
+            </example>
         </member>
-        <member name="F:OpenMetaverse.Imaging.ManagedImage.Width">
+        <member name="M:OpenMetaverse.InternalDictionary`2.#ctor(System.Collections.Generic.IDictionary{`0,`1})">
             <summary>
-            Image width
+            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>
+            // 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>
+            </example>
         </member>
-        <member name="F:OpenMetaverse.Imaging.ManagedImage.Height">
+        <member name="M:OpenMetaverse.InternalDictionary`2.#ctor(System.Int32)">
             <summary>
-            Image height
+            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, 
+            // 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.Imaging.ManagedImage.Channels">
+        <member name="M:OpenMetaverse.InternalDictionary`2.TryGetValue(`0,`1@)">
             <summary>
-            Image channel flags
+            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>
+            <example>
+            <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);
+            </code>
+            <seealso cref="F:OpenMetaverse.Simulator.ObjectsAvatars"/>
+            </example>
         </member>
-        <member name="F:OpenMetaverse.Imaging.ManagedImage.Red">
+        <member name="M:OpenMetaverse.InternalDictionary`2.Find(System.Predicate{`1})">
             <summary>
-            Red channel data
+            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 InternalDictionary
+            // 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.Imaging.ManagedImage.Green">
+        <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>
+        </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>
+        </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);
+                     }
+                 });
+            </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>
+        </member>
+        <member name="M:OpenMetaverse.InternalDictionary`2.ForEach(System.Action{System.Collections.Generic.KeyValuePair{`0,`1}})">
             <summary>
-            Green channel data
+            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="F:OpenMetaverse.Imaging.ManagedImage.Blue">
+        <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>
+        </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>
+        </member>
+        <member name="M:OpenMetaverse.InternalDictionary`2.Add(`0,`1)">
             <summary>
-            Blue channel data
+            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="F:OpenMetaverse.Imaging.ManagedImage.Alpha">
+        <member name="M:OpenMetaverse.InternalDictionary`2.Remove(`0)">
             <summary>
-            Alpha channel data
+            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="F:OpenMetaverse.Imaging.ManagedImage.Bump">
+        <member name="P:OpenMetaverse.InternalDictionary`2.Count">
             <summary>
-            Bump channel data
+            Gets the number of Key/Value pairs contained in the <seealso cref="T:InternalDictionary"/>
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Imaging.ManagedImage.ConvertChannels(OpenMetaverse.Imaging.ManagedImage.ImageChannels)">
+        <member name="P:OpenMetaverse.InternalDictionary`2.Item(`0)">
             <summary>
-            Convert the channels in the image. Channels are created or destroyed as required.
+            Indexer for the dictionary
             </summary>
-            <param name="channels">new channel flags</param>
+            <param name="key">The key</param>
+            <returns>The value</returns>
         </member>
-        <member name="M:OpenMetaverse.Imaging.ManagedImage.ResizeNearestNeighbor(System.Int32,System.Int32)">
+        <member name="T:OpenMetaverse.Assets.ArchiveConstants">
             <summary>
-            Resize or stretch the image using nearest neighbor (ugly) resampling
+            Constants for the archiving module
             </summary>
-            <param name="width">new width</param>
-            <param name="height">new height</param>
         </member>
-        <member name="M:OpenMetaverse.Imaging.ManagedImage.ExportRaw">
+        <member name="F:OpenMetaverse.Assets.ArchiveConstants.CONTROL_FILE_PATH">
             <summary>
-            Create a byte array containing 32-bit RGBA data with a bottom-left
-            origin, suitable for feeding directly into OpenGL
+            The location of the archive control file
             </summary>
-            <returns>A byte array containing raw texture data</returns>
         </member>
-        <member name="T:OpenMetaverse.Imaging.OpenJPEG">
+        <member name="F:OpenMetaverse.Assets.ArchiveConstants.ASSETS_PATH">
             <summary>
-            A Wrapper around openjpeg to encode and decode images to and from byte arrays
+            Path for the assets held in an archive
             </summary>
         </member>
-        <member name="T:OpenMetaverse.Imaging.OpenJPEG.J2KLayerInfo">
+        <member name="F:OpenMetaverse.Assets.ArchiveConstants.OBJECTS_PATH">
             <summary>
-            Defines the beginning and ending file positions of a layer in an
-            LRCP-progression JPEG2000 file
+            Path for the prims file
             </summary>
         </member>
-        <member name="T:OpenMetaverse.Imaging.OpenJPEG.MarshalledImage">
+        <member name="F:OpenMetaverse.Assets.ArchiveConstants.TERRAINS_PATH">
             <summary>
-            This structure is used to marshal both encoded and decoded images.
-            MUST MATCH THE STRUCT IN dotnet.h!
+            Path for terrains.  Technically these may be assets, but I think it's quite nice to split them out.
             </summary>
         </member>
-        <member name="T:OpenMetaverse.Imaging.OpenJPEG.MarshalledPacket">
+        <member name="F:OpenMetaverse.Assets.ArchiveConstants.SETTINGS_PATH">
             <summary>
-            Information about a single packet in a JPEG2000 stream
+            Path for region settings.
             </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="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)">
+        <member name="F:OpenMetaverse.Assets.ArchiveConstants.ASSET_EXTENSION_SEPARATOR">
             <summary>
-            Encode a <seealso cref="T:OpenMetaverse.Imaging.ManagedImage" /> object into a byte array
+            The character the separates the uuid from extension information in an archived asset filename
             </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>
-        <member name="M:OpenMetaverse.Imaging.OpenJPEG.Encode(OpenMetaverse.Imaging.ManagedImage)">
+        <member name="F:OpenMetaverse.Assets.ArchiveConstants.ASSET_TYPE_TO_EXTENSION">
             <summary>
-            Encode a <seealso cref="T:OpenMetaverse.Imaging.ManagedImage" /> object into a byte array
+            Extensions used for asset types in the archive
             </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>
-        <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="F:OpenMetaverse.TerrainPatch.X">
+            <summary>X position of this patch</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="F:OpenMetaverse.TerrainPatch.Y">
+            <summary>Y position of this patch</summary>
         </member>
-        <member name="M:OpenMetaverse.Imaging.OpenJPEG.DecodeLayerBoundaries(System.Byte[],OpenMetaverse.Imaging.OpenJPEG.J2KLayerInfo[]@,System.Int32@)">
-            <summary>
-            </summary>
-            <param name="encoded">
-            </param>
-            <param name="layerInfo">
-            </param>
-            <param name="components">
-            </param>
-            <returns>
-            </returns>
+        <member name="F:OpenMetaverse.TerrainPatch.Data">
+            <summary>A 16x16 array of floats holding decompressed layer data</summary>
         </member>
-        <member name="M:OpenMetaverse.Imaging.OpenJPEG.EncodeFromImage(System.Drawing.Bitmap,System.Boolean)">
+        <member name="M:OpenMetaverse.TerrainCompressor.CreateLandPacket(System.Single[],System.Int32[])">
             <summary>
-            Encode a <seealso cref="T:System.Drawing.Bitmap" /> object into a byte array
+            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="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>
+            <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="T:OpenMetaverse.Imaging.LoadTGAClass">
+        <member name="M:OpenMetaverse.TerrainCompressor.CreatePatchFromHeightmap(OpenMetaverse.BitPack,System.Single[],System.Int32,System.Int32)">
             <summary>
-            Capability to load TGAs to Bitmap
+            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.Interfaces.IMessage">
+        <member name="T:OpenMetaverse.Sounds">
             <summary>
-            Interface requirements for Messaging system
+            pre-defined built in sounds
             </summary>
         </member>
-        <member name="T:OpenMetaverse.Rendering.IRendering">
+        <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>
-            Abstract base for rendering plugins
+            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="M:OpenMetaverse.Rendering.IRendering.GenerateSimpleMesh(OpenMetaverse.Primitive,OpenMetaverse.Rendering.DetailLevel)">
+        <member name="T:OpenMetaverse.PermissionMask">
             <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="M:OpenMetaverse.Rendering.IRendering.GenerateSimpleSculptMesh(OpenMetaverse.Primitive,System.Drawing.Bitmap,OpenMetaverse.Rendering.DetailLevel)">
+        <member name="T:OpenMetaverse.PermissionWho">
             <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.Rendering.IRendering.GenerateFacetedMesh(OpenMetaverse.Primitive,OpenMetaverse.Rendering.DetailLevel)">
+        <member name="F:OpenMetaverse.PermissionWho.Base">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.PermissionWho.Owner">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.PermissionWho.Group">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.PermissionWho.Everyone">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.PermissionWho.NextOwner">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.PermissionWho.All">
+            <summary></summary>
+        </member>
+        <member name="T:OpenMetaverse.Permissions">
             <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="M:OpenMetaverse.Rendering.IRendering.GenerateFacetedSculptMesh(OpenMetaverse.Primitive,System.Drawing.Bitmap,OpenMetaverse.Rendering.DetailLevel)">
+        <member name="M:OpenMetaverse.WrappedObject`1.Dispose">
             <summary>
-            Generates a series of faces for a sculpted prim, each face
-            containing a mesh and metadata
+            Checks the instance back into the object pool
             </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,OpenMetaverse.Vector3)">
+        <member name="P:OpenMetaverse.WrappedObject`1.Instance">
             <summary>
-            Apply texture coordinate modifications from a
-            <seealso cref="!:TextureEntryFace" /> to a list of vertices
+            Returns an instance of the class that has been checked out of the Object Pool.
             </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="T:OpenMetaverse.Messages.Linden.TeleportFinishMessage">
             <summary>
@@ -22659,11 +21713,10 @@
             </summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.AgentID">
-            <summary>The <see cref="T:OpenMetaverse.UUID" /> of the agent</summary>
+            <summary>The <see cref="T:OpenMetaverse.UUID"/> of the agent</summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.LocationID">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.RegionHandle">
             <summary>The simulators handle the agent teleported to</summary>
@@ -22673,7 +21726,7 @@
         </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
+            to access the simulator, or the content rating, or the simulators 
             map status</summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.TeleportFinishMessage.IP">
@@ -22689,13 +21742,13 @@
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="T:OpenMetaverse.Messages.Linden.EstablishAgentCommunicationMessage">
             <summary>
@@ -22706,37 +21759,37 @@
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="M:OpenMetaverse.Messages.Linden.CrossedRegionMessage.Serialize">
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="M:OpenMetaverse.Messages.Linden.EnableSimulatorMessage.Serialize">
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="T:OpenMetaverse.Messages.Linden.TeleportFailedMessage">
             <summary>
@@ -22745,15 +21798,14 @@
             </summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.TeleportFailedMessage.ExtraParams">
-            <summary>
-            </summary>
+            <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>
+            <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>
@@ -22763,25 +21815,25 @@
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="M:OpenMetaverse.Messages.Linden.LandStatReplyMessage.Serialize">
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="T:OpenMetaverse.Messages.Linden.ParcelObjectOwnersReplyMessage">
             <summary>
@@ -22794,43 +21846,43 @@
             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">
+            <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)">
+            <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">
             <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,
+            <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>
+            <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
+            <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>
-            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)">
-            <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.ParcelPropertiesMessage">
             <summary>
             The details of a single parcel in a region, also contains some regionwide globals
@@ -22851,19 +21903,17 @@
             <summary>Total parcel land area</summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.AuctionID">
-            <summary>
-            </summary>
+            <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
+            <summary>Bitmap describing land layout in 4x4m squares across the 
             entire region</summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.Category">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ClaimDate">
             <summary>Date land was claimed</summary>
@@ -22875,29 +21925,26 @@
             <summary>Parcel Description</summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.ParcelFlags">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.GroupID">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.GroupPrims">
-            <summary>Total number of primitives owned by the parcel group on
+            <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>
+            <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
+            <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">
@@ -22916,8 +21963,7 @@
             <summary>Autoreturn value in minutes for others' objects</summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.OtherCount">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.OtherPrims">
             <summary>Total number of other primitives on this parcel</summary>
@@ -22926,12 +21972,11 @@
             <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
+            <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>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.PassHours">
             <summary>How long is pass valid for</summary>
@@ -22940,36 +21985,32 @@
             <summary>Price for a temporary pass</summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.PublicCount">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <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>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RegionDenyIdentified">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.RegionDenyTransacted">
-            <summary>
-            </summary>
+            <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>
+            <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>
+            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
@@ -22983,14 +22024,13 @@
             </summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SelfCount">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SequenceID">
             <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.
+            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">
@@ -23000,8 +22040,7 @@
             <summary>Total primitives across the entire simulator</summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SnapSelection">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.SnapshotID">
             <summary>Key of parcel snapshot</summary>
@@ -23013,12 +22052,10 @@
             <summary>Total number of primitives on this parcel</summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.UserLocation">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.UserLookAt">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesMessage.MediaDesc">
             <summary>A description of the media</summary>
@@ -23045,20 +22082,20 @@
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <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>
+            <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>
@@ -23071,11 +22108,11 @@
             <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
+            <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
+            <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">
@@ -23086,88 +22123,70 @@
             to visitors</summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaHeight">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaLoop">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaID">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaType">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaURL">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MediaWidth">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.MusicURL">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Name">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.ObscureMedia">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.ObscureMusic">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.ParcelFlags">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.PassHours">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.PassPrice">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Privacy">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.SalePrice">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.SnapshotID">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.UserLocation">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.UserLookAt">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="M:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="M:OpenMetaverse.Messages.Linden.ParcelPropertiesUpdateMessage.Serialize">
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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>
@@ -23185,23 +22204,23 @@
             <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>
+            <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>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="T:OpenMetaverse.Messages.Linden.RemoteParcelRequestReply">
             <summary>
-            A message sent from the simulator to the viewer in response to a <see cref="T:OpenMetaverse.Messages.Linden.RemoteParcelRequestRequest" />
+            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>
@@ -23212,13 +22231,13 @@
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="T:OpenMetaverse.Messages.Linden.RemoteParcelRequestMessage">
             <summary>
@@ -23233,37 +22252,37 @@
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="M:OpenMetaverse.Messages.Linden.NewFileAgentInventoryMessage.Serialize">
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <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>
+            <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)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="T:OpenMetaverse.Messages.Linden.AgentGroupDataUpdateMessage">
             <summary>
@@ -23271,6 +22290,29 @@
             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">
+            <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)">
+            <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>
@@ -23281,10 +22323,10 @@
             <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>
+            <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>
+            <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>
@@ -23300,38 +22342,15 @@
             <summary>true of the agent allows this group to be
             listed in their profile</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">
-            <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)">
-            <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.UpdateAgentLanguageMessage">
             <summary>
-            A message sent from the viewer to the simulator which
+            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
+            <summary>A string containng the default language 
             to use for the agent</summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.UpdateAgentLanguageMessage.LanguagePublic">
@@ -23342,13 +22361,13 @@
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="T:OpenMetaverse.Messages.Linden.AgentDropGroupMessage">
             <summary>
@@ -23356,15 +22375,6 @@
             leaves a group
             </summary>
         </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="F:OpenMetaverse.Messages.Linden.AgentDropGroupMessage.AgentDataBlock">
             <summary>
             An Array containing the AgentID and GroupID
@@ -23374,13 +22384,22 @@
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <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>
@@ -23394,13 +22413,13 @@
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="T:OpenMetaverse.Messages.Linden.UploaderRequestUpload">
             <summary>
@@ -23413,7 +22432,7 @@
         </member>
         <member name="T:OpenMetaverse.Messages.Linden.UploaderRequestComplete">
             <summary>
-            A message sent from the simulator that will inform the agent the upload is complete,
+            A message sent from the simulator that will inform the agent the upload is complete, 
             and the UUID of the uploaded asset
             </summary>
         </member>
@@ -23433,17 +22452,17 @@
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="T:OpenMetaverse.Messages.Linden.RequiredVoiceVersionMessage">
             <summary>
-            A message sent from the simulator which indicates the minimum version required for
+            A message sent from the simulator which indicates the minimum version required for 
             using voice chat
             </summary>
         </member>
@@ -23460,17 +22479,17 @@
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="T:OpenMetaverse.Messages.Linden.ParcelVoiceInfoRequestMessage">
             <summary>
-            A message sent from the simulator to the viewer containing the
+            A message sent from the simulator to the viewer containing the 
             voice server URI
             </summary>
         </member>
@@ -23488,37 +22507,36 @@
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="T:OpenMetaverse.Messages.Linden.ProvisionVoiceAccountRequestMessage">
             <summary>
+            
             </summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ProvisionVoiceAccountRequestMessage.Password">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ProvisionVoiceAccountRequestMessage.Username">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="M:OpenMetaverse.Messages.Linden.ProvisionVoiceAccountRequestMessage.Serialize">
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="T:OpenMetaverse.Messages.Linden.UploadScriptTaskMessage">
             <summary>
@@ -23533,13 +22551,13 @@
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="T:OpenMetaverse.Messages.Linden.ScriptRunningReplyMessage">
             <summary>
@@ -23551,11 +22569,11 @@
             <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
+            <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>
+            <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>
@@ -23564,13 +22582,13 @@
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="T:OpenMetaverse.Messages.Linden.UpdateGestureAgentInventoryMessage">
             <summary>
@@ -23585,13 +22603,13 @@
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="T:OpenMetaverse.Messages.Linden.UpdateNotecardTaskInventoryMessage">
             <summary>
@@ -23600,22 +22618,22 @@
             </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>
+            <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>
+            <summary>The notecard assets <seealso cref="T:OpenMetaverse.UUID"/> contained in the tasks inventory</summary>
         </member>
         <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>
+            <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)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="T:OpenMetaverse.Messages.Linden.UpdateAgentInventoryRequestMessage">
             <summary>
@@ -23632,13 +22650,13 @@
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="T:OpenMetaverse.Messages.Linden.UpdateNotecardAgentInventoryMessage">
             <summary>
@@ -23653,30 +22671,30 @@
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="M:OpenMetaverse.Messages.Linden.CopyInventoryFromNotecardMessage.Serialize">
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </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>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </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
+            an error occurred while attempting to update a script in an agents or tasks 
             inventory
             </summary>
         </member>
@@ -23704,24 +22722,24 @@
             <summary>The scripts InventoryItem ItemID to update</summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage.Target">
-            <summary>A lowercase string containing either "mono" or "lsl2" which
+            <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="F:OpenMetaverse.Messages.Linden.UpdateScriptTaskUpdateMessage.TaskID">
-            <summary>The tasks <see cref="T:OpenMetaverse.UUID" /> which contains the script to update</summary>
+            <summary>The tasks <see cref="T:OpenMetaverse.UUID"/> which contains the script to update</summary>
         </member>
         <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>
+            <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)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="T:OpenMetaverse.Messages.Linden.UpdateScriptTaskMessage">
             <summary>
@@ -23736,13 +22754,13 @@
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="T:OpenMetaverse.Messages.Linden.UploaderRequestScriptComplete">
             <summary>
@@ -23773,13 +22791,13 @@
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
         <member name="M:OpenMetaverse.Messages.Linden.UpdateScriptAgentRequestMessage.Deserialize(OpenMetaverse.StructuredData.OSDMap)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="T:OpenMetaverse.Messages.Linden.UpdateScriptAgentMessage">
             <summary>
@@ -23794,44 +22812,43 @@
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </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>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </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>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="T:OpenMetaverse.Messages.Linden.MapLayerMessageBase">
             <summary>Base class for Map Layers via Capabilities</summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.MapLayerMessageBase.Flags">
-            <summary>
-            </summary>
+            <summary></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>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </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>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="T:OpenMetaverse.Messages.Linden.MapLayerRequestVariant">
             <summary>
@@ -23843,6 +22860,21 @@
             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>
+        <member name="M:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.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.MapLayerReplyVariant.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.MapLayerReplyVariant.LayerData">
             <summary>
             An object containing map location details
@@ -23863,21 +22895,6 @@
         <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.Messages.Linden.MapLayerReplyVariant.LayerDataBlocks">
-            <summary>An array containing LayerData items</summary>
-        </member>
-        <member name="M:OpenMetaverse.Messages.Linden.MapLayerReplyVariant.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.MapLayerReplyVariant.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.Messages.Linden.MapLayerMessage.Request">
             <summary>Object containing request or response</summary>
         </member>
@@ -23885,13 +22902,13 @@
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="T:OpenMetaverse.Messages.Linden.ProductInfoRequestMessage">
             <summary>
@@ -23902,25 +22919,25 @@
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <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>
+            <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)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <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>
@@ -23929,10 +22946,10 @@
             <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>
+            </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>
+            <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>
@@ -23941,26 +22958,25 @@
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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)">
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <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>
+            </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>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.RequestKey">
             <summary>A list containing Key/Value pairs, known valid values:
@@ -23970,24 +22986,23 @@
             <remarks>"text" or "voice"</remarks>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ChatSessionRequestMuteUpdate.RequestValue">
-            <summary>
-            </summary>
+            <summary></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>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </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>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="T:OpenMetaverse.Messages.Linden.ChatSessionAcceptInvitation">
             <summary>
-            A message sent from the agent to the simulator which tells the
+            A message sent from the agent to the simulator which tells the 
             simulator we've accepted a conference invitation
             </summary>
         </member>
@@ -23998,49 +23013,49 @@
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </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>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </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>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </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>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </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>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </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>
+            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the objects data</returns>
         </member>
         <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>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="F:OpenMetaverse.Messages.Linden.ChatterBoxInvitationMessage.FromAgentID">
             <summary>Key of sender</summary>
@@ -24088,20 +23103,22 @@
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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>
+            <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
+            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.
@@ -24111,13 +23128,13 @@
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="T:OpenMetaverse.Messages.Linden.ForceCloseChatterBoxSessionMessage">
             <summary>
@@ -24138,101 +23155,102 @@
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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>
+            <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>
+            <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>
+            <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>
+            <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>
+            <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>
+            <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>
+            <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>
+            <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>
+            <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>
+            <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>
+            <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>
+            <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>
+            <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>
+            <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>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="T:OpenMetaverse.Messages.Linden.ObjectPhysicsPropertiesMessage">
             <summary>
@@ -24257,7 +23275,7 @@
         </member>
         <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaNavigateMessage">
             <summary>
-            A message sent from the viewer to the simulator which
+            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>
@@ -24281,13 +23299,13 @@
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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>
+            <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>
@@ -24317,7 +23335,7 @@
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaResponse">
             <summary>
@@ -24349,7 +23367,7 @@
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaUpdate">
             <summary>
@@ -24381,7 +23399,7 @@
             <summary>
             Deserialize the message
             </summary>
-            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="T:OpenMetaverse.Messages.Linden.ObjectMediaMessage">
             <summary>
@@ -24395,13 +23413,13 @@
             <summary>
             Serialize the object
             </summary>
-            <returns>An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the objects data</returns>
+            <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>
+            <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>
@@ -24428,14 +23446,13 @@
             <summary>
             Deserializes object from OSD
             </summary>
-            <param name="obj">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <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>
+            <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">
@@ -24457,20 +23474,19 @@
             <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>
+            <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>
+            <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>
+            <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">
@@ -24489,14 +23505,13 @@
             <summary>
             Serializes object
             </summary>
-            <returns>
-                <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> serialized data</returns>
+            <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>
+            <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>
@@ -24508,21 +23523,20 @@
             <summary>
             Deserializes object from OSD
             </summary>
-            <param name="osd">An <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> containing the data</param>
+            <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>
+            <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>
+            <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">
@@ -24535,14 +23549,13 @@
             <summary>
             Serializes object
             </summary>
-            <returns>
-                <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> serialized data</returns>
+            <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>
+            <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>
@@ -24557,33 +23570,32 @@
             <summary>
             Serializes object
             </summary>
-            <returns>
-                <see cref="T:OpenMetaverse.StructuredData.OSDMap" /> serialized data</returns>
+            <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>
+            <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>
+            <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>
+            <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>
+            <param name="map">An <see cref="T:OpenMetaverse.StructuredData.OSDMap"/> containing the data</param>
         </member>
         <member name="T:OpenMetaverse.Messages.Linden.GetDisplayNamesMessage">
             <summary>
@@ -24656,1767 +23668,2470 @@
             </summary>
             <returns>OSD containting the messaage</returns>
         </member>
-        <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 name="F:OpenMetaverse.InventorySortOrder.ByName">
+            <summary>Sort by name</summary>
         </member>
-        <member name="T:OpenMetaverse.MediaPermission">
-            <summary>
-            Permissions for control of object media
-            </summary>
+        <member name="F:OpenMetaverse.InventorySortOrder.ByDate">
+            <summary>Sort by date</summary>
         </member>
-        <member name="T:OpenMetaverse.MediaControls">
-            <summary>
-            Style of cotrols that shold be displayed to the user
-            </summary>
+        <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="T:OpenMetaverse.MediaEntry">
+        <member name="F:OpenMetaverse.InventorySortOrder.SystemFoldersToTop">
+            <summary>Place system folders at the top</summary>
+        </member>
+        <member name="T:OpenMetaverse.DeRezDestination">
             <summary>
-            Class representing media data for a single face
+            Possible destinations for DeRezObject request
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.EnableAlterntiveImage">
-            <summary>Is display of the alternative image enabled</summary>
+        <member name="F:OpenMetaverse.DeRezDestination.AgentInventorySave">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.AutoLoop">
-            <summary>Should media auto loop</summary>
+        <member name="F:OpenMetaverse.DeRezDestination.AgentInventoryCopy">
+            <summary>Copy from in-world to agent inventory</summary>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.AutoPlay">
-            <summary>Shoule media be auto played</summary>
+        <member name="F:OpenMetaverse.DeRezDestination.TaskInventory">
+            <summary>Derez to TaskInventory</summary>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.AutoScale">
-            <summary>Auto scale media to prim face</summary>
+        <member name="F:OpenMetaverse.DeRezDestination.Attachment">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.AutoZoom">
-            <summary>Should viewer automatically zoom in on the face when clicked</summary>
+        <member name="F:OpenMetaverse.DeRezDestination.AgentInventoryTake">
+            <summary>Take Object</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 name="F:OpenMetaverse.DeRezDestination.ForceToGodInventory">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.Controls">
-            <summary>Style of controls viewer should display when
-            viewer media on this face</summary>
+        <member name="F:OpenMetaverse.DeRezDestination.TrashFolder">
+            <summary>Delete Object</summary>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.HomeURL">
-            <summary>Starting URL for the media</summary>
+        <member name="F:OpenMetaverse.DeRezDestination.AttachmentToInventory">
+            <summary>Put an avatar attachment into agent inventory</summary>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.CurrentURL">
-            <summary>Currently navigated URL</summary>
+        <member name="F:OpenMetaverse.DeRezDestination.AttachmentExists">
+            <summary></summary>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.Height">
-            <summary>Media height in pixes</summary>
+        <member name="F:OpenMetaverse.DeRezDestination.ReturnToOwner">
+            <summary>Return an object back to the owner's inventory</summary>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.Width">
-            <summary>Media width in pixels</summary>
+        <member name="F:OpenMetaverse.DeRezDestination.ReturnToLastOwner">
+            <summary>Return a deeded object back to the last owner's inventory</summary>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.ControlPermissions">
-            <summary>Who can controls the media</summary>
+        <member name="T:OpenMetaverse.InventoryItemFlags">
+            <summary>
+            Upper half of the Flags field for inventory items
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.InteractPermissions">
-            <summary>Who can interact with the media</summary>
+        <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.MediaEntry.EnableWhiteList">
-            <summary>Is URL whitelist enabled</summary>
+        <member name="F:OpenMetaverse.InventoryItemFlags.ObjectSlamSale">
+            <summary>Indicates that the object sale information has been
+            changed</summary>
         </member>
-        <member name="F:OpenMetaverse.MediaEntry.WhiteList">
-            <summary>Array of URLs that are whitelisted</summary>
+        <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="M:OpenMetaverse.MediaEntry.GetOSD">
-            <summary>
-            Serialize to OSD
-            </summary>
-            <returns>OSDMap with the serialized data</returns>
+        <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="M:OpenMetaverse.MediaEntry.FromOSD(OpenMetaverse.StructuredData.OSD)">
+        <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>
-            Deserialize from OSD data
+            Base Class for Inventory Items
             </summary>
-            <param name="osd">Serialized OSD data</param>
-            <returns>Deserialized object</returns>
         </member>
-        <member name="T:OpenMetaverse.Primitive">
+        <member name="F:OpenMetaverse.InventoryBase.UUID">
+            <summary><seealso cref="T:OpenMetaverse.UUID"/> of item/folder</summary>
+        </member>
+        <member name="F:OpenMetaverse.InventoryBase.ParentUUID">
+            <summary><seealso cref="T:OpenMetaverse.UUID"/> of parent folder</summary>
+        </member>
+        <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.#ctor(OpenMetaverse.UUID)">
             <summary>
-            Particle system specific enumerators, flags and methods.
+            Constructor, takes an itemID as a parameter
             </summary>
+            <param name="itemID">The <seealso cref="T:OpenMetaverse.UUID"/> of the item</param>
         </member>
-        <member name="M:OpenMetaverse.Primitive.#ctor">
+        <member name="M:OpenMetaverse.InventoryBase.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            Default constructor
+            
             </summary>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Primitive.ParticleSystem">
+        <member name="M:OpenMetaverse.InventoryBase.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            Complete structure for the particle system
+            
             </summary>
+            <returns></returns>
         </member>
-        <member name="M:OpenMetaverse.Primitive.ParticleSystem.#ctor(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.InventoryBase.GetHashCode">
             <summary>
-            Decodes a byte[] array into a ParticleSystem Object
+            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="data">ParticleSystem object</param>
-            <param name="pos">Start position for BitPacker</param>
+            <returns>A Hashcode of all the combined InventoryBase fields</returns>
         </member>
-        <member name="T:OpenMetaverse.Primitive.ParticleSystem.SourcePattern">
+        <member name="M:OpenMetaverse.InventoryBase.Equals(System.Object)">
             <summary>
-            Particle source pattern
+            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="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">
+        <member name="M:OpenMetaverse.InventoryBase.Equals(OpenMetaverse.InventoryBase)">
             <summary>
-            Particle Data Flags
+            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="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">
+        <member name="M:OpenMetaverse.InventoryBase.GetOSD">
             <summary>
-            Particle Flags Enum
+            Convert inventory to OSD
             </summary>
+            <returns>OSD representation</returns>
         </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="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">
+        <member name="T:OpenMetaverse.InventoryItem">
             <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>
+            An Item in Inventory
+            </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 name="F:OpenMetaverse.InventoryItem.AssetUUID">
+            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of this item</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 name="F:OpenMetaverse.InventoryItem.Permissions">
+            <summary>The combined <seealso cref="T:OpenMetaverse.Permissions"/> of this item</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 name="F:OpenMetaverse.InventoryItem.AssetType">
+            <summary>The type of item from <seealso cref="T:OpenMetaverse.AssetType"/></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 name="F:OpenMetaverse.InventoryItem.InventoryType">
+            <summary>The type of item from the <seealso cref="T:OpenMetaverse.InventoryType"/> enum</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ParticleSystem.PartDataFlags">
-            <summary>Flags of particle from <seealso cref="T:ParticleDataFlags" /></summary>
+        <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.Primitive.ParticleSystem.PartMaxAge">
-            <summary>Max Age particle system will emit particles for</summary>
+        <member name="F:OpenMetaverse.InventoryItem.Description">
+            <summary>A Description of this item</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 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.Primitive.ParticleSystem.PartEndColor">
-            <summary>The <see cref="T:Color4" /> the particle has at the ending of its lifecycle</summary>
+        <member name="F:OpenMetaverse.InventoryItem.GroupOwned">
+            <summary>If true, item is owned by a group</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 name="F:OpenMetaverse.InventoryItem.SalePrice">
+            <summary>The price this item can be purchased for</summary>
         </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 name="F:OpenMetaverse.InventoryItem.SaleType">
+            <summary>The type of sale from the <seealso cref="T:OpenMetaverse.SaleType"/> enum</summary>
         </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 name="F:OpenMetaverse.InventoryItem.Flags">
+            <summary>Combined flags from <seealso cref="T:OpenMetaverse.InventoryItemFlags"/></summary>
         </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 name="F:OpenMetaverse.InventoryItem.CreationDate">
+            <summary>Time and date this inventory item was created, stored as
+            UTC (Coordinated Universal Time)</summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.ParticleSystem.GetBytes">
-            <summary>
-            Generate byte[] array from particle data
-            </summary>
-            <returns>Byte array</returns>
+        <member name="F:OpenMetaverse.InventoryItem.TransactionID">
+            <summary>Used to update the AssetID in requests sent to the server</summary>
         </member>
-        <member name="T:OpenMetaverse.Primitive.ConstructionData">
-            <summary>
-            Parameters used to construct a visual representation of a primitive
-            </summary>
+        <member name="F:OpenMetaverse.InventoryItem.LastOwnerID">
+            <summary>The <seealso cref="T:OpenMetaverse.UUID"/> of the previous owner of the item</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.profileCurve">
+        <member name="M:OpenMetaverse.InventoryItem.#ctor(OpenMetaverse.UUID)">
             <summary>
+             Construct a new InventoryItem object
             </summary>
+            <param name="itemID">The <seealso cref="T:OpenMetaverse.UUID"/> of the item</param>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathCurve">
+        <member name="M:OpenMetaverse.InventoryItem.#ctor(OpenMetaverse.InventoryType,OpenMetaverse.UUID)">
             <summary>
+            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="F:OpenMetaverse.Primitive.ConstructionData.PathEnd">
+        <member name="M:OpenMetaverse.InventoryItem.IsLink">
             <summary>
+            Indicates inventory item is a link
             </summary>
+            <returns>True if inventory item is a link to another inventory item</returns>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathRadiusOffset">
+        <member name="M:OpenMetaverse.InventoryItem.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
+            
             </summary>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathSkew">
+        <member name="M:OpenMetaverse.InventoryItem.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
+            
             </summary>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathScaleX">
+        <member name="M:OpenMetaverse.InventoryItem.GetHashCode">
             <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
             </summary>
+            <returns>A Hashcode of all the combined InventoryItem fields</returns>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathScaleY">
+        <member name="M:OpenMetaverse.InventoryItem.Equals(System.Object)">
             <summary>
+            Compares an object
             </summary>
+            <param name="o">The object to compare</param>
+            <returns>true if comparison object matches</returns>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathShearX">
+        <member name="M:OpenMetaverse.InventoryItem.Equals(OpenMetaverse.InventoryBase)">
             <summary>
+            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="F:OpenMetaverse.Primitive.ConstructionData.PathShearY">
+        <member name="M:OpenMetaverse.InventoryItem.Equals(OpenMetaverse.InventoryItem)">
             <summary>
+            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="F:OpenMetaverse.Primitive.ConstructionData.PathTaperX">
+        <member name="M:OpenMetaverse.InventoryItem.FromOSD(OpenMetaverse.StructuredData.OSD)">
             <summary>
+            Create InventoryItem from OSD
             </summary>
+            <param name="data">OSD Data that makes up InventoryItem</param>
+            <returns>Inventory item created</returns>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathTaperY">
+        <member name="M:OpenMetaverse.InventoryItem.GetOSD">
             <summary>
+            Convert InventoryItem to OSD
             </summary>
+            <returns>OSD representation of InventoryItem</returns>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathBegin">
+        <member name="T:OpenMetaverse.InventoryTexture">
             <summary>
+            InventoryTexture Class representing a graphical image
             </summary>
+            <seealso cref="!:ManagedImage"/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathTwist">
+        <member name="M:OpenMetaverse.InventoryTexture.#ctor(OpenMetaverse.UUID)">
             <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>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathTwistBegin">
+        <member name="M:OpenMetaverse.InventoryTexture.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
+            Construct an InventoryTexture object from a serialization stream
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PathRevolutions">
+        <member name="T:OpenMetaverse.InventorySound">
             <summary>
+            InventorySound Class representing a playable sound
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.ProfileBegin">
+        <member name="M:OpenMetaverse.InventorySound.#ctor(OpenMetaverse.UUID)">
             <summary>
+            Construct an InventorySound 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.Primitive.ConstructionData.ProfileEnd">
+        <member name="M:OpenMetaverse.InventorySound.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
+            Construct an InventorySound object from a serialization stream
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.ProfileHollow">
+        <member name="T:OpenMetaverse.InventoryCallingCard">
             <summary>
+            InventoryCallingCard Class, contains information on another avatar
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.Material">
+        <member name="M:OpenMetaverse.InventoryCallingCard.#ctor(OpenMetaverse.UUID)">
             <summary>
+            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="F:OpenMetaverse.Primitive.ConstructionData.State">
+        <member name="M:OpenMetaverse.InventoryCallingCard.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
+            Construct an InventoryCallingCard object from a serialization stream
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ConstructionData.PCode">
+        <member name="T:OpenMetaverse.InventoryLandmark">
             <summary>
+            InventoryLandmark Class, contains details on a specific location
             </summary>
         </member>
-        <member name="P:OpenMetaverse.Primitive.ConstructionData.AttachmentPoint">
-            <summary>Attachment point to an avatar</summary>
-        </member>
-        <member name="P:OpenMetaverse.Primitive.ConstructionData.ProfileCurve">
+        <member name="M:OpenMetaverse.InventoryLandmark.#ctor(OpenMetaverse.UUID)">
             <summary>
+            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="P:OpenMetaverse.Primitive.ConstructionData.ProfileHole">
+        <member name="M:OpenMetaverse.InventoryLandmark.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
+            Construct an InventoryLandmark object from a serialization stream
             </summary>
         </member>
-        <member name="P:OpenMetaverse.Primitive.ConstructionData.PathBeginScale">
+        <member name="P:OpenMetaverse.InventoryLandmark.LandmarkVisited">
             <summary>
+            Landmarks use the InventoryItemFlags struct and will have a flag of 1 set if they have been visited
             </summary>
         </member>
-        <member name="P:OpenMetaverse.Primitive.ConstructionData.PathEndScale">
+        <member name="T:OpenMetaverse.InventoryObject">
             <summary>
+            InventoryObject Class contains details on a primitive or coalesced set of primitives
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.ConstructionData.GetHashCode">
+        <member name="M:OpenMetaverse.InventoryObject.#ctor(OpenMetaverse.UUID)">
             <summary>
-            Calculdates hash code for prim construction data
+            Construct an InventoryObject object
             </summary>
-            <returns>The has</returns>
+            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID"/> which becomes the 
+            <seealso cref="T:OpenMetaverse.InventoryItem"/> objects AssetUUID</param>
         </member>
-        <member name="T:OpenMetaverse.Primitive.FlexibleData">
+        <member name="M:OpenMetaverse.InventoryObject.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            Information on the flexible properties of a primitive
+            Construct an InventoryObject object from a serialization stream
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.FlexibleData.#ctor">
+        <member name="P:OpenMetaverse.InventoryObject.ItemFlags">
             <summary>
-            Default constructor
+            Gets or sets the upper byte of the Flags value
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.FlexibleData.#ctor(System.Byte[],System.Int32)">
+        <member name="P:OpenMetaverse.InventoryObject.AttachPoint">
             <summary>
+            Gets or sets the object attachment point, the lower byte of the Flags value
             </summary>
-            <param name="data">
-            </param>
-            <param name="pos">
-            </param>
         </member>
-        <member name="F:OpenMetaverse.Primitive.FlexibleData.Softness">
+        <member name="T:OpenMetaverse.InventoryNotecard">
             <summary>
+            InventoryNotecard Class, contains details on an encoded text document
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.FlexibleData.Gravity">
+        <member name="M:OpenMetaverse.InventoryNotecard.#ctor(OpenMetaverse.UUID)">
             <summary>
+            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.Primitive.FlexibleData.Drag">
+        <member name="M:OpenMetaverse.InventoryNotecard.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
+            Construct an InventoryNotecard object from a serialization stream
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.FlexibleData.Wind">
+        <member name="T:OpenMetaverse.InventoryCategory">
             <summary>
+            InventoryCategory Class
             </summary>
+            <remarks>TODO: Is this even used for anything?</remarks>
         </member>
-        <member name="F:OpenMetaverse.Primitive.FlexibleData.Tension">
+        <member name="M:OpenMetaverse.InventoryCategory.#ctor(OpenMetaverse.UUID)">
             <summary>
+            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.Primitive.FlexibleData.Force">
+        <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="M:OpenMetaverse.Primitive.FlexibleData.GetBytes">
+        <member name="T:OpenMetaverse.InventoryLSL">
             <summary>
+            InventoryLSL Class, represents a Linden Scripting Language object
             </summary>
-            <returns>
-            </returns>
         </member>
-        <member name="M:OpenMetaverse.Primitive.FlexibleData.GetOSD">
+        <member name="M:OpenMetaverse.InventoryLSL.#ctor(OpenMetaverse.UUID)">
             <summary>
+            Construct an InventoryLSL object
             </summary>
-            <returns>
-            </returns>
+            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID"/> which becomes the 
+            <seealso cref="T:OpenMetaverse.InventoryItem"/> objects AssetUUID</param>
         </member>
-        <member name="T:OpenMetaverse.Primitive.LightData">
+        <member name="M:OpenMetaverse.InventoryLSL.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            Information on the light properties of a primitive
+            Construct an InventoryLSL object from a serialization stream
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.LightData.#ctor">
+        <member name="T:OpenMetaverse.InventorySnapshot">
             <summary>
-            Default constructor
+            InventorySnapshot Class, an image taken with the viewer
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.LightData.#ctor(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.InventorySnapshot.#ctor(OpenMetaverse.UUID)">
             <summary>
+            Construct an InventorySnapshot object
             </summary>
-            <param name="data">
-            </param>
-            <param name="pos">
-            </param>
+            <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.Primitive.LightData.Color">
+        <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.Primitive.LightData.Intensity">
+        <member name="T:OpenMetaverse.InventoryAttachment">
             <summary>
+            InventoryAttachment Class, contains details on an attachable object
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.LightData.Radius">
+        <member name="M:OpenMetaverse.InventoryAttachment.#ctor(OpenMetaverse.UUID)">
             <summary>
+            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.Primitive.LightData.Cutoff">
+        <member name="M:OpenMetaverse.InventoryAttachment.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
+            Construct an InventoryAttachment object from a serialization stream
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.LightData.Falloff">
+        <member name="P:OpenMetaverse.InventoryAttachment.AttachmentPoint">
             <summary>
+            Get the last AttachmentPoint this object was attached to
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.LightData.GetBytes">
+        <member name="T:OpenMetaverse.InventoryWearable">
             <summary>
+            InventoryWearable Class, details on a clothing item or body part
             </summary>
-            <returns>
-            </returns>
         </member>
-        <member name="M:OpenMetaverse.Primitive.LightData.ToString">
+        <member name="M:OpenMetaverse.InventoryWearable.#ctor(OpenMetaverse.UUID)">
             <summary>
+            Construct an InventoryWearable object
             </summary>
-            <returns>
-            </returns>
+            <param name="itemID">A <seealso cref="T:OpenMetaverse.UUID"/> which becomes the 
+            <seealso cref="T:OpenMetaverse.InventoryItem"/> objects AssetUUID</param>
         </member>
-        <member name="T:OpenMetaverse.Primitive.SculptData">
+        <member name="M:OpenMetaverse.InventoryWearable.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            Information on the sculpt properties of a sculpted primitive
+            Construct an InventoryWearable object from a serialization stream
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.SculptData.#ctor">
+        <member name="P:OpenMetaverse.InventoryWearable.WearableType">
             <summary>
-            Default constructor
+            The <seealso cref="T:OpenMetaverse.WearableType"/>, Skin, Shape, Skirt, Etc
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.SculptData.#ctor(System.Byte[],System.Int32)">
+        <member name="T:OpenMetaverse.InventoryAnimation">
             <summary>
+            InventoryAnimation Class, A bvh encoded object which animates an avatar
             </summary>
-            <param name="data">
-            </param>
-            <param name="pos">
-            </param>
         </member>
-        <member name="P:OpenMetaverse.Primitive.SculptData.Invert">
+        <member name="M:OpenMetaverse.InventoryAnimation.#ctor(OpenMetaverse.UUID)">
             <summary>
-            Render inside out (inverts the normals).
+            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="P:OpenMetaverse.Primitive.SculptData.Mirror">
+        <member name="M:OpenMetaverse.InventoryAnimation.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
-            Render an X axis mirror of the sculpty.
+            Construct an InventoryAnimation object from a serialization stream
             </summary>
         </member>
-        <member name="T:OpenMetaverse.Primitive.ObjectProperties">
+        <member name="T:OpenMetaverse.InventoryGesture">
             <summary>
-            Extended properties to describe an object
+            InventoryGesture Class, details on a series of animations, sounds, and actions
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.ObjectProperties.#ctor">
+        <member name="M:OpenMetaverse.InventoryGesture.#ctor(OpenMetaverse.UUID)">
             <summary>
-            Default constructor
+            Construct an InventoryGesture 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.Primitive.ObjectProperties.ObjectID">
+        <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="F:OpenMetaverse.Primitive.ObjectProperties.CreatorID">
+        <member name="T:OpenMetaverse.InventoryFolder">
             <summary>
+            A folder contains <seealso cref="T:OpenMetaverse.InventoryItem"/>s and has certain attributes specific 
+            to itself
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.OwnerID">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.InventoryFolder.PreferredType">
+            <summary>The Preferred <seealso cref="T:OpenMetaverse.AssetType"/> for a folder.</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.GroupID">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.InventoryFolder.Version">
+            <summary>The Version of this folder</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.CreationDate">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.InventoryFolder.DescendentCount">
+            <summary>Number of child items this folder contains.</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.Permissions">
+        <member name="M:OpenMetaverse.InventoryFolder.#ctor(OpenMetaverse.UUID)">
             <summary>
+            Constructor
             </summary>
+            <param name="itemID">UUID of the folder</param>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.OwnershipCost">
+        <member name="M:OpenMetaverse.InventoryFolder.ToString">
             <summary>
+            
             </summary>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.SaleType">
+        <member name="M:OpenMetaverse.InventoryFolder.GetObjectData(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
+            Get Serilization data for this InventoryFolder object
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.SalePrice">
+        <member name="M:OpenMetaverse.InventoryFolder.#ctor(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext)">
             <summary>
+            Construct an InventoryFolder object from a serialization stream
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.AggregatePerms">
+        <member name="M:OpenMetaverse.InventoryFolder.GetHashCode">
             <summary>
+            
             </summary>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.AggregatePermTextures">
+        <member name="M:OpenMetaverse.InventoryFolder.Equals(System.Object)">
             <summary>
+            
             </summary>
+            <param name="o"></param>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.AggregatePermTexturesOwner">
+        <member name="M:OpenMetaverse.InventoryFolder.Equals(OpenMetaverse.InventoryBase)">
             <summary>
+            
             </summary>
+            <param name="o"></param>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.Category">
+        <member name="M:OpenMetaverse.InventoryFolder.Equals(OpenMetaverse.InventoryFolder)">
             <summary>
+            
             </summary>
+            <param name="o"></param>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.InventorySerial">
+        <member name="M:OpenMetaverse.InventoryFolder.FromOSD(OpenMetaverse.StructuredData.OSD)">
             <summary>
+            Create InventoryFolder from OSD
             </summary>
+            <param name="data">OSD Data that makes up InventoryFolder</param>
+            <returns>Inventory folder created</returns>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.ItemID">
+        <member name="M:OpenMetaverse.InventoryFolder.GetOSD">
             <summary>
+            Convert InventoryItem to OSD
             </summary>
+            <returns>OSD representation of InventoryItem</returns>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.FolderID">
+        <member name="T:OpenMetaverse.InventoryManager">
             <summary>
+            Tools for dealing with agents inventory
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.FromTaskID">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.InventoryManager.MAGIC_ID">
+            <summary>Used for converting shadow_id to asset_id</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.LastOwnerID">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.InventoryManager.m_ItemReceived">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.Name">
-            <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.Primitive.ObjectProperties.Description">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.InventoryManager.m_ItemReceivedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.TouchName">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.InventoryManager.m_FolderUpdated">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ObjectProperties.SitName">
-            <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.Primitive.ObjectProperties.TextureIDs">
-            <summary>
-            </summary>
+        <member name="F:OpenMetaverse.InventoryManager.m_FolderUpdatedLock">
+            <summary>Thread sync lock object</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 name="F:OpenMetaverse.InventoryManager.m_InventoryObjectOffered">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Primitive.PhysicsProperties">
-            <summary>
-            Describes physics attributes of the prim
-            </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.Primitive.PhysicsProperties.LocalID">
-            <summary>Primitive's local ID</summary>
+        <member name="F:OpenMetaverse.InventoryManager.m_InventoryObjectOfferedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.PhysicsProperties.Density">
-            <summary>Density (1000 for normal density)</summary>
+        <member name="F:OpenMetaverse.InventoryManager.m_TaskItemReceived">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.PhysicsProperties.Friction">
-            <summary>Friction</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.Primitive.PhysicsProperties.GravityMultiplier">
-            <summary>Gravity multiplier (1 for normal gravity) </summary>
+        <member name="F:OpenMetaverse.InventoryManager.m_TaskItemReceivedLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.PhysicsProperties.PhysicsShapeType">
-            <summary>Type of physics representation of this primitive in the simulator</summary>
+        <member name="F:OpenMetaverse.InventoryManager.m_FindObjectByPathReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.PhysicsProperties.Restitution">
-            <summary>Restitution</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="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 name="F:OpenMetaverse.InventoryManager.m_FindObjectByPathReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.PhysicsProperties.GetOSD">
-            <summary>
-            Serializes PhysicsProperties to OSD
-            </summary>
-            <returns>OSDMap with serialized PhysicsProperties data</returns>
+        <member name="F:OpenMetaverse.InventoryManager.m_TaskInventoryReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="T:OpenMetaverse.Primitive.TextureAnimMode">
-            <summary>
-            Texture animation mode
-            </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.Primitive.TextureAnimMode.ANIM_OFF">
-            <summary>Disable texture animation</summary>
+        <member name="F:OpenMetaverse.InventoryManager.m_TaskInventoryReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.ANIM_ON">
-            <summary>Enable texture animation</summary>
+        <member name="F:OpenMetaverse.InventoryManager.m_SaveAssetToInventory">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.LOOP">
-            <summary>Loop when animating textures</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.Primitive.TextureAnimMode.REVERSE">
-            <summary>Animate in reverse direction</summary>
+        <member name="F:OpenMetaverse.InventoryManager.m_SaveAssetToInventoryLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.PING_PONG">
-            <summary>Animate forward then reverse</summary>
+        <member name="F:OpenMetaverse.InventoryManager.m_ScriptRunningReply">
+            <summary>The event subscribers, null of no subscribers</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.SMOOTH">
-            <summary>Slide texture smoothly instead of frame-stepping</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="F:OpenMetaverse.Primitive.TextureAnimMode.ROTATE">
-            <summary>Rotate texture instead of using frames</summary>
+        <member name="F:OpenMetaverse.InventoryManager.m_ScriptRunningReplyLock">
+            <summary>Thread sync lock object</summary>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimMode.SCALE">
-            <summary>Scale texture instead of using frames</summary>
+        <member name="F:OpenMetaverse.InventoryManager._NewFolderNames">
+            <summary>Partial mapping of AssetTypes to folder names</summary>
         </member>
-        <member name="T:OpenMetaverse.Primitive.TextureEntryFace">
+        <member name="M:OpenMetaverse.InventoryManager.#ctor(OpenMetaverse.GridClient)">
             <summary>
-            A single textured face. Don't instantiate this class yourself, use the
-            methods in TextureEntry
+            Default constructor
             </summary>
+            <param name="client">Reference to the GridClient object</param>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntryFace.#ctor(OpenMetaverse.Primitive.TextureEntryFace)">
+        <member name="M:OpenMetaverse.InventoryManager.FetchItem(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Int32)">
             <summary>
-            Contains the definition for individual faces
+            Fetch an inventory item from the dataserver
             </summary>
-            <param name="defaultTexture">
-            </param>
+            <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.Primitive.TextureEntryFace.material">
+        <member name="M:OpenMetaverse.InventoryManager.RequestFetchInventory(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
+            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="P:OpenMetaverse.Primitive.TextureEntryFace.media">
+        <member name="M:OpenMetaverse.InventoryManager.RequestFetchInventory(System.Collections.Generic.List{OpenMetaverse.UUID},System.Collections.Generic.List{OpenMetaverse.UUID})">
             <summary>
+            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="P:OpenMetaverse.Primitive.TextureEntryFace.RGBA">
+        <member name="M:OpenMetaverse.InventoryManager.RequestFetchInventoryCap(System.Collections.Generic.List{OpenMetaverse.UUID},System.Collections.Generic.List{OpenMetaverse.UUID})">
             <summary>
+            Request inventory items via Capabilities
             </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="P:OpenMetaverse.Primitive.TextureEntryFace.RepeatU">
+        <member name="M:OpenMetaverse.InventoryManager.FolderContents(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean,System.Boolean,OpenMetaverse.InventorySortOrder,System.Int32)">
             <summary>
+            Get contents of a folder
             </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>
         </member>
-        <member name="P:OpenMetaverse.Primitive.TextureEntryFace.RepeatV">
+        <member name="M:OpenMetaverse.InventoryManager.RequestFolderContents(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean,System.Boolean,OpenMetaverse.InventorySortOrder)">
             <summary>
+            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="P:OpenMetaverse.Primitive.TextureEntryFace.OffsetU">
+        <member name="M:OpenMetaverse.InventoryManager.RequestFolderContentsCap(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean,System.Boolean,OpenMetaverse.InventorySortOrder)">
             <summary>
+            Request the contents of an inventory folder using HTTP capabilities
             </summary>
+            <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="P:OpenMetaverse.Primitive.TextureEntryFace.OffsetV">
+        <member name="M:OpenMetaverse.InventoryManager.FindFolderForType(OpenMetaverse.AssetType)">
             <summary>
+            Returns the UUID of the folder (category) that defaults to
+            containing 'type'. The folder is not necessarily only for that
+            type
             </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="P:OpenMetaverse.Primitive.TextureEntryFace.Rotation">
+        <member name="M:OpenMetaverse.InventoryManager.FindObjectByPath(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,System.Int32)">
             <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="P:OpenMetaverse.Primitive.TextureEntryFace.Glow">
+        <member name="M:OpenMetaverse.InventoryManager.RequestFindObjectByPath(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String)">
             <summary>
+            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.Primitive.TextureEntryFace.Bump">
+        <member name="M:OpenMetaverse.InventoryManager.LocalFind(OpenMetaverse.UUID,System.String[],System.Int32,System.Boolean)">
             <summary>
+            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.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">
+        <member name="M:OpenMetaverse.InventoryManager.Move(OpenMetaverse.InventoryBase,OpenMetaverse.InventoryFolder)">
             <summary>
+            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="M:OpenMetaverse.Primitive.TextureEntryFace.ToString">
+        <member name="M:OpenMetaverse.InventoryManager.Move(OpenMetaverse.InventoryBase,OpenMetaverse.InventoryFolder,System.String)">
             <summary>
+            Move an inventory item or folder to a new location and change its name
             </summary>
-            <returns>
-            </returns>
+            <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="T:OpenMetaverse.Primitive.TextureEntry">
+        <member name="M:OpenMetaverse.InventoryManager.MoveFolder(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String)">
             <summary>
-            Represents all of the texturable faces for an object
+            Move and rename a folder
             </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>
+            <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="M:OpenMetaverse.Primitive.TextureEntry.#ctor(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.InventoryManager.UpdateFolderProperties(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,OpenMetaverse.AssetType)">
             <summary>
-            Constructor that takes a default texture UUID
+            Update folder properties
             </summary>
-            <param name="defaultTextureID">Texture UUID to use as the default texture</param>
+            <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.Primitive.TextureEntry.#ctor(OpenMetaverse.Primitive.TextureEntryFace)">
+        <member name="M:OpenMetaverse.InventoryManager.MoveFolder(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
-            Constructor that takes a <code>TextureEntryFace</code> for the
-            default face
+            Move a folder
             </summary>
-            <param name="defaultFace">Face to use as the default face</param>
+            <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="M:OpenMetaverse.Primitive.TextureEntry.#ctor(System.Byte[],System.Int32,System.Int32)">
+        <member name="M:OpenMetaverse.InventoryManager.MoveFolders(System.Collections.Generic.Dictionary{OpenMetaverse.UUID,OpenMetaverse.UUID})">
             <summary>
-            Constructor that creates the TextureEntry class from a byte array
+            Move multiple folders, the keys in the Dictionary parameter,
+            to a new parents, the value of that folder's key.
             </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>
+            <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="F:OpenMetaverse.Primitive.TextureEntry.DefaultTexture">
+        <member name="M:OpenMetaverse.InventoryManager.MoveItem(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
+            Move an inventory item to a new folder
             </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="F:OpenMetaverse.Primitive.TextureEntry.FaceTextures">
+        <member name="M:OpenMetaverse.InventoryManager.MoveItem(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String)">
             <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.Primitive.TextureEntry.CreateFace(System.UInt32)">
+        <member name="M:OpenMetaverse.InventoryManager.MoveItems(System.Collections.Generic.Dictionary{OpenMetaverse.UUID,OpenMetaverse.UUID})">
             <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
+            Move multiple inventory items to new locations
             </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>
+            <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.Primitive.TextureEntry.GetFace(System.UInt32)">
+        <member name="M:OpenMetaverse.InventoryManager.RemoveDescendants(OpenMetaverse.UUID)">
             <summary>
+            Remove descendants of a folder
             </summary>
-            <param name="index">
-            </param>
-            <returns>
-            </returns>
+            <param name="folder">The <seealso cref="T:OpenMetaverse.UUID"/> of the folder</param>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntry.GetOSD">
+        <member name="M:OpenMetaverse.InventoryManager.RemoveItem(OpenMetaverse.UUID)">
             <summary>
+            Remove a single item from inventory
             </summary>
-            <returns>
-            </returns>
+            <param name="item">The <seealso cref="T:OpenMetaverse.UUID"/> of the inventory item to remove</param>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntry.GetBytes">
+        <member name="M:OpenMetaverse.InventoryManager.RemoveFolder(OpenMetaverse.UUID)">
             <summary>
+            Remove a folder from inventory
             </summary>
-            <returns>
-            </returns>
+            <param name="folder">The <seealso cref="T:OpenMetaverse.UUID"/> of the folder to remove</param>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureEntry.ToString">
+        <member name="M:OpenMetaverse.InventoryManager.Remove(System.Collections.Generic.List{OpenMetaverse.UUID},System.Collections.Generic.List{OpenMetaverse.UUID})">
             <summary>
+            Remove multiple items or folders from inventory
             </summary>
-            <returns>
-            </returns>
+            <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="T:OpenMetaverse.Primitive.TextureAnimation">
+        <member name="M:OpenMetaverse.InventoryManager.EmptyLostAndFound">
             <summary>
-            Controls the texture animation of a particular prim
+            Empty the Lost and Found folder
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureAnimation.#ctor(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.InventoryManager.EmptyTrash">
             <summary>
+            Empty the Trash folder
             </summary>
-            <param name="data">
-            </param>
-            <param name="pos">
-            </param>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Flags">
+        <member name="M:OpenMetaverse.InventoryManager.RequestCreateItem(OpenMetaverse.UUID,System.String,System.String,OpenMetaverse.AssetType,OpenMetaverse.UUID,OpenMetaverse.InventoryType,OpenMetaverse.PermissionMask,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
             <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="F:OpenMetaverse.Primitive.TextureAnimation.Face">
+        <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>
+            
             </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.Primitive.TextureAnimation.SizeX">
+        <member name="M:OpenMetaverse.InventoryManager.CreateFolder(OpenMetaverse.UUID,System.String)">
             <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="F:OpenMetaverse.Primitive.TextureAnimation.SizeY">
+        <member name="M:OpenMetaverse.InventoryManager.CreateFolder(OpenMetaverse.UUID,System.String,OpenMetaverse.AssetType)">
             <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="F:OpenMetaverse.Primitive.TextureAnimation.Start">
+        <member name="M:OpenMetaverse.InventoryManager.RequestCreateItemFromAsset(System.Byte[],System.String,System.String,OpenMetaverse.AssetType,OpenMetaverse.InventoryType,OpenMetaverse.UUID,OpenMetaverse.InventoryManager.ItemCreatedFromAssetCallback)">
             <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="callback">Delegate that will receive feedback on success or failure</param>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnimation.Length">
+        <member name="M:OpenMetaverse.InventoryManager.RequestCreateItemFromAsset(System.Byte[],System.String,System.String,OpenMetaverse.AssetType,OpenMetaverse.InventoryType,OpenMetaverse.UUID,OpenMetaverse.Permissions,OpenMetaverse.InventoryManager.ItemCreatedFromAssetCallback)">
             <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="F:OpenMetaverse.Primitive.TextureAnimation.Rate">
+        <member name="M:OpenMetaverse.InventoryManager.CreateLink(OpenMetaverse.UUID,OpenMetaverse.InventoryBase,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
             <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="bse">Inventory item or folder</param>
+            <param name="callback">Method to call upon creation of the link</param>
         </member>
-        <member name="M:OpenMetaverse.Primitive.TextureAnimation.GetBytes">
+        <member name="M:OpenMetaverse.InventoryManager.CreateLink(OpenMetaverse.UUID,OpenMetaverse.InventoryItem,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
             <summary>
+            Creates inventory link to another inventory item
             </summary>
-            <returns>
-            </returns>
+            <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.Primitive.MediaVersion">
+        <member name="M:OpenMetaverse.InventoryManager.CreateLink(OpenMetaverse.UUID,OpenMetaverse.InventoryFolder,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
             <summary>
-            Current version of the media data for the prim
+            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="F:OpenMetaverse.Primitive.FaceMedia">
+        <member name="M:OpenMetaverse.InventoryManager.CreateLink(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,System.String,OpenMetaverse.AssetType,OpenMetaverse.InventoryType,OpenMetaverse.UUID,OpenMetaverse.InventoryManager.ItemCreatedCallback)">
             <summary>
-            Array of media entries indexed by face number
+            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="F:OpenMetaverse.Primitive.ParticleSys">
+        <member name="M:OpenMetaverse.InventoryManager.RequestCopyItem(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,OpenMetaverse.InventoryManager.ItemCopiedCallback)">
             <summary>
+            
             </summary>
+            <param name="item"></param>
+            <param name="newParent"></param>
+            <param name="newName"></param>
+            <param name="callback"></param>
         </member>
-        <member name="F:OpenMetaverse.Primitive.ID">
+        <member name="M:OpenMetaverse.InventoryManager.RequestCopyItem(OpenMetaverse.UUID,OpenMetaverse.UUID,System.String,OpenMetaverse.UUID,OpenMetaverse.InventoryManager.ItemCopiedCallback)">
             <summary>
+            
             </summary>
+            <param name="item"></param>
+            <param name="newParent"></param>
+            <param name="newName"></param>
+            <param name="oldOwnerID"></param>
+            <param name="callback"></param>
         </member>
-        <member name="F:OpenMetaverse.Primitive.GroupID">
+        <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>
+            
             </summary>
+            <param name="items"></param>
+            <param name="targetFolders"></param>
+            <param name="newNames"></param>
+            <param name="oldOwnerID"></param>
+            <param name="callback"></param>
         </member>
-        <member name="F:OpenMetaverse.Primitive.LocalID">
+        <member name="M:OpenMetaverse.InventoryManager.RequestCopyItemFromNotecard(OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.InventoryManager.ItemCopiedCallback)">
             <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="F:OpenMetaverse.Primitive.ParentID">
+        <member name="M:OpenMetaverse.InventoryManager.RequestUpdateItem(OpenMetaverse.InventoryItem)">
             <summary>
+            
             </summary>
+            <param name="item"></param>
         </member>
-        <member name="F:OpenMetaverse.Primitive.RegionHandle">
+        <member name="M:OpenMetaverse.InventoryManager.RequestUpdateItems(System.Collections.Generic.List{OpenMetaverse.InventoryItem})">
             <summary>
+            
             </summary>
+            <param name="items"></param>
         </member>
-        <member name="F:OpenMetaverse.Primitive.Flags">
+        <member name="M:OpenMetaverse.InventoryManager.RequestUpdateItems(System.Collections.Generic.List{OpenMetaverse.InventoryItem},OpenMetaverse.UUID)">
             <summary>
+            
             </summary>
+            <param name="items"></param>
+            <param name="transactionID"></param>
         </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">
+        <member name="M:OpenMetaverse.InventoryManager.RequestUploadNotecardAsset(System.Byte[],OpenMetaverse.UUID,OpenMetaverse.InventoryManager.InventoryUploadedAssetCallback)">
             <summary>
+            
             </summary>
+            <param name="data"></param>
+            <param name="notecardID"></param>
+            <param name="callback"></param>
         </member>
-        <member name="F:OpenMetaverse.Primitive.Scale">
+        <member name="M:OpenMetaverse.InventoryManager.RequestUpdateNotecardTask(System.Byte[],OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.InventoryManager.InventoryUploadedAssetCallback)">
             <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="F:OpenMetaverse.Primitive.Rotation">
+        <member name="M:OpenMetaverse.InventoryManager.RequestUploadGestureAsset(System.Byte[],OpenMetaverse.UUID,OpenMetaverse.InventoryManager.InventoryUploadedAssetCallback)">
             <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="F:OpenMetaverse.Primitive.Velocity">
+        <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="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="F:OpenMetaverse.Primitive.AngularVelocity">
+        <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="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="F:OpenMetaverse.Primitive.Acceleration">
+        <member name="M:OpenMetaverse.InventoryManager.RequestRezFromInventory(OpenMetaverse.Simulator,OpenMetaverse.Quaternion,OpenMetaverse.Vector3,OpenMetaverse.InventoryItem)">
             <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="F:OpenMetaverse.Primitive.CollisionPlane">
+        <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="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="F:OpenMetaverse.Primitive.Flexible">
+        <member name="M:OpenMetaverse.InventoryManager.RequestRezFromInventory(OpenMetaverse.Simulator,OpenMetaverse.Quaternion,OpenMetaverse.Vector3,OpenMetaverse.InventoryItem,OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean)">
             <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="F:OpenMetaverse.Primitive.Light">
+        <member name="M:OpenMetaverse.InventoryManager.RequestRezFromInventory(OpenMetaverse.Simulator,OpenMetaverse.UUID,OpenMetaverse.Quaternion,OpenMetaverse.Vector3,OpenMetaverse.InventoryItem,OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean)">
             <summary>
+            Rez an object from inventory
             </summary>
+            <param name="simulator">Simulator to place object in</param>
+            <param name="taskID">TaskID object when rezzed</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="F:OpenMetaverse.Primitive.Sculpt">
+        <member name="M:OpenMetaverse.InventoryManager.RequestDeRezToInventory(System.UInt32)">
             <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="F:OpenMetaverse.Primitive.ClickAction">
+        <member name="M:OpenMetaverse.InventoryManager.RequestDeRezToInventory(System.UInt32,OpenMetaverse.DeRezDestination,OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <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="F:OpenMetaverse.Primitive.Sound">
+        <member name="M:OpenMetaverse.InventoryManager.RequestRestoreRezFromInventory(OpenMetaverse.Simulator,OpenMetaverse.InventoryItem,OpenMetaverse.UUID)">
             <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="F:OpenMetaverse.Primitive.OwnerID">
-            <summary>Identifies the owner if audio or a particle system is
-            active</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.SoundFlags">
+        <member name="M:OpenMetaverse.InventoryManager.GiveItem(OpenMetaverse.UUID,System.String,OpenMetaverse.AssetType,OpenMetaverse.UUID,System.Boolean)">
             <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="F:OpenMetaverse.Primitive.SoundGain">
+        <member name="M:OpenMetaverse.InventoryManager.GiveFolder(OpenMetaverse.UUID,System.String,OpenMetaverse.AssetType,OpenMetaverse.UUID,System.Boolean)">
             <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="F:OpenMetaverse.Primitive.SoundRadius">
+        <member name="M:OpenMetaverse.InventoryManager.UpdateTaskInventory(System.UInt32,OpenMetaverse.InventoryItem)">
             <summary>
+            Copy or move an <see cref="T:OpenMetaverse.InventoryItem"/> from agent inventory to a task (primitive) inventory
             </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>
         </member>
-        <member name="F:OpenMetaverse.Primitive.Text">
+        <member name="M:OpenMetaverse.InventoryManager.GetTaskInventory(OpenMetaverse.UUID,System.UInt32,System.Int32)">
             <summary>
+            Retrieve a listing of the items contained in a task (Primitive)
             </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>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextColor">
+        <member name="M:OpenMetaverse.InventoryManager.RequestTaskInventory(System.UInt32)">
             <summary>
+            Request the contents of a tasks (primitives) inventory from the 
+            current simulator
             </summary>
+            <param name="objectLocalID">The LocalID of the object</param>
+            <seealso cref="E:OpenMetaverse.InventoryManager.TaskInventoryReply"/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.MediaURL">
+        <member name="M:OpenMetaverse.InventoryManager.RequestTaskInventory(System.UInt32,OpenMetaverse.Simulator)">
             <summary>
+            Request the contents of a tasks (primitives) inventory
             </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"/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.Joint">
+        <member name="M:OpenMetaverse.InventoryManager.MoveTaskInventory(System.UInt32,OpenMetaverse.UUID,OpenMetaverse.UUID,OpenMetaverse.Simulator)">
             <summary>
+            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="F:OpenMetaverse.Primitive.JointPivot">
+        <member name="M:OpenMetaverse.InventoryManager.RemoveTaskInventory(System.UInt32,OpenMetaverse.UUID,OpenMetaverse.Simulator)">
             <summary>
+            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)"/> request combined with
+            the <seealso cref="E:OpenMetaverse.InventoryManager.TaskInventoryReply"/> event</remarks>
         </member>
-        <member name="F:OpenMetaverse.Primitive.JointAxisOrAnchor">
-            <summary>
-            </summary>
+        <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>
-        <member name="F:OpenMetaverse.Primitive.NameValues">
+        <member name="M:OpenMetaverse.InventoryManager.RequestGetScriptRunning(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
+            Request the running status of a script contained in a task (primitive) inventory
             </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"/>
         </member>
-        <member name="F:OpenMetaverse.Primitive.PrimData">
+        <member name="M:OpenMetaverse.InventoryManager.RequestSetScriptRunning(OpenMetaverse.UUID,OpenMetaverse.UUID,System.Boolean)">
             <summary>
+            Send a request to set the running state of a script contained in a task (primitive) inventory
             </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>
         </member>
-        <member name="F:OpenMetaverse.Primitive.Properties">
+        <member name="M:OpenMetaverse.InventoryManager.ItemCRC(OpenMetaverse.InventoryItem)">
             <summary>
+            Create a CRC from an InventoryItem
             </summary>
+            <param name="iitem">The source InventoryItem</param>
+            <returns>A uint representing the source InventoryItem as a CRC</returns>
         </member>
-        <member name="F:OpenMetaverse.Primitive.PhysicsProps">
-            <summary>Objects physics engine propertis</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.Tag">
-            <summary>Extra data about primitive</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.IsAttachment">
-            <summary>Indicates if prim is attached to an avatar</summary>
-        </member>
-        <member name="F:OpenMetaverse.Primitive.Textures">
+        <member name="M:OpenMetaverse.InventoryManager.DecryptShadowID(OpenMetaverse.UUID)">
             <summary>
+            Reverses a cheesy XORing with a fixed UUID to convert a shadow_id to an asset_id
             </summary>
+            <param name="shadowID">Obfuscated shadow_id value</param>
+            <returns>Deobfuscated asset_id value</returns>
         </member>
-        <member name="F:OpenMetaverse.Primitive.TextureAnim">
+        <member name="M:OpenMetaverse.InventoryManager.EncryptAssetID(OpenMetaverse.UUID)">
             <summary>
+            Does a cheesy XORing with a fixed UUID to convert an asset_id to a shadow_id
             </summary>
+            <param name="assetID">asset_id value to obfuscate</param>
+            <returns>Obfuscated shadow_id value</returns>
         </member>
-        <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)">
+        <member name="M:OpenMetaverse.InventoryManager.CreateInventoryItem(OpenMetaverse.InventoryType,OpenMetaverse.UUID)">
             <summary>
-            Packs PathTwist, PathTwistBegin, PathRadiusOffset, and PathSkew
-            parameters in to signed eight bit values
+            Wrapper for creating a new <seealso cref="T:OpenMetaverse.InventoryItem"/> object
             </summary>
-            <param name="pathTwist">Floating point parameter to pack</param>
-            <returns>Signed eight bit value containing the packed parameter</returns>
+            <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.Primitive.UnpackPathTwist(System.SByte)">
+        <member name="M:OpenMetaverse.InventoryManager.ParseTaskInventory(System.String)">
             <summary>
-            Unpacks PathTwist, PathTwistBegin, PathRadiusOffset, and PathSkew
-            parameters from signed eight bit integers to floating point values
+            Parse the results of a RequestTaskInventory() response
             </summary>
-            <param name="pathTwist">Signed eight bit value to unpack</param>
-            <returns>Unpacked floating point value</returns>
+            <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="T:OpenMetaverse.Bumpiness">
-            <summary>
-            The type of bump-mapping applied to a face
-            </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="F:OpenMetaverse.Bumpiness.None">
-            <summary>
-            </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="F:OpenMetaverse.Bumpiness.Brightness">
+        <member name="M:OpenMetaverse.InventoryManager.UpdateCreateInventoryItemHandler(System.Object,OpenMetaverse.PacketReceivedEventArgs)">
             <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
             </summary>
+            <param name="sender">The sender</param>
+            <param name="e">The EventArgs object containing the packet data</param>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Darkness">
+        <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="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="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="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="E:OpenMetaverse.InventoryManager.ItemReceived">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
+        </member>
+        <member name="E:OpenMetaverse.InventoryManager.FolderUpdated">
+            <summary>Raised when the simulator sends us data containing
+            ...</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>
+        <member name="E:OpenMetaverse.InventoryManager.TaskItemReceived">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
+        </member>
+        <member name="E:OpenMetaverse.InventoryManager.FindObjectByPathReply">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
+        </member>
+        <member name="E:OpenMetaverse.InventoryManager.TaskInventoryReply">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
+        </member>
+        <member name="E:OpenMetaverse.InventoryManager.SaveAssetToInventory">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
+        </member>
+        <member name="E:OpenMetaverse.InventoryManager.ScriptRunningReply">
+            <summary>Raised when the simulator sends us data containing
+            ...</summary>
+        </member>
+        <member name="P:OpenMetaverse.InventoryManager.Store">
             <summary>
+            Get this agents Inventory data
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Woodgrain">
+        <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.Bumpiness.Bark">
+        <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.Bumpiness.Bricks">
+        <member name="T:OpenMetaverse.InventoryManager.ItemCopiedCallback">
             <summary>
+            
             </summary>
+            <param name="item"></param>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Checker">
+        <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.Bumpiness.Concrete">
+        <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.Bumpiness.Crustytile">
+        <member name="P:OpenMetaverse.InventoryObjectOfferedEventArgs.Accept">
+            <summary>Set to true to accept offer, false to decline it</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>
+        <member name="T:OpenMetaverse.TaskItemReceivedEventArgs">
             <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.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Cutstone">
+        <member name="T:OpenMetaverse.GridLayerType">
             <summary>
+            Map layer request type
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Discs">
+        <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">
             <summary>
+            Type of grid item, such as telehub, event, populator location, etc.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Gravel">
+        <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>
+        <member name="T:OpenMetaverse.GridRegion">
             <summary>
+            Information about a region on the grid map
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Petridish">
+        <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>
+        <member name="F:OpenMetaverse.GridRegion.Name">
+            <summary>Sim Name (NOTE: In lowercase!)</summary>
+        </member>
+        <member name="F:OpenMetaverse.GridRegion.Access">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.GridRegion.RegionFlags">
+            <summary>Appears to always be zero (None)</summary>
+        </member>
+        <member name="F:OpenMetaverse.GridRegion.WaterHeight">
+            <summary>Sim's defined Water Height</summary>
+        </member>
+        <member name="F:OpenMetaverse.GridRegion.Agents">
+            <summary></summary>
+        </member>
+        <member name="F:OpenMetaverse.GridRegion.MapImageID">
+            <summary>UUID of the World Map image</summary>
+        </member>
+        <member name="F:OpenMetaverse.GridRegion.RegionHandle">
+            <summary>Unique identifier for this region, a combination of the X 
+            and Y position</summary>
+        </member>
+        <member name="M:OpenMetaverse.GridRegion.ToString">
             <summary>
+            
             </summary>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Siding">
+        <member name="M:OpenMetaverse.GridRegion.GetHashCode">
             <summary>
+            
             </summary>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Stonetile">
+        <member name="M:OpenMetaverse.GridRegion.Equals(System.Object)">
             <summary>
+            
             </summary>
+            <param name="obj"></param>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Stucco">
+        <member name="T:OpenMetaverse.GridLayer">
             <summary>
+            Visual chunk of the grid map
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Suction">
+        <member name="T:OpenMetaverse.MapItem">
             <summary>
+            Base class for Map Items
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Bumpiness.Weave">
+        <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>
+            Represents an agent or group of agents location
             </summary>
         </member>
-        <member name="T:OpenMetaverse.Shininess">
+        <member name="T:OpenMetaverse.MapTelehub">
             <summary>
-            The level of shininess applied to a face
+            Represents a Telehub location
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Shininess.None">
+        <member name="T:OpenMetaverse.MapLandForSale">
             <summary>
+            Represents a non-adult parcel of land for sale
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Shininess.Low">
+        <member name="T:OpenMetaverse.MapAdultLandForSale">
             <summary>
+            Represents an Adult parcel of land for sale
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Shininess.Medium">
+        <member name="T:OpenMetaverse.MapPGEvent">
             <summary>
+            Represents a PG Event
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Shininess.High">
+        <member name="T:OpenMetaverse.MapMatureEvent">
             <summary>
+            Represents a Mature event
             </summary>
         </member>
-        <member name="T:OpenMetaverse.MappingType">
+        <member name="T:OpenMetaverse.MapAdultEvent">
             <summary>
-            The texture mapping style used for a face
+            Represents an Adult event
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MappingType.Default">
+        <member name="T:OpenMetaverse.GridManager">
             <summary>
+            Manages grid-wide tasks such as the world map
             </summary>
         </member>
-        <member name="F:OpenMetaverse.MappingType.Planar">
+        <member name="F:OpenMetaverse.GridManager.m_CoarseLocationUpdate">
+            <summary>The event subscribers. null if no subcribers</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="F:OpenMetaverse.GridManager.m_CoarseLocationUpdateLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.GridManager.m_GridRegion">
+            <summary>The event subscribers. null if no subcribers</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>
+        <member name="F:OpenMetaverse.GridManager.m_GridRegionLock">
+            <summary>Thread sync lock object</summary>
+        </member>
+        <member name="F:OpenMetaverse.GridManager.m_GridLayer">
+            <summary>The event subscribers. null if no subcribers</summary>
+        </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="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="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="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="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="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="M:OpenMetaverse.GridManager.#ctor(OpenMetaverse.GridClient)">
             <summary>
+            Constructor
             </summary>
+            <param name="client">Instance of GridClient object to associate with this GridManager instance</param>
         </member>
-        <member name="F:OpenMetaverse.MappingType.Spherical">
+        <member name="M:OpenMetaverse.GridManager.RequestMapLayer(OpenMetaverse.GridLayerType)">
             <summary>
+            
             </summary>
+            <param name="layer"></param>
         </member>
-        <member name="F:OpenMetaverse.MappingType.Cylindrical">
+        <member name="M:OpenMetaverse.GridManager.RequestMapRegion(System.String,OpenMetaverse.GridLayerType)">
             <summary>
+            Request a map layer
             </summary>
+            <param name="regionName">The name of the region</param>
+            <param name="layer">The type of layer</param>
         </member>
-        <member name="T:OpenMetaverse.TextureAttributes">
+        <member name="M:OpenMetaverse.GridManager.RequestMapBlocks(OpenMetaverse.GridLayerType,System.UInt16,System.UInt16,System.UInt16,System.UInt16,System.Boolean)">
             <summary>
-            Flags in the TextureEntry block that describe which properties are
-            set
+            
             </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="F:OpenMetaverse.TextureAttributes.None">
+        <member name="M:OpenMetaverse.GridManager.MapItems(System.UInt64,OpenMetaverse.GridItemType,OpenMetaverse.GridLayerType,System.Int32)">
             <summary>
+            
             </summary>
+            <param name="regionHandle"></param>
+            <param name="item"></param>
+            <param name="layer"></param>
+            <param name="timeoutMS"></param>
+            <returns></returns>
         </member>
-        <member name="F:OpenMetaverse.TextureAttributes.TextureID">
+        <member name="M:OpenMetaverse.GridManager.RequestMapItems(System.UInt64,OpenMetaverse.GridItemType,OpenMetaverse.GridLayerType)">
             <summary>
+            
             </summary>
+            <param name="regionHandle"></param>
+            <param name="item"></param>
+            <param name="layer"></param>
         </member>
-        <member name="F:OpenMetaverse.TextureAttributes.RGBA">
+        <member name="M:OpenMetaverse.GridManager.RequestMainlandSims(OpenMetaverse.GridLayerType)">
             <summary>
+            Request data for all mainland (Linden managed) simulators
             </summary>
         </member>
-        <member name="F:OpenMetaverse.TextureAttributes.RepeatU">
+        <member name="M:OpenMetaverse.GridManager.RequestRegionHandle(OpenMetaverse.UUID)">
             <summary>
+            Request the region handle for the specified region UUID
             </summary>
+            <param name="regionID">UUID of the region to look up</param>
         </member>
-        <member name="F:OpenMetaverse.TextureAttributes.RepeatV">
+        <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="F:OpenMetaverse.TextureAttributes.OffsetU">
+        <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="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.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.TextureAttributes.OffsetV">
+        <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.TextureAttributes.Rotation">
+        <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.Assets.AssetTexture">
             <summary>
+            Represents a texture
             </summary>
         </member>
-        <member name="F:OpenMetaverse.TextureAttributes.Material">
+        <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[])">
             <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="F:OpenMetaverse.TextureAttributes.Media">
+        <member name="M:OpenMetaverse.Assets.AssetTexture.#ctor(OpenMetaverse.Imaging.ManagedImage)">
             <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="F:OpenMetaverse.TextureAttributes.Glow">
+        <member name="M:OpenMetaverse.Assets.AssetTexture.Encode">
             <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="F:OpenMetaverse.TextureAttributes.All">
+        <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="T:OpenMetaverse.Rendering.LindenMesh.LODMesh">
+        <member name="M:OpenMetaverse.Assets.AssetTexture.DecodeLayerBoundaries">
             <summary>
-            Level of Detail mesh
+            Decodes the begin and end byte positions for each quality layer in
+            the image
             </summary>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Rendering.FacetedMesh">
+        <member name="P:OpenMetaverse.Assets.AssetTexture.AssetType">
+            <summary>Override the base classes AssetType</summary>
+        </member>
+        <member name="T:OpenMetaverse.Settings">
             <summary>
-            Contains all mesh faces that belong to a prim
+            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.Rendering.FacetedMesh.Faces">
-            <summary>List of primitive faces</summary>
+        <member name="F:OpenMetaverse.Settings.AGNI_LOGIN_SERVER">
+            <summary>Main grid login server</summary>
         </member>
-        <member name="M:OpenMetaverse.Rendering.FacetedMesh.TryDecodeFromAsset(OpenMetaverse.Primitive,OpenMetaverse.Assets.AssetMesh,OpenMetaverse.Rendering.DetailLevel,OpenMetaverse.Rendering.FacetedMesh@)">
+        <member name="F:OpenMetaverse.Settings.ADITI_LOGIN_SERVER">
+            <summary>Beta grid login server</summary>
+        </member>
+        <member name="F:OpenMetaverse.Settings.ENABLE_INVENTORY_STORE">
             <summary>
-            Decodes mesh asset into FacetedMesh
+            InventoryManager requests inventory information on login,
+            GridClient initializes an Inventory store for main inventory.
             </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.Voice.VoiceGateway.VoiceLoggingSettings.#ctor">
+        <member name="F:OpenMetaverse.Settings.ENABLE_LIBRARY_STORE">
             <summary>
-            Constructor for default logging settings
+            InventoryManager requests library information on login,
+            GridClient initializes an Inventory store for the library.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Voice.VoiceGateway.VoiceLoggingSettings.Enabled">
-            <summary>Enable logging</summary>
+        <member name="F:OpenMetaverse.Settings.PING_INTERVAL">
+            <summary>Number of milliseconds between sending pings to each sim</summary>
         </member>
-        <member name="F:OpenMetaverse.Voice.VoiceGateway.VoiceLoggingSettings.Folder">
-            <summary>The folder where any logs will be created</summary>
+        <member name="F:OpenMetaverse.Settings.DEFAULT_AGENT_UPDATE_INTERVAL">
+            <summary>Number of milliseconds between sending camera updates</summary>
         </member>
-        <member name="F:OpenMetaverse.Voice.VoiceGateway.VoiceLoggingSettings.FileNamePrefix">
-            <summary>This will be prepended to beginning of each log file</summary>
+        <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.Voice.VoiceGateway.VoiceLoggingSettings.FileNameSuffix">
-            <summary>The suffix or extension to be appended to each log file</summary>
+        <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.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 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="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">
+        <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.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.HTTP_INVENTORY">
             <summary>
-            Event for most mundane request reposnses.
+            Use Caps for fetching inventory where available
             </summary>
         </member>
-        <member name="E:OpenMetaverse.Voice.VoiceGateway.OnConnectorCreateResponse">
-            <summary>Response to Connector.Create request</summary>
+        <member name="F:OpenMetaverse.Settings.TRANSFER_TIMEOUT">
+            <summary>Number of milliseconds before an asset transfer will time
+            out</summary>
         </member>
-        <member name="E:OpenMetaverse.Voice.VoiceGateway.OnAuxGetCaptureDevicesResponse">
-            <summary>Response to Aux.GetCaptureDevices request</summary>
+        <member name="F:OpenMetaverse.Settings.TELEPORT_TIMEOUT">
+            <summary>Number of milliseconds before a teleport attempt will time
+            out</summary>
         </member>
-        <member name="E:OpenMetaverse.Voice.VoiceGateway.OnAuxGetRenderDevicesResponse">
-            <summary>Response to Aux.GetRenderDevices request</summary>
+        <member name="F:OpenMetaverse.Settings.LOGOUT_TIMEOUT">
+            <summary>Number of milliseconds before NetworkManager.Logout() will
+            time out</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 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="E:OpenMetaverse.Voice.VoiceGateway.OnAccountLoginResponse">
-            <summary>Response to Account.Login request</summary>
+        <member name="F:OpenMetaverse.Settings.LOGIN_TIMEOUT">
+            <summary>Number of milliseconds for xml-rpc to timeout</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 name="F:OpenMetaverse.Settings.RESEND_TIMEOUT">
+            <summary>Milliseconds before a packet is assumed lost and resent</summary>
         </member>
-        <member name="P:OpenMetaverse.Voice.VoiceGateway.CaptureDevices">
-            <summary>
-            List of audio input devices
-            </summary>
+        <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="P:OpenMetaverse.Voice.VoiceGateway.PlaybackDevices">
-            <summary>
-            List of audio output devices
-            </summary>
+        <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="P:OpenMetaverse.Voice.VoiceGateway.TestMode">
-            <summary>
-            Set audio test mode
-            </summary>
+        <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="M:OpenMetaverse.Voice.VoiceGateway.AccountLogin(System.String,System.String,System.String,System.String,System.String,System.Int32,System.Boolean)">
-            <summary>
-            This is used to login a specific user account(s). It may only be called after
-            Connector initialization has completed successfully
-            </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 name="F:OpenMetaverse.Settings.MAX_PENDING_ACKS">
+            <summary>Maximum number of queued ACKs to be sent before SendAcks()
+            is forced</summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.AccountLogout(System.String)">
-            <summary>
-            This is used to logout a user session. It should only be called with a valid AccountHandle.
-            </summary>
-            <param name="AccountHandle">Handle returned from successful Connector �login� request</param>
-            <returns>
-            </returns>
+        <member name="F:OpenMetaverse.Settings.STATS_QUEUE_SIZE">
+            <summary>Network stats queue length (seconds)</summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxGetCaptureDevices">
+        <member name="F:OpenMetaverse.Settings.CACHE_PRIMITIVES">
             <summary>
-            This is used to get a list of audio devices that can be used for capture (input) of voice.
+            Primitives will be reused when falling in/out of interest list (and shared between clients)
+             prims returning to interest list do not need re-requested
+             Helps also in not re-requesting prim.Properties for code that checks for a Properties == null per client
             </summary>
-            <returns>
-            </returns>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxGetRenderDevices">
+        <member name="F:OpenMetaverse.Settings.POOL_PARCEL_DATA">
             <summary>
-            This is used to get a list of audio devices that can be used for render (playback) of voice.
+            Pool parcel data between clients (saves on requesting multiple times when all clients may need it)
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxSetRenderDevice(System.String)">
+        <member name="F:OpenMetaverse.Settings.SIMULATOR_POOL_TIMEOUT">
             <summary>
-            This command is used to select the render device.
+            How long to preserve cached data when no client is connected to a simulator
+              The reason for setting it to something like 2 minutes is in case a client 
+               is running back and forth between region edges or a sim is comming and going
             </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)">
-            <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 name="F:OpenMetaverse.Settings.STORE_LAND_PATCHES">
+            <summary>Enable/disable storing terrain heightmaps in the 
+            TerrainManager</summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxCaptureAudioStart(System.Int32)">
-            <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 name="F:OpenMetaverse.Settings.SEND_AGENT_UPDATES">
+            <summary>Enable/disable sending periodic camera updates</summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.AuxCaptureAudioStop">
-            <summary>
-            This command is used to stop the audio capture process.
-            </summary>
-            <returns>
-            </returns>
+        <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="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 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="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 name="F:OpenMetaverse.Settings.SEND_PINGS">
+            <summary>Enable/disable the sending of pings to monitor lag and 
+            packet loss</summary>
         </member>
-        <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 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="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 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="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 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="M:OpenMetaverse.Voice.VoiceGateway.ConnectorMuteLocalSpeaker(System.String,System.Boolean)">
-            <summary>
-            Mute or unmute the speaker
-            </summary>
-            <param name="ConnectorHandle">Handle returned from successful Connector �create� request</param>
-            <param name="Mute">true (mute) or false (unmute)</param>
+        <member name="F:OpenMetaverse.Settings.ENABLE_CAPS">
+            <summary>Whether to establish connections to HTTP capabilities
+            servers for simulators</summary>
         </member>
-        <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 name="F:OpenMetaverse.Settings.ENABLE_SIMSTATS">
+            <summary>Whether to decode sim stats</summary>
         </member>
-        <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 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="M:OpenMetaverse.Voice.VoiceGateway.Start">
-            <summary>
-            Start up the Voice service.
-            </summary>
+        <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="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">
+        <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>
-            Cleanup oject resources
+            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.Voice.VoiceGateway.Network_EventQueueRunning(System.Object,OpenMetaverse.EventQueueRunningEventArgs)">
+        <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>
-            Request voice cap when changing regions
+            If true, an incoming parcel properties reply will automatically send
+            a request for the parcel access list
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnSessionStateChangeEvent(System.Object,OpenMetaverse.Voice.VoiceGateway.SessionStateChangeEventArgs)">
+        <member name="F:OpenMetaverse.Settings.ALWAYS_REQUEST_PARCEL_DWELL">
             <summary>
-            Handle a change in session state
+            if true, an incoming parcel properties reply will automatically send 
+            a request for the traffic count.
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.CloseSession(System.String)">
+        <member name="F:OpenMetaverse.Settings.USE_ASSET_CACHE">
             <summary>
-            Close a voice session
+            If true, images, and other assets downloaded from the server 
+            will be cached in a local directory
             </summary>
-            <param name="sessionHandle">
-            </param>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.FindSession(System.String,System.Boolean)">
+        <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>
-            Locate a Session context from its handle
+            Download textures using GetTexture capability when available
             </summary>
-            <remarks>Creates the session context if it does not exist.</remarks>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.cClient_OnComplete(OpenMetaverse.Http.CapsClient,OpenMetaverse.StructuredData.OSD,System.Exception)">
+        <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>
-            Handle completion of main voice cap request.
+            The Refresh timer inteval is used to set the delay between checks for stalled texture downloads
             </summary>
-            <param name="client">
-            </param>
-            <param name="result">
-            </param>
-            <param name="error">
-            </param>
+            <remarks>This is a static variable which applies to all instances</remarks>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnDaemonRunning">
+        <member name="F:OpenMetaverse.Settings.PIPELINE_REQUEST_TIMEOUT">
             <summary>
-            Daemon has started so connect to it.
+            Textures taking longer than this value will be flagged as timed out and removed from the pipeline
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnDaemonConnected">
+        <member name="F:OpenMetaverse.Settings.LOG_LEVEL">
             <summary>
-            The daemon TCP connection is open.
+            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>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnConnectorCreateResponse(System.Object,OpenMetaverse.Voice.VoiceGateway.VoiceConnectorEventArgs)">
+        <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="F:OpenMetaverse.Settings.LOG_DISKCACHE">
+            <summary>Log disk cache misses and other info</summary>
+        </member>
+        <member name="M:OpenMetaverse.Settings.#ctor(OpenMetaverse.GridClient)">
+            <summary>Constructor</summary>
+            <param name="client">Reference to a GridClient object</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>
+        <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="T:OpenMetaverse.GridClient">
             <summary>
-            Handle creation of the Connector.
+            Main class to expose grid functionality to clients. All of the
+            classes needed for sending and receiving data are accessible through 
+            this class.
             </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.Voice.VoiceGateway.connector_OnAuxGetRenderDevicesResponse(System.Object,OpenMetaverse.Voice.VoiceGateway.VoiceDevicesEventArgs)">
+        <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>
+        </member>
+        <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.#ctor">
             <summary>
-            Handle response to audio output device query
+            Default constructor
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.connector_OnAuxGetCaptureDevicesResponse(System.Object,OpenMetaverse.Voice.VoiceGateway.VoiceDevicesEventArgs)">
+        <member name="M:OpenMetaverse.GridClient.ToString">
             <summary>
-            Handle response to audio input device query
+            Return the full name of this instance
             </summary>
+            <returns>Client avatars full name</returns>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.ParcelChanged">
+        <member name="T:OpenMetaverse.AssetCache">
             <summary>
-            Set voice channel for new parcel
+            Class that handles the local asset cache
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.RequestParcelInfo(System.Uri)">
+        <member name="M:OpenMetaverse.AssetCache.#ctor(OpenMetaverse.GridClient)">
             <summary>
-            Request info from a parcel capability Uri.
+            Default constructor
             </summary>
-            <param name="cap">
-            </param>
+            <param name="client">A reference to the GridClient object</param>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.pCap_OnComplete(OpenMetaverse.Http.CapsClient,OpenMetaverse.StructuredData.OSD,System.Exception)">
+        <member name="M:OpenMetaverse.AssetCache.DestroyTimer">
             <summary>
-            Receive parcel voice cap
+            Disposes cleanup timer
             </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="M:OpenMetaverse.AssetCache.SetupTimer">
             <summary>
-            Tell Vivox where we are standing
+            Only create timer when needed
             </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.AssetCache.GetCachedAssetBytes(OpenMetaverse.UUID)">
             <summary>
-            Start and stop updating out position.
+            Return bytes read from the local asset cache, null if it does not exist
             </summary>
-            <param name="go">
-            </param>
+            <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.Voice.VoiceGateway.StartDaemon(System.String,System.String)">
+        <member name="M:OpenMetaverse.AssetCache.GetCachedImage(OpenMetaverse.UUID)">
             <summary>
-            Starts a thread that keeps the daemon running
+            Returns ImageDownload object of the
+            image from the local image cache, null if it does not exist
             </summary>
-            <param name="path">
-            </param>
-            <param name="args">
-            </param>
+            <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.Voice.VoiceGateway.StopDaemon">
+        <member name="M:OpenMetaverse.AssetCache.FileName(OpenMetaverse.UUID)">
             <summary>
-            Stops the daemon and the thread keeping it running
+            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.Voice.VoiceGateway.ConnectToDaemon(System.String,System.Int32)">
+        <member name="M:OpenMetaverse.AssetCache.StaticFileName(OpenMetaverse.UUID)">
             <summary>
+            Constructs a file name of the static cached asset
             </summary>
-            <param name="address">
-            </param>
-            <param name="port">
-            </param>
-            <returns>
-            </returns>
+            <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.Voice.VoiceGateway.SessionCreate(System.String,System.String,System.String,System.String,System.Boolean,System.Boolean,System.String)">
+        <member name="M:OpenMetaverse.AssetCache.SaveAssetToCache(OpenMetaverse.UUID,System.Byte[])">
             <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.
+            Saves an asset to the local cache
             </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>
+            <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.Voice.VoiceGateway.SessionConnect(System.String,System.String)">
+        <member name="M:OpenMetaverse.AssetCache.AssetFileName(OpenMetaverse.UUID)">
             <summary>
-            Used to accept a call
+            Get the file name of the asset stored with gived UUID
             </summary>
-            <param name="SessionHandle">SessionHandle such as received from SessionNewEvent</param>
-            <param name="AudioMedia">"default"</param>
-            <returns>
-            </returns>
+            <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.Voice.VoiceGateway.SessionRenderAudioStart(System.String,System.Boolean)">
+        <member name="M:OpenMetaverse.AssetCache.HasAsset(OpenMetaverse.UUID)">
             <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.
+            Checks if the asset exists in the local cache
             </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>
+            <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.Voice.VoiceGateway.SessionRenderAudioStop(System.String)">
+        <member name="M:OpenMetaverse.AssetCache.Clear">
             <summary>
-            This command is used to stop the audio render process.
+            Wipes out entire cache
             </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.Voice.VoiceGateway.SessionTerminate(System.String)">
+        <member name="M:OpenMetaverse.AssetCache.Prune">
             <summary>
-            This is used to �end� an established session (i.e. hang-up or disconnect).
+            Brings cache size to the 90% of the max size
             </summary>
-            <param name="SessionHandle">Handle returned from successful Session �create� request or a SessionNewEvent</param>
-            <returns>
-            </returns>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceGateway.SessionSet3DPosition(System.String,OpenMetaverse.Voice.VoicePosition,OpenMetaverse.Voice.VoicePosition)">
+        <member name="M:OpenMetaverse.AssetCache.BeginPrune">
             <summary>
-            Set the combined speaking and listening position in 3D space.
+            Asynchronously brings cache size to the 90% of the max size
             </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="M:OpenMetaverse.Voice.VoiceGateway.SessionSetParticipantVolumeForMe(System.String,System.String,System.Int32)">
+        <member name="M:OpenMetaverse.AssetCache.GetFileSize(System.IO.FileInfo[])">
             <summary>
-            Set User Volume for a particular user. Does not affect how other users hear that user.
+            Adds up file sizes passes in a FileInfo array
             </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="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="M:OpenMetaverse.Voice.VoiceParticipant.IDFromName(System.String)">
+        <member name="M:OpenMetaverse.AssetCache.Operational">
             <summary>
-            Extract the avatar UUID encoded in a SIP URI
+            Checks whether caching is enabled
             </summary>
-            <param name="inName">
-            </param>
-            <returns>
-            </returns>
         </member>
-        <member name="T:OpenMetaverse.Voice.VoiceSession">
+        <member name="M:OpenMetaverse.AssetCache.cleanerTimer_Elapsed(System.Object,System.Timers.ElapsedEventArgs)">
             <summary>
-            Represents a single Voice Session to the Vivox service.
+            Periodically prune the cache
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Voice.VoiceSession.Close">
+        <member name="M:OpenMetaverse.AssetCache.NiceFileSize(System.Int64)">
             <summary>
-            Close this session.
+            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="M:OpenMetaverse.Voice.VoiceSession.FindParticipant(System.String)">
+        <member name="P:OpenMetaverse.AssetCache.AutoPruneEnabled">
             <summary>
-            Look up an existing Participants in this session
+            Allows setting weather to periodicale prune the cache if it grows too big
+            Default is enabled, when caching is enabled
             </summary>
-            <param name="puri">
-            </param>
-            <returns>
-            </returns>
         </member>
-        <member name="T:OpenMetaverse.DictionaryChangeCallback">
+        <member name="P:OpenMetaverse.AssetCache.AutoPruneInterval">
             <summary>
+            How long (in ms) between cache checks (default is 5 min.) 
             </summary>
-            <param name="action">
-            </param>
-            <param name="entry">
-            </param>
         </member>
-        <member name="T:OpenMetaverse.TextureDownloadCallback">
+        <member name="T:OpenMetaverse.AssetCache.SortFilesByAccesTimeHelper">
             <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.
+            Helper class for sorting files by their last accessed time
             </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/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index 3e210ba..59e8083 100755
--- a/bin/OpenMetaverse.dll
+++ b/bin/OpenMetaverse.dll
diff --git a/bin/OpenMetaverse.dll.config b/bin/OpenMetaverse.dll.config
index f5423b2..6b7b999 100644
--- a/bin/OpenMetaverse.dll.config
+++ b/bin/OpenMetaverse.dll.config
@@ -1,5 +1,7 @@
 <configuration>
-    <dllmap os="osx" dll="openjpeg-dotnet.dll" target="lib64/libopenjpeg-dotnet.dylib" />
-    <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet-x86_64.dll" target="lib64/libopenjpeg-dotnet-x86_64" />
-    <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="lib32/libopenjpeg-dotnet" />
+    <dllmap os="osx" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2-1.5.0-dotnet-1.dylib" />
+    <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2-1.5.0-dotnet-1-x86_64" />
+    <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet-x86_64.dll" target="libopenjpeg-dotnet-2-1.5.0-dotnet-1-x86_64" />
+    <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2-1.5.0-dotnet-1-i686" />
+    <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet-x86_64.dll" target="libopenjpeg-dotnet-2-1.5.0-dotnet-1-i686" />
 </configuration>
diff --git a/bin/OpenMetaverseTypes.XML b/bin/OpenMetaverseTypes.XML
index ce1298e..56e3ac7 100644
--- a/bin/OpenMetaverseTypes.XML
+++ b/bin/OpenMetaverseTypes.XML
@@ -1,481 +1,1040 @@
 <?xml version="1.0"?>
 <doc>
     <assembly>
-        <name>/home/root/libomv-0.9.1-source/bin/OpenMetaverseTypes</name>
+        <name>OpenMetaverseTypes</name>
     </assembly>
     <members>
-        <member name="T:OpenMetaverse.BlockingQueue`1">
+        <member name="F:OpenMetaverse.Utils.DEG_TO_RAD">
+            <summary>Used for converting degrees to radians</summary>
+        </member>
+        <member name="F:OpenMetaverse.Utils.RAD_TO_DEG">
+            <summary>Used for converting radians to degrees</summary>
+        </member>
+        <member name="M:OpenMetaverse.Utils.BytesToInt16(System.Byte[])">
             <summary>
-            Same as Queue except Dequeue function blocks until there is an object to return.
-            Note: This class does not need to be synchronized
+            Convert the first two bytes starting in the byte array in
+            little endian ordering to a signed short integer
             </summary>
+            <param name="bytes">An array two bytes or longer</param>
+            <returns>A signed short integer, will be zero if a short can't be
+            read at the given position</returns>
         </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.#ctor(System.Collections.Generic.IEnumerable{`0})">
+        <member name="M:OpenMetaverse.Utils.BytesToInt16(System.Byte[],System.Int32)">
             <summary>
-            Create new BlockingQueue.
+            Convert the first two bytes starting at the given position in
+            little endian ordering to a signed short integer
             </summary>
-            <param name="col">The System.Collections.ICollection to copy elements from</param>
+            <param name="bytes">An array two bytes or longer</param>
+            <param name="pos">Position in the array to start reading</param>
+            <returns>A signed short integer, will be zero if a short can't be
+            read at the given position</returns>
         </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.#ctor(System.Int32)">
+        <member name="M:OpenMetaverse.Utils.BytesToInt(System.Byte[],System.Int32)">
             <summary>
-            Create new BlockingQueue.
+            Convert the first four bytes starting at the given position in
+            little endian ordering to a signed integer
             </summary>
-            <param name="capacity">The initial number of elements that the queue can contain</param>
+            <param name="bytes">An array four bytes or longer</param>
+            <param name="pos">Position to start reading the int from</param>
+            <returns>A signed integer, will be zero if an int can't be read
+            at the given position</returns>
         </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.#ctor">
+        <member name="M:OpenMetaverse.Utils.BytesToInt(System.Byte[])">
             <summary>
-            Create new BlockingQueue.
+            Convert the first four bytes of the given array in little endian
+            ordering to a signed integer
             </summary>
+            <param name="bytes">An array four bytes or longer</param>
+            <returns>A signed integer, will be zero if the array contains
+            less than four bytes</returns>
         </member>
-        <member name="P:OpenMetaverse.BlockingQueue`1.Closed">
+        <member name="M:OpenMetaverse.Utils.BytesToInt64(System.Byte[])">
             <summary>
-            Gets flag indicating if queue has been closed.
+            Convert the first eight bytes of the given array in little endian
+            ordering to a signed long integer
             </summary>
+            <param name="bytes">An array eight bytes or longer</param>
+            <returns>A signed long integer, will be zero if the array contains
+            less than eight bytes</returns>
         </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.Finalize">
+        <member name="M:OpenMetaverse.Utils.BytesToInt64(System.Byte[],System.Int32)">
             <summary>
-            BlockingQueue Destructor (Close queue, resume any waiting thread).
+            Convert the first eight bytes starting at the given position in
+            little endian ordering to a signed long integer
             </summary>
+            <param name="bytes">An array eight bytes or longer</param>
+            <param name="pos">Position to start reading the long from</param>
+            <returns>A signed long integer, will be zero if a long can't be read
+            at the given position</returns>
         </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.Clear">
+        <member name="M:OpenMetaverse.Utils.BytesToUInt16(System.Byte[],System.Int32)">
             <summary>
-            Remove all objects from the Queue.
+            Convert the first two bytes starting at the given position in
+            little endian ordering to an unsigned short
             </summary>
+            <param name="bytes">Byte array containing the ushort</param>
+            <param name="pos">Position to start reading the ushort from</param>
+            <returns>An unsigned short, will be zero if a ushort can't be read
+            at the given position</returns>
         </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.Close">
+        <member name="M:OpenMetaverse.Utils.BytesToUInt16(System.Byte[])">
             <summary>
-            Remove all objects from the Queue, resume all dequeue threads.
+            Convert two bytes in little endian ordering to an unsigned short
             </summary>
+            <param name="bytes">Byte array containing the ushort</param>
+            <returns>An unsigned short, will be zero if a ushort can't be
+            read</returns>
         </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.Dequeue">
+        <member name="M:OpenMetaverse.Utils.BytesToUInt(System.Byte[],System.Int32)">
             <summary>
-            Removes and returns the object at the beginning of the Queue.
+            Convert the first four bytes starting at the given position in
+            little endian ordering to an unsigned integer
             </summary>
-            <returns>Object in queue.</returns>
+            <param name="bytes">Byte array containing the uint</param>
+            <param name="pos">Position to start reading the uint from</param>
+            <returns>An unsigned integer, will be zero if a uint can't be read
+            at the given position</returns>
         </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.Dequeue(System.TimeSpan)">
+        <member name="M:OpenMetaverse.Utils.BytesToUInt(System.Byte[])">
             <summary>
-            Removes and returns the object at the beginning of the Queue.
+            Convert the first four bytes of the given array in little endian
+            ordering to an unsigned integer
             </summary>
-            <param name="timeout">time to wait before returning</param>
-            <returns>Object in queue.</returns>
+            <param name="bytes">An array four bytes or longer</param>
+            <returns>An unsigned integer, will be zero if the array contains
+            less than four bytes</returns>
         </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.Dequeue(System.Int32)">
+        <member name="M:OpenMetaverse.Utils.BytesToUInt64(System.Byte[])">
             <summary>
-            Removes and returns the object at the beginning of the Queue.
+            Convert the first eight bytes of the given array in little endian
+            ordering to an unsigned 64-bit integer
             </summary>
-            <param name="timeout">time to wait before returning (in milliseconds)</param>
-            <returns>Object in queue.</returns>
+            <param name="bytes">An array eight bytes or longer</param>
+            <returns>An unsigned 64-bit integer, will be zero if the array
+            contains less than eight bytes</returns>
         </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.Enqueue(`0)">
+        <member name="M:OpenMetaverse.Utils.BytesToFloat(System.Byte[],System.Int32)">
             <summary>
-            Adds an object to the end of the Queue
+            Convert four bytes in little endian ordering to a floating point
+            value
             </summary>
-            <param name="obj">Object to put in queue</param>
+            <param name="bytes">Byte array containing a little ending floating
+            point value</param>
+            <param name="pos">Starting position of the floating point value in
+            the byte array</param>
+            <returns>Single precision value</returns>
         </member>
-        <member name="M:OpenMetaverse.BlockingQueue`1.Open">
+        <member name="M:OpenMetaverse.Utils.IntToBytes(System.Int32)">
             <summary>
-            Open Queue.
+            Convert an integer to a byte array in little endian format
             </summary>
+            <param name="value">The integer to convert</param>
+            <returns>A four byte little endian array</returns>
         </member>
-        <member name="M:OpenMetaverse.CircularQueue`1.#ctor(OpenMetaverse.CircularQueue{`0})">
+        <member name="M:OpenMetaverse.Utils.IntToBytesBig(System.Int32)">
             <summary>
-            Copy constructor
+            Convert an integer to a byte array in big endian format
             </summary>
-            <param name="queue">Circular queue to copy</param>
+            <param name="value">The integer to convert</param>
+            <returns>A four byte big endian array</returns>
         </member>
-        <member name="T:OpenMetaverse.Color4">
+        <member name="M:OpenMetaverse.Utils.Int64ToBytes(System.Int64)">
             <summary>
-            An 8-bit color structure including an alpha channel
+            Convert a 64-bit integer to a byte array in little endian format
             </summary>
+            <param name="value">The value to convert</param>
+            <returns>An 8 byte little endian array</returns>
         </member>
-        <member name="M:OpenMetaverse.Color4.#ctor(System.Byte,System.Byte,System.Byte,System.Byte)">
+        <member name="M:OpenMetaverse.Utils.UInt64ToBytes(System.UInt64)">
             <summary>
+            Convert a 64-bit unsigned integer to a byte array in little endian
+            format
             </summary>
-            <param name="r">
-            </param>
-            <param name="g">
-            </param>
-            <param name="b">
-            </param>
-            <param name="a">
-            </param>
+            <param name="value">The value to convert</param>
+            <returns>An 8 byte little endian array</returns>
         </member>
-        <member name="M:OpenMetaverse.Color4.#ctor(System.Byte[],System.Int32,System.Boolean)">
+        <member name="M:OpenMetaverse.Utils.FloatToBytes(System.Single)">
             <summary>
-            Builds a color from a byte array
+            Convert a floating point value to four bytes in little endian
+            ordering
             </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="value">A floating point value</param>
+            <returns>A four byte array containing the value in little endian
+            ordering</returns>
         </member>
-        <member name="M:OpenMetaverse.Color4.#ctor(System.Byte[],System.Int32,System.Boolean,System.Boolean)">
+        <member name="M:OpenMetaverse.Utils.UIntToHexString(System.UInt32)">
             <summary>
-            Returns the raw bytes for this vector
+            Converts an unsigned integer to a hexadecimal string
             </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="i">An unsigned integer to convert to a string</param>
+            <returns>A hexadecimal string 10 characters long</returns>
+            <example>0x7fffffff</example>
         </member>
-        <member name="M:OpenMetaverse.Color4.#ctor(OpenMetaverse.Color4)">
+        <member name="M:OpenMetaverse.Utils.BytesToString(System.Byte[])">
             <summary>
-            Copy constructor
+            Convert a variable length UTF8 byte array to a string
             </summary>
-            <param name="color">Color to copy</param>
+            <param name="bytes">The UTF8 encoded byte array to convert</param>
+            <returns>The decoded string</returns>
         </member>
-        <member name="F:OpenMetaverse.Color4.R">
-            <summary>Red</summary>
+        <member name="M:OpenMetaverse.Utils.BytesToHexString(System.Byte[],System.String)">
+            <summary>
+            Converts a byte array to a string containing hexadecimal characters
+            </summary>
+            <param name="bytes">The byte array to convert to a string</param>
+            <param name="fieldName">The name of the field to prepend to each
+            line of the string</param>
+            <returns>A string containing hexadecimal characters on multiple
+            lines. Each line is prepended with the field name</returns>
         </member>
-        <member name="F:OpenMetaverse.Color4.G">
-            <summary>Green</summary>
+        <member name="M:OpenMetaverse.Utils.BytesToHexString(System.Byte[],System.Int32,System.String)">
+            <summary>
+            Converts a byte array to a string containing hexadecimal characters
+            </summary>
+            <param name="bytes">The byte array to convert to a string</param>
+            <param name="length">Number of bytes in the array to parse</param>
+            <param name="fieldName">A string to prepend to each line of the hex
+            dump</param>
+            <returns>A string containing hexadecimal characters on multiple
+            lines. Each line is prepended with the field name</returns>
         </member>
-        <member name="F:OpenMetaverse.Color4.B">
-            <summary>Blue</summary>
+        <member name="M:OpenMetaverse.Utils.StringToBytes(System.String)">
+            <summary>
+            Convert a string to a UTF8 encoded byte array
+            </summary>
+            <param name="str">The string to convert</param>
+            <returns>A null-terminated UTF8 byte array</returns>
         </member>
-        <member name="F:OpenMetaverse.Color4.A">
-            <summary>Alpha</summary>
+        <member name="M:OpenMetaverse.Utils.HexStringToBytes(System.String,System.Boolean)">
+            <summary>
+            Converts a string containing hexadecimal characters to a byte array
+            </summary>
+            <param name="hexString">String containing hexadecimal characters</param>
+            <param name="handleDirty">If true, gracefully handles null, empty and
+            uneven strings as well as stripping unconvertable characters</param>
+            <returns>The converted byte array</returns>
         </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.Utils.IsHexDigit(System.Char)">
+            <summary>
+            Returns true is c is a hexadecimal digit (A-F, a-f, 0-9)
+            </summary>
+            <param name="c">Character to test</param>
+            <returns>true if hex digit, false if not</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.Utils.HexToByte(System.String)">
+            <summary>
+            Converts 1 or 2 character string into equivalant byte value
+            </summary>
+            <param name="hex">1 or 2 character string</param>
+            <returns>byte</returns>
         </member>
-        <member name="M:OpenMetaverse.Color4.CompareTo(OpenMetaverse.Color4)">
+        <member name="M:OpenMetaverse.Utils.FloatToByte(System.Single,System.Single,System.Single)">
             <summary>
-            IComparable.CompareTo implementation
+            Convert a float value to a byte given a minimum and maximum range
             </summary>
-            <remarks>Sorting ends up like this: |--Grayscale--||--Color--|.
-            Alpha is only used when the colors are otherwise equivalent</remarks>
+            <param name="val">Value to convert to a byte</param>
+            <param name="lower">Minimum value range</param>
+            <param name="upper">Maximum value range</param>
+            <returns>A single byte representing the original float value</returns>
         </member>
-        <member name="M:OpenMetaverse.Color4.FromBytes(System.Byte[],System.Int32,System.Boolean,System.Boolean)">
+        <member name="M:OpenMetaverse.Utils.ByteToFloat(System.Byte[],System.Int32,System.Single,System.Single)">
             <summary>
-            Builds a color from a byte array
+            Convert a byte to a float value given a minimum and maximum range
             </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>
+            <param name="bytes">Byte array to get the byte from</param>
+            <param name="pos">Position in the byte array the desired byte is at</param>
+            <param name="lower">Minimum value range</param>
+            <param name="upper">Maximum value range</param>
+            <returns>A float value inclusively between lower and upper</returns>
         </member>
-        <member name="M:OpenMetaverse.Color4.ToBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Utils.ByteToFloat(System.Byte,System.Single,System.Single)">
             <summary>
-            Writes the raw bytes for this color to a byte array
+            Convert a byte to a float value given a minimum and maximum range
             </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="val">Byte to convert to a float value</param>
+            <param name="lower">Minimum value range</param>
+            <param name="upper">Maximum value range</param>
+            <returns>A float value inclusively between lower and upper</returns>
         </member>
-        <member name="M:OpenMetaverse.Color4.ToBytes(System.Byte[],System.Int32,System.Boolean)">
+        <member name="M:OpenMetaverse.Utils.TryParseSingle(System.String,System.Single@)">
             <summary>
-            Serializes this color into four bytes in a byte array
+            Attempts to parse a floating point value from a string, using an
+            EN-US number format
             </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="s">String to parse</param>
+            <param name="result">Resulting floating point number</param>
+            <returns>True if the parse was successful, otherwise false</returns>
         </member>
-        <member name="M:OpenMetaverse.Color4.ToFloatBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Utils.TryParseDouble(System.String,System.Double@)">
             <summary>
-            Writes the raw bytes for this color to a byte array
+            Attempts to parse a floating point value from a string, using an
+            EN-US number format
             </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="s">String to parse</param>
+            <param name="result">Resulting floating point number</param>
+            <returns>True if the parse was successful, otherwise false</returns>
         </member>
-        <member name="M:OpenMetaverse.Color4.ClampValues">
+        <member name="M:OpenMetaverse.Utils.TryParseHex(System.String,System.UInt32@)">
             <summary>
-            Ensures that values are in range 0-1
+            Tries to parse an unsigned 32-bit integer from a hexadecimal string
             </summary>
+            <param name="s">String to parse</param>
+            <param name="result">Resulting integer</param>
+            <returns>True if the parse was successful, otherwise false</returns>
         </member>
-        <member name="M:OpenMetaverse.Color4.FromHSV(System.Double,System.Double,System.Double)">
+        <member name="M:OpenMetaverse.Utils.EnumToText(System.Enum)">
             <summary>
-            Create an RGB color from a hue, saturation, value combination
+            Returns text specified in EnumInfo attribute of the enumerator
+            To add the text use [EnumInfo(Text = "Some nice text here")] before declaration
+            of enum values
             </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>
+            <param name="value">Enum value</param>
+            <returns>Text representation of the enum</returns>
         </member>
-        <member name="M:OpenMetaverse.Color4.Lerp(OpenMetaverse.Color4,OpenMetaverse.Color4,System.Single)">
+        <member name="M:OpenMetaverse.Utils.AssetTypeToString(OpenMetaverse.AssetType)">
             <summary>
-            Performs linear interpolation between two colors
+            Takes an AssetType and returns the string representation
             </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="type">The source <seealso cref="T:OpenMetaverse.AssetType"/></param>
+            <returns>The string version of the AssetType</returns>
         </member>
-        <member name="T:OpenMetaverse.EnumInfoAttribute">
+        <member name="M:OpenMetaverse.Utils.StringToAssetType(System.String)">
             <summary>
-            Attribute class that allows extra attributes to be attached to ENUMs
+            Translate a string name of an AssetType into the proper Type
             </summary>
+            <param name="type">A string containing the AssetType name</param>
+            <returns>The AssetType which matches the string name, or AssetType.Unknown if no match was found</returns>
         </member>
-        <member name="M:OpenMetaverse.EnumInfoAttribute.#ctor">
-            <summary>Default initializer</summary>
+        <member name="M:OpenMetaverse.Utils.InventoryTypeToString(OpenMetaverse.InventoryType)">
+            <summary>
+            Convert an InventoryType to a string
+            </summary>
+            <param name="type">The <seealso cref="T:InventoryType"/> to convert</param>
+            <returns>A string representation of the source</returns>
         </member>
-        <member name="M:OpenMetaverse.EnumInfoAttribute.#ctor(System.String)">
-            <summary>Text used when presenting ENUM to user</summary>
+        <member name="M:OpenMetaverse.Utils.StringToInventoryType(System.String)">
+            <summary>
+            Convert a string into a valid InventoryType
+            </summary>
+            <param name="type">A string representation of the InventoryType to convert</param>
+            <returns>A InventoryType object which matched the type</returns>
         </member>
-        <member name="F:OpenMetaverse.EnumInfoAttribute.Text">
-            <summary>Text used when presenting ENUM to user</summary>
+        <member name="M:OpenMetaverse.Utils.SaleTypeToString(OpenMetaverse.SaleType)">
+            <summary>
+            Convert a SaleType to a string
+            </summary>
+            <param name="type">The <seealso cref="T:SaleType"/> to convert</param>
+            <returns>A string representation of the source</returns>
         </member>
-        <member name="T:OpenMetaverse.AssetType">
+        <member name="M:OpenMetaverse.Utils.StringToSaleType(System.String)">
             <summary>
-            The different types of grid assets
+            Convert a string into a valid SaleType
             </summary>
+            <param name="value">A string representation of the SaleType to convert</param>
+            <returns>A SaleType object which matched the type</returns>
         </member>
-        <member name="F:OpenMetaverse.AssetType.Unknown">
-            <summary>Unknown asset type</summary>
+        <member name="M:OpenMetaverse.Utils.StringToAttachmentPoint(System.String)">
+            <summary>
+            Converts a string used in LLSD to AttachmentPoint type
+            </summary>
+            <param name="value">String representation of AttachmentPoint to convert</param>
+            <returns>AttachmentPoint enum</returns>
         </member>
-        <member name="F:OpenMetaverse.AssetType.Texture">
-            <summary>Texture asset, stores in JPEG2000 J2C stream format</summary>
+        <member name="M:OpenMetaverse.Utils.CopyBytes(System.Byte[])">
+            <summary>
+            Copy a byte array
+            </summary>
+            <param name="bytes">Byte array to copy</param>
+            <returns>A copy of the given byte array</returns>
         </member>
-        <member name="F:OpenMetaverse.AssetType.Sound">
-            <summary>Sound asset</summary>
+        <member name="M:OpenMetaverse.Utils.UIntsToLong(System.UInt32,System.UInt32)">
+            <summary>
+            Packs to 32-bit unsigned integers in to a 64-bit unsigned integer
+            </summary>
+            <param name="a">The left-hand (or X) value</param>
+            <param name="b">The right-hand (or Y) value</param>
+            <returns>A 64-bit integer containing the two 32-bit input values</returns>
         </member>
-        <member name="F:OpenMetaverse.AssetType.CallingCard">
-            <summary>Calling card for another avatar</summary>
+        <member name="M:OpenMetaverse.Utils.LongToUInts(System.UInt64,System.UInt32@,System.UInt32@)">
+            <summary>
+            Unpacks two 32-bit unsigned integers from a 64-bit unsigned integer
+            </summary>
+            <param name="a">The 64-bit input integer</param>
+            <param name="b">The left-hand (or X) output value</param>
+            <param name="c">The right-hand (or Y) output value</param>
         </member>
-        <member name="F:OpenMetaverse.AssetType.Landmark">
-            <summary>Link to a location in world</summary>
+        <member name="M:OpenMetaverse.Utils.IPToUInt(System.Net.IPAddress)">
+            <summary>
+            Convert an IP address object to an unsigned 32-bit integer
+            </summary>
+            <param name="address">IP address to convert</param>
+            <returns>32-bit unsigned integer holding the IP address bits</returns>
         </member>
-        <member name="F:OpenMetaverse.AssetType.Clothing">
-            <summary>Collection of textures and parameters that can be
-            worn by an avatar</summary>
+        <member name="M:OpenMetaverse.Utils.GetUnixTime">
+            <summary>
+            Gets a unix timestamp for the current time
+            </summary>
+            <returns>An unsigned integer representing a unix timestamp for now</returns>
         </member>
-        <member name="F:OpenMetaverse.AssetType.Object">
-            <summary>Primitive that can contain textures, sounds,
-            scripts and more</summary>
+        <member name="M:OpenMetaverse.Utils.UnixTimeToDateTime(System.UInt32)">
+            <summary>
+            Convert a UNIX timestamp to a native DateTime object
+            </summary>
+            <param name="timestamp">An unsigned integer representing a UNIX
+            timestamp</param>
+            <returns>A DateTime object containing the same time specified in
+            the given timestamp</returns>
         </member>
-        <member name="F:OpenMetaverse.AssetType.Notecard">
-            <summary>Notecard asset</summary>
+        <member name="M:OpenMetaverse.Utils.UnixTimeToDateTime(System.Int32)">
+            <summary>
+            Convert a UNIX timestamp to a native DateTime object
+            </summary>
+            <param name="timestamp">A signed integer representing a UNIX
+            timestamp</param>
+            <returns>A DateTime object containing the same time specified in
+            the given timestamp</returns>
         </member>
-        <member name="F:OpenMetaverse.AssetType.Folder">
-            <summary>Holds a collection of inventory items</summary>
+        <member name="M:OpenMetaverse.Utils.DateTimeToUnixTime(System.DateTime)">
+            <summary>
+            Convert a native DateTime object to a UNIX timestamp
+            </summary>
+            <param name="time">A DateTime object you want to convert to a 
+            timestamp</param>
+            <returns>An unsigned integer representing a UNIX timestamp</returns>
         </member>
-        <member name="F:OpenMetaverse.AssetType.RootFolder">
-            <summary>Root inventory folder</summary>
+        <member name="M:OpenMetaverse.Utils.Swap``1(``0@,``0@)">
+            <summary>
+            Swap two values
+            </summary>
+            <typeparam name="T">Type of the values to swap</typeparam>
+            <param name="lhs">First value</param>
+            <param name="rhs">Second value</param>
         </member>
-        <member name="F:OpenMetaverse.AssetType.LSLText">
-            <summary>Linden scripting language script</summary>
+        <member name="M:OpenMetaverse.Utils.EnumTryParse``1(System.String,``0@)">
+            <summary>
+            Try to parse an enumeration value from a string
+            </summary>
+            <typeparam name="T">Enumeration type</typeparam>
+            <param name="strType">String value to parse</param>
+            <param name="result">Enumeration value on success</param>
+            <returns>True if the parsing succeeded, otherwise false</returns>
         </member>
-        <member name="F:OpenMetaverse.AssetType.LSLBytecode">
-            <summary>LSO bytecode for a script</summary>
+        <member name="M:OpenMetaverse.Utils.SwapWords(System.Byte)">
+            <summary>
+            Swaps the high and low words in a byte. Converts aaaabbbb to bbbbaaaa
+            </summary>
+            <param name="value">Byte to swap the words in</param>
+            <returns>Byte value with the words swapped</returns>
         </member>
-        <member name="F:OpenMetaverse.AssetType.TextureTGA">
-            <summary>Uncompressed TGA texture</summary>
+        <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>
+            <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="F:OpenMetaverse.AssetType.Bodypart">
-            <summary>Collection of textures and shape parameters that can
-            be worn</summary>
+        <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 
+            culture</summary>
         </member>
-        <member name="F:OpenMetaverse.AssetType.TrashFolder">
-            <summary>Trash folder</summary>
+        <member name="F:OpenMetaverse.Utils.Epoch">
+            <summary>UNIX epoch in DateTime format</summary>
         </member>
-        <member name="F:OpenMetaverse.AssetType.SnapshotFolder">
-            <summary>Snapshot folder</summary>
+        <member name="F:OpenMetaverse.Utils.MD5Builder">
+            <summary>Provide a single instance of the MD5 class to avoid making
+            duplicate copies and handle thread safety</summary>
         </member>
-        <member name="F:OpenMetaverse.AssetType.LostAndFoundFolder">
-            <summary>Lost and found folder</summary>
+        <member name="F:OpenMetaverse.Utils.SHA1Builder">
+            <summary>Provide a single instance of the SHA-1 class to avoid
+            making duplicate copies and handle thread safety</summary>
         </member>
-        <member name="F:OpenMetaverse.AssetType.SoundWAV">
-            <summary>Uncompressed sound</summary>
+        <member name="F:OpenMetaverse.Utils.RNG">
+            <summary>Provide a single instance of a random number generator
+            to avoid making duplicate copies and handle thread safety</summary>
         </member>
-        <member name="F:OpenMetaverse.AssetType.ImageTGA">
-            <summary>Uncompressed TGA non-square image, not to be used as a
-            texture</summary>
+        <member name="M:OpenMetaverse.Utils.Clamp(System.Single,System.Single,System.Single)">
+            <summary>
+            Clamp a given value between a range
+            </summary>
+            <param name="value">Value to clamp</param>
+            <param name="min">Minimum allowable value</param>
+            <param name="max">Maximum allowable value</param>
+            <returns>A value inclusively between lower and upper</returns>
         </member>
-        <member name="F:OpenMetaverse.AssetType.ImageJPEG">
-            <summary>Compressed JPEG non-square image, not to be used as a
-            texture</summary>
+        <member name="M:OpenMetaverse.Utils.Clamp(System.Double,System.Double,System.Double)">
+            <summary>
+            Clamp a given value between a range
+            </summary>
+            <param name="value">Value to clamp</param>
+            <param name="min">Minimum allowable value</param>
+            <param name="max">Maximum allowable value</param>
+            <returns>A value inclusively between lower and upper</returns>
         </member>
-        <member name="F:OpenMetaverse.AssetType.Animation">
-            <summary>Animation</summary>
+        <member name="M:OpenMetaverse.Utils.Clamp(System.Int32,System.Int32,System.Int32)">
+            <summary>
+            Clamp a given value between a range
+            </summary>
+            <param name="value">Value to clamp</param>
+            <param name="min">Minimum allowable value</param>
+            <param name="max">Maximum allowable value</param>
+            <returns>A value inclusively between lower and upper</returns>
         </member>
-        <member name="F:OpenMetaverse.AssetType.Gesture">
-            <summary>Sequence of animations, sounds, chat, and pauses</summary>
+        <member name="M:OpenMetaverse.Utils.Round(System.Single)">
+            <summary>
+            Round a floating-point value to the nearest integer
+            </summary>
+            <param name="val">Floating point number to round</param>
+            <returns>Integer</returns>
         </member>
-        <member name="F:OpenMetaverse.AssetType.Simstate">
-            <summary>Simstate file</summary>
+        <member name="M:OpenMetaverse.Utils.IsFinite(System.Single)">
+            <summary>
+            Test if a single precision float is a finite number
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AssetType.FavoriteFolder">
-            <summary>Contains landmarks for favorites</summary>
+        <member name="M:OpenMetaverse.Utils.IsFinite(System.Double)">
+            <summary>
+            Test if a double precision float is a finite number
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.AssetType.Link">
-            <summary>Asset is a link to another inventory item</summary>
+        <member name="M:OpenMetaverse.Utils.Distance(System.Single,System.Single)">
+            <summary>
+            Get the distance between two floating-point values
+            </summary>
+            <param name="value1">First value</param>
+            <param name="value2">Second value</param>
+            <returns>The distance between the two values</returns>
         </member>
-        <member name="F:OpenMetaverse.AssetType.LinkFolder">
-            <summary>Asset is a link to another inventory folder</summary>
+        <member name="M:OpenMetaverse.Utils.MD5(System.Byte[])">
+            <summary>
+            Compute the MD5 hash for a byte array
+            </summary>
+            <param name="data">Byte array to compute the hash for</param>
+            <returns>MD5 hash of the input data</returns>
         </member>
-        <member name="F:OpenMetaverse.AssetType.EnsembleStart">
-            <summary>Beginning of the range reserved for ensembles</summary>
+        <member name="M:OpenMetaverse.Utils.SHA1(System.Byte[])">
+            <summary>
+            Compute the SHA1 hash for a byte array
+            </summary>
+            <param name="data">Byte array to compute the hash for</param>
+            <returns>SHA1 hash of the input data</returns>
         </member>
-        <member name="F:OpenMetaverse.AssetType.EnsembleEnd">
-            <summary>End of the range reserved for ensembles</summary>
+        <member name="M:OpenMetaverse.Utils.SHA1String(System.String)">
+            <summary>
+            Calculate the SHA1 hash of a given string
+            </summary>
+            <param name="value">The string to hash</param>
+            <returns>The SHA1 hash as a string</returns>
         </member>
-        <member name="F:OpenMetaverse.AssetType.CurrentOutfitFolder">
-            <summary>Folder containing inventory links to wearables and attachments
-            that are part of the current outfit</summary>
+        <member name="M:OpenMetaverse.Utils.SHA256(System.Byte[])">
+            <summary>
+            Compute the SHA256 hash for a byte array
+            </summary>
+            <param name="data">Byte array to compute the hash for</param>
+            <returns>SHA256 hash of the input data</returns>
         </member>
-        <member name="F:OpenMetaverse.AssetType.OutfitFolder">
-            <summary>Folder containing inventory items or links to
-            inventory items of wearables and attachments
-            together make a full outfit</summary>
+        <member name="M:OpenMetaverse.Utils.SHA256String(System.String)">
+            <summary>
+            Calculate the SHA256 hash of a given string
+            </summary>
+            <param name="value">The string to hash</param>
+            <returns>The SHA256 hash as a string</returns>
         </member>
-        <member name="F:OpenMetaverse.AssetType.MyOutfitsFolder">
-            <summary>Root folder for the folders of type OutfitFolder</summary>
+        <member name="M:OpenMetaverse.Utils.MD5(System.String)">
+            <summary>
+            Calculate the MD5 hash of a given string
+            </summary>
+            <param name="password">The password to hash</param>
+            <returns>An MD5 hash in string format, with $1$ prepended</returns>
         </member>
-        <member name="F:OpenMetaverse.AssetType.Mesh">
-            <summary>Linden mesh format</summary>
+        <member name="M:OpenMetaverse.Utils.MD5String(System.String)">
+            <summary>
+            Calculate the MD5 hash of a given string
+            </summary>
+            <param name="value">The string to hash</param>
+            <returns>The MD5 hash as a string</returns>
         </member>
-        <member name="T:OpenMetaverse.InventoryType">
+        <member name="M:OpenMetaverse.Utils.RandomDouble">
             <summary>
-            Inventory Item Types, eg Script, Notecard, Folder, etc
+            Generate a random double precision floating point value
             </summary>
+            <returns>Random value of type double</returns>
         </member>
-        <member name="F:OpenMetaverse.InventoryType.Unknown">
+        <member name="M:OpenMetaverse.Utils.GetRunningPlatform">
+            <summary>
+            Get the current running platform
+            </summary>
+            <returns>Enumeration of the current platform we are running on</returns>
+        </member>
+        <member name="M:OpenMetaverse.Utils.GetRunningRuntime">
+            <summary>
+            Get the current running runtime
+            </summary>
+            <returns>Enumeration of the current runtime we are running on</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.InventoryType.Texture">
-            <summary>Texture</summary>
+        <member name="F:OpenMetaverse.Utils.Platform.Windows">
+            <summary>Microsoft Windows</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryType.Sound">
-            <summary>Sound</summary>
+        <member name="F:OpenMetaverse.Utils.Platform.WindowsCE">
+            <summary>Microsoft Windows CE</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryType.CallingCard">
-            <summary>Calling Card</summary>
+        <member name="F:OpenMetaverse.Utils.Platform.Linux">
+            <summary>Linux</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryType.Landmark">
-            <summary>Landmark</summary>
+        <member name="F:OpenMetaverse.Utils.Platform.OSX">
+            <summary>Apple OSX</summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryType.Notecard">
-            <summary>Notecard</summary>
+        <member name="T:OpenMetaverse.Utils.Runtime">
+            <summary>
+            Runtime platform
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryType.Category">
+        <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="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="F:OpenMetaverse.InventoryType.Folder">
-            <summary>Folder</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.InventoryType.RootCategory">
+        <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="F:OpenMetaverse.InventoryType.LSL">
-            <summary>an LSL Script</summary>
+        <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.InventoryType.Snapshot">
+        <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="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="F:OpenMetaverse.InventoryType.Attachment">
+        <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.InventoryType.Wearable">
+        <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.InventoryType.Animation">
+        <member name="M:OpenMetaverse.BlockingQueue`1.#ctor">
             <summary>
+            Create new BlockingQueue.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryType.Gesture">
+        <member name="M:OpenMetaverse.BlockingQueue`1.Finalize">
             <summary>
+            BlockingQueue Destructor (Close queue, resume any waiting thread).
             </summary>
         </member>
-        <member name="F:OpenMetaverse.InventoryType.Mesh">
+        <member name="M:OpenMetaverse.BlockingQueue`1.Clear">
             <summary>
+            Remove all objects from the Queue.
             </summary>
         </member>
-        <member name="T:OpenMetaverse.SaleType">
+        <member name="M:OpenMetaverse.BlockingQueue`1.Close">
             <summary>
-            Item Sale Status
+            Remove all objects from the Queue, resume all dequeue threads.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.SaleType.Not">
-            <summary>Not for sale</summary>
+        <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="F:OpenMetaverse.SaleType.Original">
-            <summary>The original is for sale</summary>
+        <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="F:OpenMetaverse.SaleType.Copy">
-            <summary>Copies are for sale</summary>
+        <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="F:OpenMetaverse.SaleType.Contents">
-            <summary>The contents of the object are for sale</summary>
+        <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="T:OpenMetaverse.WearableType">
+        <member name="M:OpenMetaverse.BlockingQueue`1.Open">
             <summary>
-            Types of wearable assets
+            Open Queue.
             </summary>
         </member>
-        <member name="F:OpenMetaverse.WearableType.Shape">
-            <summary>Body shape</summary>
+        <member name="P:OpenMetaverse.BlockingQueue`1.Closed">
+            <summary>
+            Gets flag indicating if queue has been closed.
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.WearableType.Skin">
-            <summary>Skin textures and attributes</summary>
+        <member name="F:OpenMetaverse.Vector4.X">
+            <summary>X value</summary>
         </member>
-        <member name="F:OpenMetaverse.WearableType.Hair">
-            <summary>Hair</summary>
+        <member name="F:OpenMetaverse.Vector4.Y">
+            <summary>Y value</summary>
         </member>
-        <member name="F:OpenMetaverse.WearableType.Eyes">
-            <summary>Eyes</summary>
+        <member name="F:OpenMetaverse.Vector4.Z">
+            <summary>Z value</summary>
         </member>
-        <member name="F:OpenMetaverse.WearableType.Shirt">
-            <summary>Shirt</summary>
+        <member name="F:OpenMetaverse.Vector4.W">
+            <summary>W value</summary>
         </member>
-        <member name="F:OpenMetaverse.WearableType.Pants">
-            <summary>Pants</summary>
+        <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>
-        <member name="F:OpenMetaverse.WearableType.Shoes">
-            <summary>Shoes</summary>
+        <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
+            </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.WearableType.Socks">
-            <summary>Socks</summary>
+        <member name="M:OpenMetaverse.Vector4.CompareTo(OpenMetaverse.Vector4)">
+            <summary>
+            IComparable.CompareTo implementation
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.WearableType.Jacket">
-            <summary>Jacket</summary>
+        <member name="M:OpenMetaverse.Vector4.IsFinite">
+            <summary>
+            Test if this vector is composed of all finite numbers
+            </summary>
         </member>
-        <member name="F:OpenMetaverse.WearableType.Gloves">
-            <summary>Gloves</summary>
+        <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 a 16 byte vector</param>
+            <param name="pos">Beginning position in the byte array</param>
         </member>
-        <member name="F:OpenMetaverse.WearableType.Undershirt">
-            <summary>Undershirt</summary>
+        <member name="M:OpenMetaverse.Vector4.GetBytes">
+            <summary>
+            Returns the raw bytes for this vector
+            </summary>
+            <returns>A 16 byte array containing X, Y, Z, and W</returns>
         </member>
-        <member name="F:OpenMetaverse.WearableType.Underpants">
-            <summary>Underpants</summary>
+        <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 16 bytes before the end of the array</param>
         </member>
-        <member name="F:OpenMetaverse.WearableType.Skirt">
-            <summary>Skirt</summary>
+        <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.WearableType.Alpha">
-            <summary>Alpha mask to hide parts of the avatar</summary>
+        <member name="F:OpenMetaverse.Vector4.Zero">
+            <summary>A vector with a value of 0,0,0,0</summary>
         </member>
-        <member name="F:OpenMetaverse.WearableType.Tattoo">
-            <summary>Tattoo</summary>
+        <member name="F:OpenMetaverse.Vector4.One">
+            <summary>A vector with a value of 1,1,1,1</summary>
         </member>
-        <member name="F:OpenMetaverse.WearableType.Physics">
-            <summary>Physics</summary>
+        <member name="F:OpenMetaverse.Vector4.UnitX">
+            <summary>A vector with a value of 1,0,0,0</summary>
         </member>
-        <member name="F:OpenMetaverse.WearableType.Invalid">
-            <summary>Invalid wearable asset</summary>
+        <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>
+        </member>
+        <member name="T:OpenMetaverse.Vector3d">
+            <summary>
+            A three-dimensional vector with doubleing-point values
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Vector3d.X">
+            <summary>X value</summary>
+        </member>
+        <member name="F:OpenMetaverse.Vector3d.Y">
+            <summary>Y value</summary>
+        </member>
+        <member name="F:OpenMetaverse.Vector3d.Z">
+            <summary>Z value</summary>
+        </member>
+        <member name="M:OpenMetaverse.Vector3d.#ctor(System.Byte[],System.Int32)">
+            <summary>
+            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="M:OpenMetaverse.Vector3d.ApproxEquals(OpenMetaverse.Vector3d,System.Double)">
+            <summary>
+            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="M:OpenMetaverse.Vector3d.CompareTo(OpenMetaverse.Vector3d)">
+            <summary>
+            IComparable.CompareTo implementation
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.Vector3d.IsFinite">
+            <summary>
+            Test if this vector is composed of all finite numbers
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.Vector3d.FromBytes(System.Byte[],System.Int32)">
+            <summary>
+            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="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="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="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="M:OpenMetaverse.Vector3d.SmoothStep(OpenMetaverse.Vector3d,OpenMetaverse.Vector3d,System.Double)">
+            <summary>
+            Interpolates between two vectors using a cubic equation
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.Vector3d.ToString">
+            <summary>
+            Get a formatted string representation of the vector
+            </summary>
+            <returns>A string representation of the vector</returns>
+        </member>
+        <member name="M:OpenMetaverse.Vector3d.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="M:OpenMetaverse.Vector3d.op_Modulus(OpenMetaverse.Vector3d,OpenMetaverse.Vector3d)">
+            <summary>
+            Cross product between two vectors
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.Vector3d.op_Implicit(OpenMetaverse.Vector3)~OpenMetaverse.Vector3d">
+            <summary>
+            Implicit casting for Vector3 > Vector3d
+            </summary>
+            <param name="value"></param>
+            <returns></returns>
+        </member>
+        <member name="F:OpenMetaverse.Vector3d.Zero">
+            <summary>A vector with a value of 0,0,0</summary>
+        </member>
+        <member name="F:OpenMetaverse.Vector3d.One">
+            <summary>A vector with a value of 1,1,1</summary>
+        </member>
+        <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.Vector3d.UnitY">
+            <summary>A unit vector facing left (Y axis), value of 0,1,0</summary>
+        </member>
+        <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.Vector3">
+            <summary>
+            A three-dimensional vector with floating-point values
+            </summary>
+        </member>
+        <member name="F:OpenMetaverse.Vector3.X">
+            <summary>X value</summary>
+        </member>
+        <member name="F:OpenMetaverse.Vector3.Y">
+            <summary>Y value</summary>
+        </member>
+        <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>
+        <member name="M:OpenMetaverse.Vector3.ApproxEquals(OpenMetaverse.Vector3,System.Single)">
+            <summary>
+            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="M:OpenMetaverse.Vector3.CompareTo(OpenMetaverse.Vector3)">
+            <summary>
+            IComparable.CompareTo implementation
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.Vector3.IsFinite">
+            <summary>
+            Test if this vector is composed of all finite numbers
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.Vector3.FromBytes(System.Byte[],System.Int32)">
+            <summary>
+            Builds a vector from a byte array
+            </summary>
+            <param name="byteArray">Byte array containing a 12 byte vector</param>
+            <param name="pos">Beginning position in the byte array</param>
+        </member>
+        <member name="M:OpenMetaverse.Vector3.GetBytes">
+            <summary>
+            Returns the raw bytes for this vector
+            </summary>
+            <returns>A 12 byte array containing X, Y, and Z</returns>
+        </member>
+        <member name="M:OpenMetaverse.Vector3.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 12 bytes before the end of the array</param>
+        </member>
+        <member name="M:OpenMetaverse.Vector3.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="M:OpenMetaverse.Vector3.RotationBetween(OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
+            <summary>
+            Calculate the rotation between two vectors
+            </summary>
+            <param name="a">Normalized directional vector (such as 1,0,0 for forward facing)</param>
+            <param name="b">Normalized target vector</param>
+        </member>
+        <member name="M:OpenMetaverse.Vector3.SmoothStep(OpenMetaverse.Vector3,OpenMetaverse.Vector3,System.Single)">
+            <summary>
+            Interpolates between two vectors using a cubic equation
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.Vector3.ToString">
+            <summary>
+            Get a formatted string representation of the vector
+            </summary>
+            <returns>A string representation of the vector</returns>
+        </member>
+        <member name="M:OpenMetaverse.Vector3.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="M:OpenMetaverse.Vector3.op_Modulus(OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
+            <summary>
+            Cross product between two vectors
+            </summary>
+        </member>
+        <member name="M:OpenMetaverse.Vector3.op_Explicit(OpenMetaverse.Vector3d)~OpenMetaverse.Vector3">
+            <summary>
+            Explicit casting for Vector3d > Vector3
+            </summary>
+            <param name="value"></param>
+            <returns></returns>
+        </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">
             <summary>
@@ -515,35 +1074,28 @@
             <summary>Whether physics are enabled for this object</summary>
         </member>
         <member name="F:OpenMetaverse.PrimFlags.CreateSelected">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.PrimFlags.ObjectModify">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.PrimFlags.ObjectCopy">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.PrimFlags.ObjectAnyOwner">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.PrimFlags.ObjectYouOwner">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.PrimFlags.Scripted">
-            <summary>
-            </summary>
+            <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>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.PrimFlags.Money">
             <summary>Whether this object can receive payments</summary>
@@ -552,54 +1104,43 @@
             <summary>Whether this object is phantom (no collisions)</summary>
         </member>
         <member name="F:OpenMetaverse.PrimFlags.InventoryEmpty">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.PrimFlags.JointHinge">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.PrimFlags.JointP2P">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.PrimFlags.JointLP2P">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.PrimFlags.JointWheel">
             <summary>Deprecated</summary>
         </member>
         <member name="F:OpenMetaverse.PrimFlags.AllowInventoryDrop">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.PrimFlags.ObjectTransfer">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.PrimFlags.ObjectGroupOwned">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.PrimFlags.ObjectYouOfficer">
             <summary>Deprecated</summary>
         </member>
         <member name="F:OpenMetaverse.PrimFlags.CameraDecoupled">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.PrimFlags.AnimSource">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.PrimFlags.CameraSource">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.PrimFlags.CastShadows">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.PrimFlags.DieAtEdge">
             <summary>Server flag, will not be sent to clients. Specifies that
@@ -618,20 +1159,16 @@
             the object is hovering/flying</summary>
         </member>
         <member name="F:OpenMetaverse.PrimFlags.ObjectOwnerModify">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.PrimFlags.TemporaryOnRez">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.PrimFlags.Temporary">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.PrimFlags.ZlibCompressed">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="T:OpenMetaverse.SoundFlags">
             <summary>
@@ -639,32 +1176,25 @@
             </summary>
         </member>
         <member name="F:OpenMetaverse.SoundFlags.None">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.SoundFlags.Loop">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.SoundFlags.SyncMaster">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.SoundFlags.SyncSlave">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.SoundFlags.SyncPending">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.SoundFlags.Queue">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.SoundFlags.Stop">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="T:OpenMetaverse.Material">
             <summary>
@@ -672,36 +1202,28 @@
             </summary>
         </member>
         <member name="F:OpenMetaverse.Material.Stone">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Material.Metal">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Material.Glass">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Material.Wood">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Material.Flesh">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Material.Plastic">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Material.Rubber">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Material.Light">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="T:OpenMetaverse.PrimType">
             <summary>
@@ -711,7 +1233,7 @@
         <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
+            been added after the original ObjectFlags that has all eight bits 
             reserved already
             </summary>
         </member>
@@ -724,139 +1246,119 @@
         <member name="F:OpenMetaverse.ExtraParamType.Sculpt">
             <summary>Whether this object is a sculpted prim</summary>
         </member>
+        <member name="F:OpenMetaverse.ExtraParamType.LightImage">
+            <summary>Whether this object is a light image map</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>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.JointType.Hinge">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.JointType.Point">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="T:OpenMetaverse.SculptType">
             <summary>
+            
             </summary>
         </member>
         <member name="F:OpenMetaverse.SculptType.None">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.SculptType.Sphere">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.SculptType.Torus">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.SculptType.Plane">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.SculptType.Cylinder">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.SculptType.Mesh">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.SculptType.Invert">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.SculptType.Mirror">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="T:OpenMetaverse.FaceType">
             <summary>
+            
             </summary>
         </member>
         <member name="F:OpenMetaverse.FaceType.PathBegin">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.FaceType.PathEnd">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.FaceType.InnerSide">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.FaceType.ProfileBegin">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.FaceType.ProfileEnd">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.FaceType.OuterSide0">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.FaceType.OuterSide1">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.FaceType.OuterSide2">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.FaceType.OuterSide3">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="T:OpenMetaverse.ObjectCategory">
             <summary>
+            
             </summary>
         </member>
         <member name="F:OpenMetaverse.ObjectCategory.Invalid">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.ObjectCategory.None">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.ObjectCategory.Owner">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.ObjectCategory.Group">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.ObjectCategory.Other">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.ObjectCategory.Selected">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.ObjectCategory.Temporary">
-            <summary>
-            </summary>
+            <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
+             <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">
@@ -976,6 +1478,12 @@
         <member name="F:OpenMetaverse.AttachmentPoint.HUDBottomRight">
             <summary>HUD Bottom-right</summary>
         </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.Neck">
+            <summary>Neck</summary>
+        </member>
+        <member name="F:OpenMetaverse.AttachmentPoint.Root">
+            <summary>Avatar Center</summary>
+        </member>
         <member name="T:OpenMetaverse.Tree">
             <summary>
             Tree foliage types
@@ -1050,28 +1558,22 @@
             </summary>
         </member>
         <member name="F:OpenMetaverse.Grass.Grass0">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Grass.Grass1">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Grass.Grass2">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Grass.Grass3">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Grass.Grass4">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="F:OpenMetaverse.Grass.Undergrowth1">
-            <summary>
-            </summary>
+            <summary></summary>
         </member>
         <member name="T:OpenMetaverse.ClickAction">
             <summary>
@@ -1113,313 +1615,228 @@
         <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
-            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)">
+        <member name="T:OpenMetaverse.Color4">
             <summary>
-            Constructor
+            An 8-bit color structure including an alpha channel
             </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 name="F:OpenMetaverse.Color4.R">
+            <summary>Red</summary>
         </member>
-        <member name="F:OpenMetaverse.LocklessQueue`1.tail">
-            <summary>Queue tail</summary>
+        <member name="F:OpenMetaverse.Color4.G">
+            <summary>Green</summary>
         </member>
-        <member name="F:OpenMetaverse.LocklessQueue`1.count">
-            <summary>Queue item count</summary>
+        <member name="F:OpenMetaverse.Color4.B">
+            <summary>Blue</summary>
         </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.Color4.A">
+            <summary>Alpha</summary>
         </member>
-        <member name="M:OpenMetaverse.LocklessQueue`1.Enqueue(`0)">
+        <member name="M:OpenMetaverse.Color4.#ctor(System.Byte,System.Byte,System.Byte,System.Byte)">
             <summary>
-            Enqueue an item
+            
             </summary>
-            <param name="item">Item to enqeue</param>
+            <param name="r"></param>
+            <param name="g"></param>
+            <param name="b"></param>
+            <param name="a"></param>
         </member>
-        <member name="M:OpenMetaverse.LocklessQueue`1.TryDequeue(`0@)">
+        <member name="M:OpenMetaverse.Color4.#ctor(System.Byte[],System.Int32,System.Boolean)">
             <summary>
-            Try to dequeue an item
+            Builds a color from a byte array
             </summary>
-            <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="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>
+            <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="M:OpenMetaverse.Matrix4.GetEulerAngles(System.Single@,System.Single@,System.Single@)">
+        <member name="M:OpenMetaverse.Color4.#ctor(System.Byte[],System.Int32,System.Boolean,System.Boolean)">
             <summary>
-            Convert this matrix to euler rotations
+            Returns the raw bytes for this vector
             </summary>
-            <param name="roll">X euler angle</param>
-            <param name="pitch">Y euler angle</param>
-            <param name="yaw">Z euler angle</param>
+            <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="M:OpenMetaverse.Matrix4.GetQuaternion">
+        <member name="M:OpenMetaverse.Color4.#ctor(OpenMetaverse.Color4)">
             <summary>
-            Convert this matrix to a quaternion rotation
+            Copy constructor
             </summary>
-            <returns>A quaternion representation of this rotation matrix</returns>
+            <param name="color">Color to copy</param>
         </member>
-        <member name="M:OpenMetaverse.Matrix4.CreateFromEulers(System.Single,System.Single,System.Single)">
+        <member name="M:OpenMetaverse.Color4.CompareTo(OpenMetaverse.Color4)">
             <summary>
-            Construct a matrix from euler rotation values in radians
+            IComparable.CompareTo implementation
             </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>
+            <remarks>Sorting ends up like this: |--Grayscale--||--Color--|.
+            Alpha is only used when the colors are otherwise equivalent</remarks>
         </member>
-        <member name="M:OpenMetaverse.Matrix4.ToString">
+        <member name="M:OpenMetaverse.Color4.FromBytes(System.Byte[],System.Int32,System.Boolean,System.Boolean)">
             <summary>
-            Get a formatted string representation of the vector
+            Builds a color from a byte array
             </summary>
-            <returns>A string representation of the vector</returns>
+            <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="T:OpenMetaverse.Parallel">
+        <member name="M:OpenMetaverse.Color4.ToBytes(System.Byte[],System.Int32)">
             <summary>
-            Provides helper methods for parallelizing loops
+            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.Parallel.For(System.Int32,System.Int32,System.Action{System.Int32})">
+        <member name="M:OpenMetaverse.Color4.ToBytes(System.Byte[],System.Int32,System.Boolean)">
             <summary>
-            Executes a for loop in which iterations may run in parallel
+            Serializes this color into four bytes in a byte array
             </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>
+            <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.Parallel.For(System.Int32,System.Int32,System.Int32,System.Action{System.Int32})">
+        <member name="M:OpenMetaverse.Color4.ToFloatBytes(System.Byte[],System.Int32)">
             <summary>
-            Executes a for loop in which iterations may run in parallel
+            Writes the raw bytes for this color to a byte array
             </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>
+            <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.Parallel.ForEach``1(System.Collections.Generic.IEnumerable{``0},System.Action{``0})">
+        <member name="M:OpenMetaverse.Color4.ClampValues">
             <summary>
-            Executes a foreach loop in which iterations may run in parallel
+            Ensures that values are in range 0-1
             </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})">
+        <member name="M:OpenMetaverse.Color4.FromHSV(System.Double,System.Double,System.Double)">
             <summary>
-            Executes a foreach loop in which iterations may run in parallel
+            Create an RGB color from a hue, saturation, value combination
             </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>
+            <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.Parallel.Invoke(System.Action[])">
+        <member name="M:OpenMetaverse.Color4.Lerp(OpenMetaverse.Color4,OpenMetaverse.Color4,System.Single)">
             <summary>
-            Executes a series of tasks in parallel
+            Performs linear interpolation between two colors
             </summary>
-            <param name="actions">A series of method bodies to execute</param>
+            <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="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 name="F:OpenMetaverse.Color4.Black">
+            <summary>A Color4 with zero RGB values and fully opaque (alpha 1.0)</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 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.Quaternion.#ctor(System.Byte[],System.Int32,System.Boolean)">
+        <member name="T:OpenMetaverse.Vector2">
             <summary>
-            Constructor, builds a quaternion object from a byte array
+            A two-dimensional vector with floating-point values
             </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="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="F:OpenMetaverse.Quaternion.Identity">
-            <summary>A quaternion with a value of 0,0,0,1</summary>
-        </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@)">
+        <member name="M:OpenMetaverse.Vector2.ApproxEquals(OpenMetaverse.Vector2,System.Single)">
             <summary>
-            Convert this quaternion to euler angles
+            Test if this vector is equal to another vector, within a given
+            tolerance range
             </summary>
-            <param name="roll">X euler angle</param>
-            <param name="pitch">Y euler angle</param>
-            <param name="yaw">Z euler angle</param>
+            <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.Quaternion.GetAxisAngle(OpenMetaverse.Vector3@,System.Single@)">
+        <member name="M:OpenMetaverse.Vector2.IsFinite">
             <summary>
-            Convert this quaternion to an angle around an axis
+            Test if this vector is composed of all finite numbers
             </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)">
+        <member name="M:OpenMetaverse.Vector2.CompareTo(OpenMetaverse.Vector2)">
             <summary>
-            Returns the conjugate (spatial inverse) of a quaternion
+            IComparable.CompareTo implementation
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Quaternion.CreateFromAxisAngle(System.Single,System.Single,System.Single,System.Single)">
+        <member name="M:OpenMetaverse.Vector2.FromBytes(System.Byte[],System.Int32)">
             <summary>
-            Build a quaternion from an axis and an angle of rotation around
-            that axis
+            Builds a vector from a byte array
             </summary>
+            <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.Quaternion.CreateFromAxisAngle(OpenMetaverse.Vector3,System.Single)">
+        <member name="M:OpenMetaverse.Vector2.GetBytes">
             <summary>
-            Build a quaternion from an axis and an angle of rotation around
-            that axis
+            Returns the raw bytes for this vector
             </summary>
-            <param name="axis">Axis of rotation</param>
-            <param name="angle">Angle of rotation</param>
+            <returns>An eight-byte array containing X and Y</returns>
         </member>
-        <member name="M:OpenMetaverse.Quaternion.CreateFromEulers(OpenMetaverse.Vector3)">
+        <member name="M:OpenMetaverse.Vector2.ToBytes(System.Byte[],System.Int32)">
             <summary>
-            Creates a quaternion from a vector containing roll, pitch, and yaw
-            in radians
+            Writes the raw bytes for this vector to a byte array
             </summary>
-            <param name="eulers">Vector representation of the euler angles in
-            radians</param>
-            <returns>Quaternion representation of the euler angles</returns>
+            <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.Quaternion.CreateFromEulers(System.Single,System.Single,System.Single)">
+        <member name="M:OpenMetaverse.Vector2.Parse(System.String)">
             <summary>
-            Creates a quaternion from roll, pitch, and yaw euler angles in
-            radians
+            Parse a vector from a string
             </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>
+            <param name="val">A string representation of a 2D vector, enclosed 
+            in arrow brackets and separated by commas</param>
         </member>
-        <member name="M:OpenMetaverse.Quaternion.Inverse(OpenMetaverse.Quaternion)">
+        <member name="M:OpenMetaverse.Vector2.SmoothStep(OpenMetaverse.Vector2,OpenMetaverse.Vector2,System.Single)">
             <summary>
-            Conjugates and renormalizes a vector
+            Interpolates between two vectors using a cubic equation
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Quaternion.Slerp(OpenMetaverse.Quaternion,OpenMetaverse.Quaternion,System.Single)">
+        <member name="M:OpenMetaverse.Vector2.ToString">
             <summary>
-            Spherical linear interpolation between two quaternions
+            Get a formatted string representation of the vector
             </summary>
+            <returns>A string representation of the vector</returns>
         </member>
-        <member name="M:OpenMetaverse.Quaternion.ToRawString">
+        <member name="M:OpenMetaverse.Vector2.ToRawString">
             <summary>
-            Get a string representation of the quaternion elements with up to three
+            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 quaternion</returns>
+            <returns>Raw string representation of the vector</returns>
         </member>
-        <member name="M:OpenMetaverse.ReaderWriterLockSlim.ExitAndWakeUpAppropriateWaiters">
-            <summary>
-            Determines the appropriate events to set, leaves the locks, and sets the events.
-            </summary>
+        <member name="F:OpenMetaverse.Vector2.Zero">
+            <summary>A vector with a value of 0,0</summary>
         </member>
-        <member name="M:OpenMetaverse.ReaderWriterLockSlim.LazyCreateEvent(System.Threading.EventWaitHandle@,System.Boolean)">
-            <summary>
-            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'
-            </summary>
+        <member name="F:OpenMetaverse.Vector2.One">
+            <summary>A vector with a value of 1,1</summary>
         </member>
-        <member name="M:OpenMetaverse.ReaderWriterLockSlim.WaitOnEvent(System.Threading.EventWaitHandle,System.UInt32@,System.Int32)">
-            <summary>
-            Waits on 'waitEvent' with a timeout of 'millisceondsTimeout.
-            Before the wait 'numWaiters' is incremented and is restored before leaving this routine.
-            </summary>
+        <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>
         <member name="T:OpenMetaverse.TokenBucket">
             <summary>
@@ -1427,23 +1844,12 @@
             http://en.wikipedia.org/wiki/Token_bucket for more information
             </summary>
         </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
+            <summary>Size of the bucket in bytes. If zero, the bucket has 
             infinite capacity</summary>
         </member>
         <member name="F:OpenMetaverse.TokenBucket.tokensPerMS">
@@ -1456,35 +1862,16 @@
         <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">
+        <member name="M:OpenMetaverse.TokenBucket.#ctor(OpenMetaverse.TokenBucket,System.Int32,System.Int32)">
             <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
+            Default constructor
             </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>
+            <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)">
             <summary>
@@ -1507,1191 +1894,761 @@
         <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 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>
-            A 128-bit Universally Unique Identifier, used throughout the Second
-            Life networking protocol
-            </summary>
-        </member>
-        <member name="M:OpenMetaverse.UUID.#ctor(System.String)">
+        <member name="P:OpenMetaverse.TokenBucket.Parent">
             <summary>
-            Constructor that takes a string UUID representation
+            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>
-            <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>
-        <member name="M:OpenMetaverse.UUID.#ctor(System.Guid)">
+        <member name="P:OpenMetaverse.TokenBucket.MaxBurst">
             <summary>
-            Constructor that takes a System.Guid object
+            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>
-            <param name="val">A Guid object that contains the unique identifier
-            to be represented by this UUID</param>
         </member>
-        <member name="M:OpenMetaverse.UUID.#ctor(System.Byte[],System.Int32)">
+        <member name="P:OpenMetaverse.TokenBucket.DripRate">
             <summary>
-            Constructor that takes a byte array containing a UUID
+            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>
-            <param name="source">Byte array containing a 16 byte UUID</param>
-            <param name="pos">Beginning offset in the array</param>
+            <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="M:OpenMetaverse.UUID.#ctor(System.UInt64)">
+        <member name="P:OpenMetaverse.TokenBucket.Content">
             <summary>
-            Constructor that takes an unsigned 64-bit unsigned integer to
-            convert to a UUID
+            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>
-            <param name="val">64-bit unsigned integer to convert to a UUID</param>
         </member>
-        <member name="M:OpenMetaverse.UUID.#ctor(OpenMetaverse.UUID)">
-            <summary>
-            Copy constructor
-            </summary>
-            <param name="val">UUID to copy</param>
+        <member name="F:OpenMetaverse.Quaternion.X">
+            <summary>X value</summary>
         </member>
-        <member name="F:OpenMetaverse.UUID.Guid">
-            <summary>The System.Guid object this struct wraps around</summary>
+        <member name="F:OpenMetaverse.Quaternion.Y">
+            <summary>Y value</summary>
         </member>
-        <member name="F:OpenMetaverse.UUID.Zero">
-            <summary>An UUID with a value of all zeroes</summary>
+        <member name="F:OpenMetaverse.Quaternion.Z">
+            <summary>Z value</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.Quaternion.W">
+            <summary>W value</summary>
         </member>
-        <member name="M:OpenMetaverse.UUID.CompareTo(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Quaternion.#ctor(System.Single,System.Single,System.Single)">
             <summary>
-            IComparable.CompareTo implementation
+            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.UUID.FromBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Quaternion.#ctor(System.Byte[],System.Int32,System.Boolean)">
             <summary>
-            Assigns this UUID from 16 bytes out of a byte array
+            Constructor, builds a quaternion object from a byte array
             </summary>
-            <param name="source">Byte array containing the UUID to assign this UUID to</param>
-            <param name="pos">Starting position of the UUID in the byte array</param>
+            <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.UUID.GetBytes">
+        <member name="M:OpenMetaverse.Quaternion.Normalize">
             <summary>
-            Returns a copy of the raw bytes for this UUID
+            Normalizes the quaternion
             </summary>
-            <returns>A 16 byte array containing this UUID</returns>
         </member>
-        <member name="M:OpenMetaverse.UUID.ToBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Quaternion.FromBytes(System.Byte[],System.Int32,System.Boolean)">
             <summary>
-            Writes the raw bytes for this UUID to a byte array
+            Builds a quaternion object from 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>
+            <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.UUID.CRC">
+        <member name="M:OpenMetaverse.Quaternion.GetBytes">
             <summary>
-            Calculate an LLCRC (cyclic redundancy check) for this UUID
+            Normalize this quaternion and serialize it to a byte array
             </summary>
-            <returns>The CRC checksum for this UUID</returns>
+            <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.UUID.GetULong">
+        <member name="M:OpenMetaverse.Quaternion.ToBytes(System.Byte[],System.Int32)">
             <summary>
-            Create a 64-bit integer representation from the second half of this UUID
+            Writes the raw bytes for this quaternion to a byte array
             </summary>
-            <returns>An integer created from the last eight bytes of this UUID</returns>
+            <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.UUID.Parse(System.String)">
+        <member name="M:OpenMetaverse.Quaternion.GetEulerAngles(System.Single@,System.Single@,System.Single@)">
             <summary>
-            Generate a UUID from a string
+            Convert this quaternion to euler angles
             </summary>
-            <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>
+            <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.UUID.TryParse(System.String,OpenMetaverse.UUID@)">
+        <member name="M:OpenMetaverse.Quaternion.GetAxisAngle(OpenMetaverse.Vector3@,System.Single@)">
             <summary>
-            Generate a UUID from a string
+            Convert this quaternion to an angle around an axis
             </summary>
-            <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>
-            <returns>True if the string was successfully parse, otherwise false</returns>
-            <example>UUID.TryParse("11f8aa9c-b071-4242-836b-13b7abe0d489", result)</example>
+            <param name="axis">Unit vector describing the axis</param>
+            <param name="angle">Angle around the axis, in radians</param>
         </member>
-        <member name="M:OpenMetaverse.UUID.Combine(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Quaternion.Conjugate(OpenMetaverse.Quaternion)">
             <summary>
-            Combine two UUIDs together by taking the MD5 hash of a byte array
-            containing both UUIDs
+            Returns the conjugate (spatial inverse) of a quaternion
             </summary>
-            <param name="first">First UUID to combine</param>
-            <param name="second">Second UUID to combine</param>
-            <returns>The UUID product of the combination</returns>
         </member>
-        <member name="M:OpenMetaverse.UUID.Random">
+        <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>
-            <returns>
-            </returns>
         </member>
-        <member name="M:OpenMetaverse.UUID.GetHashCode">
+        <member name="M:OpenMetaverse.Quaternion.CreateFromAxisAngle(OpenMetaverse.Vector3,System.Single)">
             <summary>
-            Return a hash code for this UUID, used by .NET for hash tables
+            Build a quaternion from an axis and an angle of rotation around
+            that axis
             </summary>
-            <returns>An integer composed of all the UUID bytes XORed together</returns>
+            <param name="axis">Axis of rotation</param>
+            <param name="angle">Angle of rotation</param>
         </member>
-        <member name="M:OpenMetaverse.UUID.Equals(System.Object)">
+        <member name="M:OpenMetaverse.Quaternion.CreateFromEulers(OpenMetaverse.Vector3)">
             <summary>
-            Comparison function
+            Creates a quaternion from a vector containing roll, pitch, and yaw
+            in radians
             </summary>
-            <param name="o">An object to compare to this UUID</param>
-            <returns>True if the object is a UUID and both UUIDs are equal</returns>
+            <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.UUID.Equals(OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Quaternion.CreateFromEulers(System.Single,System.Single,System.Single)">
             <summary>
-            Comparison function
+            Creates a quaternion from roll, pitch, and yaw euler angles in
+            radians
             </summary>
-            <param name="uuid">UUID to compare to</param>
-            <returns>True if the UUIDs are equal, otherwise false</returns>
+            <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.UUID.ToString">
+        <member name="M:OpenMetaverse.Quaternion.Inverse(OpenMetaverse.Quaternion)">
             <summary>
-            Get a hyphenated string representation of this UUID
+            Conjugates and renormalizes a vector
             </summary>
-            <returns>A string representation of this UUID, lowercase and
-            with hyphens</returns>
-            <example>11f8aa9c-b071-4242-836b-13b7abe0d489</example>
         </member>
-        <member name="M:OpenMetaverse.UUID.op_Equality(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Quaternion.Slerp(OpenMetaverse.Quaternion,OpenMetaverse.Quaternion,System.Single)">
             <summary>
-            Equals operator
+            Spherical linear interpolation between two quaternions
             </summary>
-            <param name="lhs">First UUID for comparison</param>
-            <param name="rhs">Second UUID for comparison</param>
-            <returns>True if the UUIDs are byte for byte equal, otherwise false</returns>
         </member>
-        <member name="M:OpenMetaverse.UUID.op_Inequality(OpenMetaverse.UUID,OpenMetaverse.UUID)">
+        <member name="M:OpenMetaverse.Quaternion.ToRawString">
             <summary>
-            Not equals operator
+            Get a string representation of the quaternion elements with up to three
+            decimal digits and separated by spaces only
             </summary>
-            <param name="lhs">First UUID for comparison</param>
-            <param name="rhs">Second UUID for comparison</param>
-            <returns>True if the UUIDs are not equal, otherwise true</returns>
+            <returns>Raw string representation of the quaternion</returns>
         </member>
-        <member name="M:OpenMetaverse.UUID.op_ExclusiveOr(OpenMetaverse.UUID,OpenMetaverse.UUID)">
-            <summary>
-            XOR operator
-            </summary>
-            <param name="lhs">First UUID</param>
-            <param name="rhs">Second UUID</param>
-            <returns>A UUID that is a XOR combination of the two input UUIDs</returns>
+        <member name="F:OpenMetaverse.Quaternion.Identity">
+            <summary>A quaternion with a value of 0,0,0,1</summary>
         </member>
-        <member name="M:OpenMetaverse.UUID.op_Explicit(System.String)~OpenMetaverse.UUID">
+        <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>
-            String typecasting operator
+            Purges expired objects from the cache. Called automatically by the purge timer.
             </summary>
-            <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="T:OpenMetaverse.Utils.Platform">
+        <member name="T:OpenMetaverse.EnumInfoAttribute">
             <summary>
-            Operating system
+            Attribute class that allows extra attributes to be attached to ENUMs
             </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 name="F:OpenMetaverse.EnumInfoAttribute.Text">
+            <summary>Text used when presenting ENUM to user</summary>
         </member>
-        <member name="F:OpenMetaverse.Utils.Platform.Linux">
-            <summary>Linux</summary>
+        <member name="M:OpenMetaverse.EnumInfoAttribute.#ctor">
+            <summary>Default initializer</summary>
         </member>
-        <member name="F:OpenMetaverse.Utils.Platform.OSX">
-            <summary>Apple OSX</summary>
+        <member name="M:OpenMetaverse.EnumInfoAttribute.#ctor(System.String)">
+            <summary>Text used when presenting ENUM to user</summary>
         </member>
-        <member name="T:OpenMetaverse.Utils.Runtime">
+        <member name="T:OpenMetaverse.AssetType">
             <summary>
-            Runtime platform
+            The different types of grid assets
             </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>
+        <member name="F:OpenMetaverse.AssetType.Unknown">
+            <summary>Unknown asset type</summary>
         </member>
-        <member name="F:OpenMetaverse.Utils.RAD_TO_DEG">
-            <summary>Used for converting radians to degrees</summary>
+        <member name="F:OpenMetaverse.AssetType.Texture">
+            <summary>Texture asset, stores in JPEG2000 J2C stream format</summary>
         </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
-            culture</summary>
+        <member name="F:OpenMetaverse.AssetType.Sound">
+            <summary>Sound asset</summary>
         </member>
-        <member name="F:OpenMetaverse.Utils.Epoch">
-            <summary>UNIX epoch in DateTime format</summary>
+        <member name="F:OpenMetaverse.AssetType.CallingCard">
+            <summary>Calling card for another avatar</summary>
         </member>
-        <member name="F:OpenMetaverse.Utils.MD5Builder">
-            <summary>Provide a single instance of the MD5 class to avoid making
-            duplicate copies and handle thread safety</summary>
+        <member name="F:OpenMetaverse.AssetType.Landmark">
+            <summary>Link to a location in world</summary>
         </member>
-        <member name="F:OpenMetaverse.Utils.SHA1Builder">
-            <summary>Provide a single instance of the SHA-1 class to avoid
-            making duplicate copies and handle thread safety</summary>
+        <member name="F:OpenMetaverse.AssetType.Clothing">
+            <summary>Collection of textures and parameters that can be 
+            worn by an avatar</summary>
         </member>
-        <member name="F:OpenMetaverse.Utils.RNG">
-            <summary>Provide a single instance of a random number generator
-            to avoid making duplicate copies and handle thread safety</summary>
+        <member name="F:OpenMetaverse.AssetType.Object">
+            <summary>Primitive that can contain textures, sounds, 
+            scripts and more</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.Clamp(System.Single,System.Single,System.Single)">
-            <summary>
-            Clamp a given value between a range
-            </summary>
-            <param name="value">Value to clamp</param>
-            <param name="min">Minimum allowable value</param>
-            <param name="max">Maximum allowable value</param>
-            <returns>A value inclusively between lower and upper</returns>
+        <member name="F:OpenMetaverse.AssetType.Notecard">
+            <summary>Notecard asset</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.Clamp(System.Double,System.Double,System.Double)">
-            <summary>
-            Clamp a given value between a range
-            </summary>
-            <param name="value">Value to clamp</param>
-            <param name="min">Minimum allowable value</param>
-            <param name="max">Maximum allowable value</param>
-            <returns>A value inclusively between lower and upper</returns>
+        <member name="F:OpenMetaverse.AssetType.Folder">
+            <summary>Holds a collection of inventory items</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.Clamp(System.Int32,System.Int32,System.Int32)">
-            <summary>
-            Clamp a given value between a range
-            </summary>
-            <param name="value">Value to clamp</param>
-            <param name="min">Minimum allowable value</param>
-            <param name="max">Maximum allowable value</param>
-            <returns>A value inclusively between lower and upper</returns>
+        <member name="F:OpenMetaverse.AssetType.RootFolder">
+            <summary>Root inventory folder</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.Round(System.Single)">
-            <summary>
-            Round a floating-point value to the nearest integer
-            </summary>
-            <param name="val">Floating point number to round</param>
-            <returns>Integer</returns>
+        <member name="F:OpenMetaverse.AssetType.LSLText">
+            <summary>Linden scripting language script</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.IsFinite(System.Single)">
-            <summary>
-            Test if a single precision float is a finite number
-            </summary>
+        <member name="F:OpenMetaverse.AssetType.LSLBytecode">
+            <summary>LSO bytecode for a script</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.IsFinite(System.Double)">
-            <summary>
-            Test if a double precision float is a finite number
-            </summary>
+        <member name="F:OpenMetaverse.AssetType.TextureTGA">
+            <summary>Uncompressed TGA texture</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.Distance(System.Single,System.Single)">
-            <summary>
-            Get the distance between two floating-point values
-            </summary>
-            <param name="value1">First value</param>
-            <param name="value2">Second value</param>
-            <returns>The distance between the two values</returns>
+        <member name="F:OpenMetaverse.AssetType.Bodypart">
+            <summary>Collection of textures and shape parameters that can
+            be worn</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.MD5(System.Byte[])">
-            <summary>
-            Compute the MD5 hash for a byte array
-            </summary>
-            <param name="data">Byte array to compute the hash for</param>
-            <returns>MD5 hash of the input data</returns>
+        <member name="F:OpenMetaverse.AssetType.TrashFolder">
+            <summary>Trash folder</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.SHA1(System.Byte[])">
-            <summary>
-            Compute the SHA1 hash for a byte array
-            </summary>
-            <param name="data">Byte array to compute the hash for</param>
-            <returns>SHA1 hash of the input data</returns>
+        <member name="F:OpenMetaverse.AssetType.SnapshotFolder">
+            <summary>Snapshot folder</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.SHA1String(System.String)">
-            <summary>
-            Calculate the SHA1 hash of a given string
-            </summary>
-            <param name="value">The string to hash</param>
-            <returns>The SHA1 hash as a string</returns>
+        <member name="F:OpenMetaverse.AssetType.LostAndFoundFolder">
+            <summary>Lost and found folder</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.SHA256(System.Byte[])">
-            <summary>
-            Compute the SHA256 hash for a byte array
-            </summary>
-            <param name="data">Byte array to compute the hash for</param>
-            <returns>SHA256 hash of the input data</returns>
+        <member name="F:OpenMetaverse.AssetType.SoundWAV">
+            <summary>Uncompressed sound</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.SHA256String(System.String)">
-            <summary>
-            Calculate the SHA256 hash of a given string
-            </summary>
-            <param name="value">The string to hash</param>
-            <returns>The SHA256 hash as a string</returns>
+        <member name="F:OpenMetaverse.AssetType.ImageTGA">
+            <summary>Uncompressed TGA non-square image, not to be used as a
+            texture</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.MD5(System.String)">
-            <summary>
-            Calculate the MD5 hash of a given string
-            </summary>
-            <param name="password">The password to hash</param>
-            <returns>An MD5 hash in string format, with $1$ prepended</returns>
+        <member name="F:OpenMetaverse.AssetType.ImageJPEG">
+            <summary>Compressed JPEG non-square image, not to be used as a
+            texture</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.MD5String(System.String)">
-            <summary>
-            Calculate the MD5 hash of a given string
-            </summary>
-            <param name="value">The string to hash</param>
-            <returns>The MD5 hash as a string</returns>
+        <member name="F:OpenMetaverse.AssetType.Animation">
+            <summary>Animation</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.RandomDouble">
-            <summary>
-            Generate a random double precision floating point value
-            </summary>
-            <returns>Random value of type double</returns>
+        <member name="F:OpenMetaverse.AssetType.Gesture">
+            <summary>Sequence of animations, sounds, chat, and pauses</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.GetRunningPlatform">
-            <summary>
-            Get the current running platform
-            </summary>
-            <returns>Enumeration of the current platform we are running on</returns>
+        <member name="F:OpenMetaverse.AssetType.Simstate">
+            <summary>Simstate file</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.GetRunningRuntime">
-            <summary>
-            Get the current running runtime
-            </summary>
-            <returns>Enumeration of the current runtime we are running on</returns>
+        <member name="F:OpenMetaverse.AssetType.FavoriteFolder">
+            <summary>Contains landmarks for favorites</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.BytesToInt16(System.Byte[])">
-            <summary>
-            Convert the first two bytes starting in the byte array in
-            little endian ordering to a signed short integer
-            </summary>
-            <param name="bytes">An array two bytes or longer</param>
-            <returns>A signed short integer, will be zero if a short can't be
-            read at the given position</returns>
+        <member name="F:OpenMetaverse.AssetType.Link">
+            <summary>Asset is a link to another inventory item</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.BytesToInt16(System.Byte[],System.Int32)">
-            <summary>
-            Convert the first two bytes starting at the given position in
-            little endian ordering to a signed short integer
-            </summary>
-            <param name="bytes">An array two bytes or longer</param>
-            <param name="pos">Position in the array to start reading</param>
-            <returns>A signed short integer, will be zero if a short can't be
-            read at the given position</returns>
+        <member name="F:OpenMetaverse.AssetType.LinkFolder">
+            <summary>Asset is a link to another inventory folder</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.BytesToInt(System.Byte[],System.Int32)">
-            <summary>
-            Convert the first four bytes starting at the given position in
-            little endian ordering to a signed integer
-            </summary>
-            <param name="bytes">An array four bytes or longer</param>
-            <param name="pos">Position to start reading the int from</param>
-            <returns>A signed integer, will be zero if an int can't be read
-            at the given position</returns>
+        <member name="F:OpenMetaverse.AssetType.EnsembleStart">
+            <summary>Beginning of the range reserved for ensembles</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.BytesToInt(System.Byte[])">
-            <summary>
-            Convert the first four bytes of the given array in little endian
-            ordering to a signed integer
-            </summary>
-            <param name="bytes">An array four bytes or longer</param>
-            <returns>A signed integer, will be zero if the array contains
-            less than four bytes</returns>
+        <member name="F:OpenMetaverse.AssetType.EnsembleEnd">
+            <summary>End of the range reserved for ensembles</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.BytesToInt64(System.Byte[])">
-            <summary>
-            Convert the first eight bytes of the given array in little endian
-            ordering to a signed long integer
-            </summary>
-            <param name="bytes">An array eight bytes or longer</param>
-            <returns>A signed long integer, will be zero if the array contains
-            less than eight bytes</returns>
+        <member name="F:OpenMetaverse.AssetType.CurrentOutfitFolder">
+            <summary>Folder containing inventory links to wearables and attachments
+            that are part of the current outfit</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.BytesToInt64(System.Byte[],System.Int32)">
-            <summary>
-            Convert the first eight bytes starting at the given position in
-            little endian ordering to a signed long integer
-            </summary>
-            <param name="bytes">An array eight bytes or longer</param>
-            <param name="pos">Position to start reading the long from</param>
-            <returns>A signed long integer, will be zero if a long can't be read
-            at the given position</returns>
+        <member name="F:OpenMetaverse.AssetType.OutfitFolder">
+            <summary>Folder containing inventory items or links to
+            inventory items of wearables and attachments
+            together make a full outfit</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.BytesToUInt16(System.Byte[],System.Int32)">
-            <summary>
-            Convert the first two bytes starting at the given position in
-            little endian ordering to an unsigned short
-            </summary>
-            <param name="bytes">Byte array containing the ushort</param>
-            <param name="pos">Position to start reading the ushort from</param>
-            <returns>An unsigned short, will be zero if a ushort can't be read
-            at the given position</returns>
+        <member name="F:OpenMetaverse.AssetType.MyOutfitsFolder">
+            <summary>Root folder for the folders of type OutfitFolder</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.BytesToUInt16(System.Byte[])">
-            <summary>
-            Convert two bytes in little endian ordering to an unsigned short
-            </summary>
-            <param name="bytes">Byte array containing the ushort</param>
-            <returns>An unsigned short, will be zero if a ushort can't be
-            read</returns>
+        <member name="F:OpenMetaverse.AssetType.Mesh">
+            <summary>Linden mesh format</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.BytesToUInt(System.Byte[],System.Int32)">
-            <summary>
-            Convert the first four bytes starting at the given position in
-            little endian ordering to an unsigned integer
-            </summary>
-            <param name="bytes">Byte array containing the uint</param>
-            <param name="pos">Position to start reading the uint from</param>
-            <returns>An unsigned integer, will be zero if a uint can't be read
-            at the given position</returns>
+        <member name="F:OpenMetaverse.AssetType.Inbox">
+            <summary>Marketplace direct delivery inbox ("Received Items")</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.BytesToUInt(System.Byte[])">
-            <summary>
-            Convert the first four bytes of the given array in little endian
-            ordering to an unsigned integer
-            </summary>
-            <param name="bytes">An array four bytes or longer</param>
-            <returns>An unsigned integer, will be zero if the array contains
-            less than four bytes</returns>
+        <member name="F:OpenMetaverse.AssetType.Outbox">
+            <summary>Marketplace direct delivery outbox</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.BytesToUInt64(System.Byte[])">
-            <summary>
-            Convert the first eight bytes of the given array in little endian
-            ordering to an unsigned 64-bit integer
-            </summary>
-            <param name="bytes">An array eight bytes or longer</param>
-            <returns>An unsigned 64-bit integer, will be zero if the array
-            contains less than eight bytes</returns>
+        <member name="F:OpenMetaverse.AssetType.BasicRoot">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.BytesToFloat(System.Byte[],System.Int32)">
+        <member name="T:OpenMetaverse.InventoryType">
             <summary>
-            Convert four bytes in little endian ordering to a floating point
-            value
+            Inventory Item Types, eg Script, Notecard, Folder, etc
             </summary>
-            <param name="bytes">Byte array containing a little ending floating
-            point value</param>
-            <param name="pos">Starting position of the floating point value in
-            the byte array</param>
-            <returns>Single precision value</returns>
         </member>
-        <member name="M:OpenMetaverse.Utils.IntToBytes(System.Int32)">
-            <summary>
-            Convert an integer to a byte array in little endian format
-            </summary>
-            <param name="value">The integer to convert</param>
-            <returns>A four byte little endian array</returns>
+        <member name="F:OpenMetaverse.InventoryType.Unknown">
+            <summary>Unknown</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.IntToBytesBig(System.Int32)">
-            <summary>
-            Convert an integer to a byte array in big endian format
-            </summary>
-            <param name="value">The integer to convert</param>
-            <returns>A four byte big endian array</returns>
+        <member name="F:OpenMetaverse.InventoryType.Texture">
+            <summary>Texture</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.Int64ToBytes(System.Int64)">
-            <summary>
-            Convert a 64-bit integer to a byte array in little endian format
-            </summary>
-            <param name="value">The value to convert</param>
-            <returns>An 8 byte little endian array</returns>
+        <member name="F:OpenMetaverse.InventoryType.Sound">
+            <summary>Sound</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.UInt64ToBytes(System.UInt64)">
-            <summary>
-            Convert a 64-bit unsigned integer to a byte array in little endian
-            format
-            </summary>
-            <param name="value">The value to convert</param>
-            <returns>An 8 byte little endian array</returns>
+        <member name="F:OpenMetaverse.InventoryType.CallingCard">
+            <summary>Calling Card</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.FloatToBytes(System.Single)">
-            <summary>
-            Convert a floating point value to four bytes in little endian
-            ordering
-            </summary>
-            <param name="value">A floating point value</param>
-            <returns>A four byte array containing the value in little endian
-            ordering</returns>
+        <member name="F:OpenMetaverse.InventoryType.Landmark">
+            <summary>Landmark</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.UIntToHexString(System.UInt32)">
-            <summary>
-            Converts an unsigned integer to a hexadecimal string
-            </summary>
-            <param name="i">An unsigned integer to convert to a string</param>
-            <returns>A hexadecimal string 10 characters long</returns>
-            <example>0x7fffffff</example>
+        <member name="F:OpenMetaverse.InventoryType.Notecard">
+            <summary>Notecard</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.BytesToString(System.Byte[])">
-            <summary>
-            Convert a variable length UTF8 byte array to a string
-            </summary>
-            <param name="bytes">The UTF8 encoded byte array to convert</param>
-            <returns>The decoded string</returns>
+        <member name="F:OpenMetaverse.InventoryType.Category">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.BytesToHexString(System.Byte[],System.String)">
-            <summary>
-            Converts a byte array to a string containing hexadecimal characters
-            </summary>
-            <param name="bytes">The byte array to convert to a string</param>
-            <param name="fieldName">The name of the field to prepend to each
-            line of the string</param>
-            <returns>A string containing hexadecimal characters on multiple
-            lines. Each line is prepended with the field name</returns>
+        <member name="F:OpenMetaverse.InventoryType.Folder">
+            <summary>Folder</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.BytesToHexString(System.Byte[],System.Int32,System.String)">
-            <summary>
-            Converts a byte array to a string containing hexadecimal characters
-            </summary>
-            <param name="bytes">The byte array to convert to a string</param>
-            <param name="length">Number of bytes in the array to parse</param>
-            <param name="fieldName">A string to prepend to each line of the hex
-            dump</param>
-            <returns>A string containing hexadecimal characters on multiple
-            lines. Each line is prepended with the field name</returns>
+        <member name="F:OpenMetaverse.InventoryType.RootCategory">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.StringToBytes(System.String)">
-            <summary>
-            Convert a string to a UTF8 encoded byte array
-            </summary>
-            <param name="str">The string to convert</param>
-            <returns>A null-terminated UTF8 byte array</returns>
+        <member name="F:OpenMetaverse.InventoryType.LSL">
+            <summary>an LSL Script</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.HexStringToBytes(System.String,System.Boolean)">
-            <summary>
-            Converts a string containing hexadecimal characters to a byte array
-            </summary>
-            <param name="hexString">String containing hexadecimal characters</param>
-            <param name="handleDirty">If true, gracefully handles null, empty and
-            uneven strings as well as stripping unconvertable characters</param>
-            <returns>The converted byte array</returns>
+        <member name="F:OpenMetaverse.InventoryType.Snapshot">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.IsHexDigit(System.Char)">
-            <summary>
-            Returns true is c is a hexadecimal digit (A-F, a-f, 0-9)
-            </summary>
-            <param name="c">Character to test</param>
-            <returns>true if hex digit, false if not</returns>
+        <member name="F:OpenMetaverse.InventoryType.Attachment">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.HexToByte(System.String)">
-            <summary>
-            Converts 1 or 2 character string into equivalant byte value
-            </summary>
-            <param name="hex">1 or 2 character string</param>
-            <returns>byte</returns>
+        <member name="F:OpenMetaverse.InventoryType.Wearable">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.FloatToByte(System.Single,System.Single,System.Single)">
-            <summary>
-            Convert a float value to a byte given a minimum and maximum range
-            </summary>
-            <param name="val">Value to convert to a byte</param>
-            <param name="lower">Minimum value range</param>
-            <param name="upper">Maximum value range</param>
-            <returns>A single byte representing the original float value</returns>
+        <member name="F:OpenMetaverse.InventoryType.Animation">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.ByteToFloat(System.Byte[],System.Int32,System.Single,System.Single)">
-            <summary>
-            Convert a byte to a float value given a minimum and maximum range
-            </summary>
-            <param name="bytes">Byte array to get the byte from</param>
-            <param name="pos">Position in the byte array the desired byte is at</param>
-            <param name="lower">Minimum value range</param>
-            <param name="upper">Maximum value range</param>
-            <returns>A float value inclusively between lower and upper</returns>
+        <member name="F:OpenMetaverse.InventoryType.Gesture">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.ByteToFloat(System.Byte,System.Single,System.Single)">
-            <summary>
-            Convert a byte to a float value given a minimum and maximum range
-            </summary>
-            <param name="val">Byte to convert to a float value</param>
-            <param name="lower">Minimum value range</param>
-            <param name="upper">Maximum value range</param>
-            <returns>A float value inclusively between lower and upper</returns>
+        <member name="F:OpenMetaverse.InventoryType.Mesh">
+            <summary></summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.TryParseSingle(System.String,System.Single@)">
+        <member name="T:OpenMetaverse.SaleType">
             <summary>
-            Attempts to parse a floating point value from a string, using an
-            EN-US number format
+            Item Sale Status
             </summary>
-            <param name="s">String to parse</param>
-            <param name="result">Resulting floating point number</param>
-            <returns>True if the parse was successful, otherwise false</returns>
         </member>
-        <member name="M:OpenMetaverse.Utils.TryParseDouble(System.String,System.Double@)">
-            <summary>
-            Attempts to parse a floating point value from a string, using an
-            EN-US number format
-            </summary>
-            <param name="s">String to parse</param>
-            <param name="result">Resulting floating point number</param>
-            <returns>True if the parse was successful, otherwise false</returns>
+        <member name="F:OpenMetaverse.SaleType.Not">
+            <summary>Not for sale</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.TryParseHex(System.String,System.UInt32@)">
-            <summary>
-            Tries to parse an unsigned 32-bit integer from a hexadecimal string
-            </summary>
-            <param name="s">String to parse</param>
-            <param name="result">Resulting integer</param>
-            <returns>True if the parse was successful, otherwise false</returns>
+        <member name="F:OpenMetaverse.SaleType.Original">
+            <summary>The original is for sale</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.EnumToText(System.Enum)">
-            <summary>
-            Returns text specified in EnumInfo attribute of the enumerator
-            To add the text use [EnumInfo(Text = "Some nice text here")] before declaration
-            of enum values
-            </summary>
-            <param name="value">Enum value</param>
-            <returns>Text representation of the enum</returns>
+        <member name="F:OpenMetaverse.SaleType.Copy">
+            <summary>Copies are for sale</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.AssetTypeToString(OpenMetaverse.AssetType)">
-            <summary>
-            Takes an AssetType and returns the string representation
-            </summary>
-            <param name="type">The source <seealso cref="T:OpenMetaverse.AssetType" /></param>
-            <returns>The string version of the AssetType</returns>
+        <member name="F:OpenMetaverse.SaleType.Contents">
+            <summary>The contents of the object are for sale</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.StringToAssetType(System.String)">
+        <member name="T:OpenMetaverse.WearableType">
             <summary>
-            Translate a string name of an AssetType into the proper Type
+            Types of wearable assets
             </summary>
-            <param name="type">A string containing the AssetType name</param>
-            <returns>The AssetType which matches the string name, or AssetType.Unknown if no match was found</returns>
         </member>
-        <member name="M:OpenMetaverse.Utils.InventoryTypeToString(OpenMetaverse.InventoryType)">
-            <summary>
-            Convert an InventoryType to a string
-            </summary>
-            <param name="type">The <seealso cref="T:InventoryType" /> to convert</param>
-            <returns>A string representation of the source</returns>
+        <member name="F:OpenMetaverse.WearableType.Shape">
+            <summary>Body shape</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.StringToInventoryType(System.String)">
-            <summary>
-            Convert a string into a valid InventoryType
-            </summary>
-            <param name="type">A string representation of the InventoryType to convert</param>
-            <returns>A InventoryType object which matched the type</returns>
+        <member name="F:OpenMetaverse.WearableType.Skin">
+            <summary>Skin textures and attributes</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.SaleTypeToString(OpenMetaverse.SaleType)">
-            <summary>
-            Convert a SaleType to a string
-            </summary>
-            <param name="type">The <seealso cref="T:SaleType" /> to convert</param>
-            <returns>A string representation of the source</returns>
+        <member name="F:OpenMetaverse.WearableType.Hair">
+            <summary>Hair</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.StringToSaleType(System.String)">
-            <summary>
-            Convert a string into a valid SaleType
-            </summary>
-            <param name="value">A string representation of the SaleType to convert</param>
-            <returns>A SaleType object which matched the type</returns>
+        <member name="F:OpenMetaverse.WearableType.Eyes">
+            <summary>Eyes</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.StringToAttachmentPoint(System.String)">
-            <summary>
-            Converts a string used in LLSD to AttachmentPoint type
-            </summary>
-            <param name="value">String representation of AttachmentPoint to convert</param>
-            <returns>AttachmentPoint enum</returns>
+        <member name="F:OpenMetaverse.WearableType.Shirt">
+            <summary>Shirt</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.CopyBytes(System.Byte[])">
-            <summary>
-            Copy a byte array
-            </summary>
-            <param name="bytes">Byte array to copy</param>
-            <returns>A copy of the given byte array</returns>
+        <member name="F:OpenMetaverse.WearableType.Pants">
+            <summary>Pants</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.UIntsToLong(System.UInt32,System.UInt32)">
-            <summary>
-            Packs to 32-bit unsigned integers in to a 64-bit unsigned integer
-            </summary>
-            <param name="a">The left-hand (or X) value</param>
-            <param name="b">The right-hand (or Y) value</param>
-            <returns>A 64-bit integer containing the two 32-bit input values</returns>
+        <member name="F:OpenMetaverse.WearableType.Shoes">
+            <summary>Shoes</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.LongToUInts(System.UInt64,System.UInt32@,System.UInt32@)">
-            <summary>
-            Unpacks two 32-bit unsigned integers from a 64-bit unsigned integer
-            </summary>
-            <param name="a">The 64-bit input integer</param>
-            <param name="b">The left-hand (or X) output value</param>
-            <param name="c">The right-hand (or Y) output value</param>
+        <member name="F:OpenMetaverse.WearableType.Socks">
+            <summary>Socks</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.IPToUInt(System.Net.IPAddress)">
-            <summary>
-            Convert an IP address object to an unsigned 32-bit integer
-            </summary>
-            <param name="address">IP address to convert</param>
-            <returns>32-bit unsigned integer holding the IP address bits</returns>
+        <member name="F:OpenMetaverse.WearableType.Jacket">
+            <summary>Jacket</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.GetUnixTime">
-            <summary>
-            Gets a unix timestamp for the current time
-            </summary>
-            <returns>An unsigned integer representing a unix timestamp for now</returns>
+        <member name="F:OpenMetaverse.WearableType.Gloves">
+            <summary>Gloves</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.UnixTimeToDateTime(System.UInt32)">
-            <summary>
-            Convert a UNIX timestamp to a native DateTime object
-            </summary>
-            <param name="timestamp">An unsigned integer representing a UNIX
-            timestamp</param>
-            <returns>A DateTime object containing the same time specified in
-            the given timestamp</returns>
+        <member name="F:OpenMetaverse.WearableType.Undershirt">
+            <summary>Undershirt</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.UnixTimeToDateTime(System.Int32)">
-            <summary>
-            Convert a UNIX timestamp to a native DateTime object
-            </summary>
-            <param name="timestamp">A signed integer representing a UNIX
-            timestamp</param>
-            <returns>A DateTime object containing the same time specified in
-            the given timestamp</returns>
+        <member name="F:OpenMetaverse.WearableType.Underpants">
+            <summary>Underpants</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.DateTimeToUnixTime(System.DateTime)">
-            <summary>
-            Convert a native DateTime object to a UNIX timestamp
-            </summary>
-            <param name="time">A DateTime object you want to convert to a
-            timestamp</param>
-            <returns>An unsigned integer representing a UNIX timestamp</returns>
+        <member name="F:OpenMetaverse.WearableType.Skirt">
+            <summary>Skirt</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.Swap``1(``0@,``0@)">
-            <summary>
-            Swap two values
-            </summary>
-            <typeparam name="T">Type of the values to swap</typeparam>
-            <param name="lhs">First value</param>
-            <param name="rhs">Second value</param>
+        <member name="F:OpenMetaverse.WearableType.Alpha">
+            <summary>Alpha mask to hide parts of the avatar</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.EnumTryParse``1(System.String,``0@)">
-            <summary>
-            Try to parse an enumeration value from a string
-            </summary>
-            <typeparam name="T">Enumeration type</typeparam>
-            <param name="strType">String value to parse</param>
-            <param name="result">Enumeration value on success</param>
-            <returns>True if the parsing succeeded, otherwise false</returns>
+        <member name="F:OpenMetaverse.WearableType.Tattoo">
+            <summary>Tattoo</summary>
         </member>
-        <member name="M:OpenMetaverse.Utils.SwapWords(System.Byte)">
-            <summary>
-            Swaps the high and low words in a byte. Converts aaaabbbb to bbbbaaaa
-            </summary>
-            <param name="value">Byte to swap the words in</param>
-            <returns>Byte value with the words swapped</returns>
+        <member name="F:OpenMetaverse.WearableType.Physics">
+            <summary>Physics</summary>
         </member>
-        <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>
-            <param name="hostname">Hostname to convert to an IPAddress</param>
-            <returns>Converted IP address object, or null if the conversion
-            failed</returns>
+        <member name="F:OpenMetaverse.WearableType.Invalid">
+            <summary>Invalid wearable asset</summary>
         </member>
-        <member name="T:OpenMetaverse.Vector2">
+        <member name="T:OpenMetaverse.LocklessQueue`1">
             <summary>
-            A two-dimensional vector with floating-point values
+            A thread-safe lockless queue that supports multiple readers and 
+            multiple writers
             </summary>
         </member>
-        <member name="F:OpenMetaverse.Vector2.X">
-            <summary>X value</summary>
-        </member>
-        <member name="F:OpenMetaverse.Vector2.Y">
-            <summary>Y value</summary>
-        </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 name="F:OpenMetaverse.LocklessQueue`1.head">
+            <summary>Queue head</summary>
         </member>
-        <member name="F:OpenMetaverse.Vector2.UnitX">
-            <summary>A vector with a value of 1,0</summary>
+        <member name="F:OpenMetaverse.LocklessQueue`1.tail">
+            <summary>Queue tail</summary>
         </member>
-        <member name="F:OpenMetaverse.Vector2.UnitY">
-            <summary>A vector with a value of 0,1</summary>
+        <member name="F:OpenMetaverse.LocklessQueue`1.count">
+            <summary>Queue item count</summary>
         </member>
-        <member name="M:OpenMetaverse.Vector2.ApproxEquals(OpenMetaverse.Vector2,System.Single)">
+        <member name="M:OpenMetaverse.LocklessQueue`1.#ctor">
             <summary>
-            Test if this vector is equal to another vector, within a given
-            tolerance range
+            Constructor
             </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.Vector2.IsFinite">
+        <member name="M:OpenMetaverse.LocklessQueue`1.Enqueue(`0)">
             <summary>
-            Test if this vector is composed of all finite numbers
+            Enqueue an item
             </summary>
+            <param name="item">Item to enqeue</param>
         </member>
-        <member name="M:OpenMetaverse.Vector2.CompareTo(OpenMetaverse.Vector2)">
+        <member name="M:OpenMetaverse.LocklessQueue`1.TryDequeue(`0@)">
             <summary>
-            IComparable.CompareTo implementation
+            Try to dequeue an item
             </summary>
+            <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="M:OpenMetaverse.Vector2.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="pos">Beginning position in the byte array</param>
+        <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.Vector2.GetBytes">
+        <member name="T:OpenMetaverse.LocklessQueue`1.SingleLinkNode">
             <summary>
-            Returns the raw bytes for this vector
+            Provides a node container for data in a singly linked list
             </summary>
-            <returns>An eight-byte array containing X and Y</returns>
         </member>
-        <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 8 bytes before the end of the array</param>
+        <member name="F:OpenMetaverse.LocklessQueue`1.SingleLinkNode.Next">
+            <summary>Pointer to the next node in list</summary>
         </member>
-        <member name="M:OpenMetaverse.Vector2.Parse(System.String)">
+        <member name="F:OpenMetaverse.LocklessQueue`1.SingleLinkNode.Item">
+            <summary>The data contained by the node</summary>
+        </member>
+        <member name="M:OpenMetaverse.LocklessQueue`1.SingleLinkNode.#ctor">
             <summary>
-            Parse a vector from a string
+            Constructor
             </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)">
+        <member name="M:OpenMetaverse.LocklessQueue`1.SingleLinkNode.#ctor(`0)">
             <summary>
-            Interpolates between two vectors using a cubic equation
+            Constructor
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Vector2.ToString">
+        <member name="T:OpenMetaverse.UUID">
             <summary>
-            Get a formatted string representation of the vector
+            A 128-bit Universally Unique Identifier, used throughout the Second
+            Life networking protocol
             </summary>
-            <returns>A string representation of the vector</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector2.ToRawString">
+        <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>
-            Get a string representation of the vector elements with up to three
-            decimal digits and separated by spaces only
+            Constructor that takes a string UUID representation
             </summary>
-            <returns>Raw string representation of the vector</returns>
+            <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>
-        <member name="T:OpenMetaverse.Vector3">
+        <member name="M:OpenMetaverse.UUID.#ctor(System.Guid)">
             <summary>
-            A three-dimensional vector with floating-point values
+            Constructor that takes a System.Guid object
             </summary>
+            <param name="val">A Guid object that contains the unique identifier
+            to be represented by this UUID</param>
         </member>
-        <member name="M:OpenMetaverse.Vector3.#ctor(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.UUID.#ctor(System.Byte[],System.Int32)">
             <summary>
-            Constructor, builds a vector from a byte array
+            Constructor that takes a byte array containing a UUID
             </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>
-        <member name="F:OpenMetaverse.Vector3.Y">
-            <summary>Y value</summary>
-        </member>
-        <member name="F:OpenMetaverse.Vector3.Z">
-            <summary>Z value</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>
+            <param name="source">Byte array containing a 16 byte UUID</param>
+            <param name="pos">Beginning offset in the array</param>
         </member>
-        <member name="M:OpenMetaverse.Vector3.ApproxEquals(OpenMetaverse.Vector3,System.Single)">
+        <member name="M:OpenMetaverse.UUID.#ctor(System.UInt64)">
             <summary>
-            Test if this vector is equal to another vector, within a given
-            tolerance range
+            Constructor that takes an unsigned 64-bit unsigned integer to 
+            convert to a UUID
             </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>
+            <param name="val">64-bit unsigned integer to convert to a UUID</param>
         </member>
-        <member name="M:OpenMetaverse.Vector3.CompareTo(OpenMetaverse.Vector3)">
+        <member name="M:OpenMetaverse.UUID.#ctor(OpenMetaverse.UUID)">
             <summary>
-            IComparable.CompareTo implementation
+            Copy constructor
             </summary>
+            <param name="val">UUID to copy</param>
         </member>
-        <member name="M:OpenMetaverse.Vector3.IsFinite">
+        <member name="M:OpenMetaverse.UUID.CompareTo(OpenMetaverse.UUID)">
             <summary>
-            Test if this vector is composed of all finite numbers
+            IComparable.CompareTo implementation
             </summary>
         </member>
-        <member name="M:OpenMetaverse.Vector3.FromBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.UUID.FromBytes(System.Byte[],System.Int32)">
             <summary>
-            Builds a vector from a byte array
+            Assigns this UUID from 16 bytes out of a byte array
             </summary>
-            <param name="byteArray">Byte array containing a 12 byte vector</param>
-            <param name="pos">Beginning position in the byte array</param>
+            <param name="source">Byte array containing the UUID to assign this UUID to</param>
+            <param name="pos">Starting position of the UUID in the byte array</param>
         </member>
-        <member name="M:OpenMetaverse.Vector3.GetBytes">
+        <member name="M:OpenMetaverse.UUID.GetBytes">
             <summary>
-            Returns the raw bytes for this vector
+            Returns a copy of the raw bytes for this UUID
             </summary>
-            <returns>A 12 byte array containing X, Y, and Z</returns>
+            <returns>A 16 byte array containing this UUID</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector3.ToBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.UUID.ToBytes(System.Byte[],System.Int32)">
             <summary>
-            Writes the raw bytes for this vector to a byte array
+            Writes the raw bytes for this UUID 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>
+            writing. Must be at least 16 bytes before the end of the array</param>
         </member>
-        <member name="M:OpenMetaverse.Vector3.Parse(System.String)">
+        <member name="M:OpenMetaverse.UUID.CRC">
             <summary>
-            Parse a vector from a string
+            Calculate an LLCRC (cyclic redundancy check) for this UUID
             </summary>
-            <param name="val">A string representation of a 3D vector, enclosed
-            in arrow brackets and separated by commas</param>
+            <returns>The CRC checksum for this UUID</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector3.RotationBetween(OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
+        <member name="M:OpenMetaverse.UUID.GetULong">
             <summary>
-            Calculate the rotation between two vectors
+            Create a 64-bit integer representation from the second half of this UUID
             </summary>
-            <param name="a">Normalized directional vector (such as 1,0,0 for forward facing)</param>
-            <param name="b">Normalized target vector</param>
+            <returns>An integer created from the last eight bytes of this UUID</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector3.SmoothStep(OpenMetaverse.Vector3,OpenMetaverse.Vector3,System.Single)">
+        <member name="M:OpenMetaverse.UUID.Parse(System.String)">
             <summary>
-            Interpolates between two vectors using a cubic equation
+            Generate a UUID from a string
             </summary>
+            <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>
-        <member name="M:OpenMetaverse.Vector3.ToString">
+        <member name="M:OpenMetaverse.UUID.TryParse(System.String,OpenMetaverse.UUID@)">
             <summary>
-            Get a formatted string representation of the vector
+            Generate a UUID from a string
             </summary>
-            <returns>A string representation of the vector</returns>
+            <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>
+            <returns>True if the string was successfully parse, otherwise false</returns>
+            <example>UUID.TryParse("11f8aa9c-b071-4242-836b-13b7abe0d489", result)</example>
         </member>
-        <member name="M:OpenMetaverse.Vector3.ToRawString">
+        <member name="M:OpenMetaverse.UUID.Combine(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
-            Get a string representation of the vector elements with up to three
-            decimal digits and separated by spaces only
+            Combine two UUIDs together by taking the MD5 hash of a byte array
+            containing both UUIDs
             </summary>
-            <returns>Raw string representation of the vector</returns>
+            <param name="first">First UUID to combine</param>
+            <param name="second">Second UUID to combine</param>
+            <returns>The UUID product of the combination</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector3.op_Modulus(OpenMetaverse.Vector3,OpenMetaverse.Vector3)">
+        <member name="M:OpenMetaverse.UUID.Random">
             <summary>
-            Cross product between two vectors
+            
             </summary>
+            <returns></returns>
         </member>
-        <member name="T:OpenMetaverse.Vector3d">
+        <member name="M:OpenMetaverse.UUID.GetHashCode">
             <summary>
-            A three-dimensional vector with doubleing-point values
+            Return a hash code for this UUID, used by .NET for hash tables
             </summary>
+            <returns>An integer composed of all the UUID bytes XORed together</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.#ctor(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.UUID.Equals(System.Object)">
             <summary>
-            Constructor, builds a vector from a byte array
+            Comparison function
             </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.Vector3d.X">
-            <summary>X value</summary>
-        </member>
-        <member name="F:OpenMetaverse.Vector3d.Y">
-            <summary>Y value</summary>
-        </member>
-        <member name="F:OpenMetaverse.Vector3d.Z">
-            <summary>Z value</summary>
-        </member>
-        <member name="F:OpenMetaverse.Vector3d.Zero">
-            <summary>A vector with a value of 0,0,0</summary>
-        </member>
-        <member name="F:OpenMetaverse.Vector3d.One">
-            <summary>A vector with a value of 1,1,1</summary>
-        </member>
-        <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.Vector3d.UnitY">
-            <summary>A unit vector facing left (Y axis), value of 0,1,0</summary>
-        </member>
-        <member name="F:OpenMetaverse.Vector3d.UnitZ">
-            <summary>A unit vector facing up (Z axis), value of 0,0,1</summary>
+            <param name="o">An object to compare to this UUID</param>
+            <returns>True if the object is a UUID and both UUIDs are equal</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.ApproxEquals(OpenMetaverse.Vector3d,System.Double)">
+        <member name="M:OpenMetaverse.UUID.Equals(OpenMetaverse.UUID)">
             <summary>
-            Test if this vector is equal to another vector, within a given
-            tolerance range
+            Comparison function
             </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>
+            <param name="uuid">UUID to compare to</param>
+            <returns>True if the UUIDs are equal, otherwise false</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.CompareTo(OpenMetaverse.Vector3d)">
+        <member name="M:OpenMetaverse.UUID.ToString">
             <summary>
-            IComparable.CompareTo implementation
+            Get a hyphenated string representation of this UUID
             </summary>
+            <returns>A string representation of this UUID, lowercase and 
+            with hyphens</returns>
+            <example>11f8aa9c-b071-4242-836b-13b7abe0d489</example>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.IsFinite">
+        <member name="M:OpenMetaverse.UUID.op_Equality(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
-            Test if this vector is composed of all finite numbers
+            Equals operator
             </summary>
+            <param name="lhs">First UUID for comparison</param>
+            <param name="rhs">Second UUID for comparison</param>
+            <returns>True if the UUIDs are byte for byte equal, otherwise false</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.FromBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.UUID.op_Inequality(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
-            Builds a vector from a byte array
+            Not equals operator
             </summary>
-            <param name="byteArray">Byte array containing a 24 byte vector</param>
-            <param name="pos">Beginning position in the byte array</param>
+            <param name="lhs">First UUID for comparison</param>
+            <param name="rhs">Second UUID for comparison</param>
+            <returns>True if the UUIDs are not equal, otherwise true</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.GetBytes">
+        <member name="M:OpenMetaverse.UUID.op_ExclusiveOr(OpenMetaverse.UUID,OpenMetaverse.UUID)">
             <summary>
-            Returns the raw bytes for this vector
+            XOR operator
             </summary>
-            <returns>A 24 byte array containing X, Y, and Z</returns>
+            <param name="lhs">First UUID</param>
+            <param name="rhs">Second UUID</param>
+            <returns>A UUID that is a XOR combination of the two input UUIDs</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.ToBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.UUID.op_Explicit(System.String)~OpenMetaverse.UUID">
             <summary>
-            Writes the raw bytes for this vector to a byte array
+            String typecasting operator
             </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="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="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 name="F:OpenMetaverse.UUID.Zero">
+            <summary>An UUID with a value of all zeroes</summary>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.SmoothStep(OpenMetaverse.Vector3d,OpenMetaverse.Vector3d,System.Double)">
-            <summary>
-            Interpolates between two vectors using a cubic equation
-            </summary>
+        <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.Vector3d.ToString">
+        <member name="T:OpenMetaverse.Parallel">
             <summary>
-            Get a formatted string representation of the vector
+            Provides helper methods for parallelizing loops
             </summary>
-            <returns>A string representation of the vector</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector3d.ToRawString">
+        <member name="M:OpenMetaverse.Parallel.For(System.Int32,System.Int32,System.Action{System.Int32})">
             <summary>
-            Get a string representation of the vector elements with up to three
-            decimal digits and separated by spaces only
+            Executes a for loop in which iterations may run in parallel
             </summary>
-            <returns>Raw string representation of the vector</returns>
+            <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.Vector3d.op_Modulus(OpenMetaverse.Vector3d,OpenMetaverse.Vector3d)">
+        <member name="M:OpenMetaverse.Parallel.For(System.Int32,System.Int32,System.Int32,System.Action{System.Int32})">
             <summary>
-            Cross product between two vectors
+            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.Vector4.#ctor(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.Parallel.ForEach``1(System.Collections.Generic.IEnumerable{``0},System.Action{``0})">
             <summary>
-            Constructor, builds a vector from a byte array
+            Executes a foreach loop in which iterations may run in parallel
             </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.Vector4.X">
-            <summary>X value</summary>
-        </member>
-        <member name="F:OpenMetaverse.Vector4.Y">
-            <summary>Y value</summary>
-        </member>
-        <member name="F:OpenMetaverse.Vector4.Z">
-            <summary>Z value</summary>
-        </member>
-        <member name="F:OpenMetaverse.Vector4.W">
-            <summary>W value</summary>
-        </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>
+            <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.Vector4.ApproxEquals(OpenMetaverse.Vector4,System.Single)">
+        <member name="M:OpenMetaverse.Parallel.ForEach``1(System.Int32,System.Collections.Generic.IEnumerable{``0},System.Action{``0})">
             <summary>
-            Test if this vector is equal to another vector, within a given
-            tolerance range
+            Executes a foreach loop in which iterations may run in parallel
             </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>
+            <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.Vector4.CompareTo(OpenMetaverse.Vector4)">
+        <member name="M:OpenMetaverse.Parallel.Invoke(System.Action[])">
             <summary>
-            IComparable.CompareTo implementation
+            Executes a series of tasks in parallel
             </summary>
+            <param name="actions">A series of method bodies to execute</param>
         </member>
-        <member name="M:OpenMetaverse.Vector4.IsFinite">
+        <member name="M:OpenMetaverse.Parallel.Invoke(System.Int32,System.Action[])">
             <summary>
-            Test if this vector is composed of all finite numbers
+            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.Vector4.FromBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.CircularQueue`1.#ctor(OpenMetaverse.CircularQueue{`0})">
             <summary>
-            Builds a vector from a byte array
+            Copy constructor
             </summary>
-            <param name="byteArray">Byte array containing a 16 byte vector</param>
-            <param name="pos">Beginning position in the byte array</param>
+            <param name="queue">Circular queue to copy</param>
         </member>
-        <member name="M:OpenMetaverse.Vector4.GetBytes">
+        <member name="M:OpenMetaverse.ReaderWriterLockSlim.ExitAndWakeUpAppropriateWaiters">
             <summary>
-            Returns the raw bytes for this vector
+            Determines the appropriate events to set, leaves the locks, and sets the events. 
             </summary>
-            <returns>A 16 byte array containing X, Y, Z, and W</returns>
         </member>
-        <member name="M:OpenMetaverse.Vector4.ToBytes(System.Byte[],System.Int32)">
+        <member name="M:OpenMetaverse.ReaderWriterLockSlim.LazyCreateEvent(System.Threading.EventWaitHandle@,System.Boolean)">
             <summary>
-            Writes the raw bytes for this vector to a byte array
+            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' 
             </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.Vector4.ToRawString">
+        <member name="M:OpenMetaverse.ReaderWriterLockSlim.WaitOnEvent(System.Threading.EventWaitHandle,System.UInt32@,System.Int32)">
             <summary>
-            Get a string representation of the vector elements with up to three
-            decimal digits and separated by spaces only
+            Waits on 'waitEvent' with a timeout of 'millisceondsTimeout.  
+            Before the wait 'numWaiters' is incremented and is restored before leaving this routine.
             </summary>
-            <returns>Raw string representation of the vector</returns>
         </member>
     </members>
 </doc>
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll
index 6cc4c5a..7ee907b 100755
--- a/bin/OpenMetaverseTypes.dll
+++ b/bin/OpenMetaverseTypes.dll
diff --git a/bin/OpenSim.32BitLaunch.exe.config b/bin/OpenSim.32BitLaunch.exe.config
index 6ac0206..6a6b3c8 100644
--- a/bin/OpenSim.32BitLaunch.exe.config
+++ b/bin/OpenSim.32BitLaunch.exe.config
@@ -11,22 +11,56 @@
   </appSettings>
   <log4net>
     <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
+      <filter type="log4net.Filter.LoggerMatchFilter">
+        <loggerToMatch value="special"/>
+        <acceptOnMatch value="false"/>
+      </filter>
       <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
+        <conversionPattern value="%date{HH:mm:ss} - %message" />
+        <!-- console log with milliseconds.  Useful for debugging -->
+<!--        <conversionPattern value="%date{HH:mm:ss.fff} - %message" /> -->
       </layout>
     </appender>
+
     <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
       <file value="OpenSim.32BitLaunch.log" />
       <appendToFile value="true" />
+      <filter type="log4net.Filter.LoggerMatchFilter">
+        <loggerToMatch value="special"/>
+        <acceptOnMatch value="false"/>
+      </filter>
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date %-5level - %logger %message%newline" />
       </layout>
     </appender>
 
+    <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
+      <file value="OpenSimStats.log"/>
+      <appendToFile value="true" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date - %message%newline" />
+      </layout>
+    </appender>
+
     <root>
       <level value="DEBUG" />
       <appender-ref ref="Console" />
       <appender-ref ref="LogFileAppender" />
     </root>
+
+    <!-- Independently control logging level for XEngine -->
+    <logger name="OpenSim.Region.ScriptEngine.XEngine">
+      <level value="INFO"/>
+    </logger>
+
+    <!-- Independently control logging level for per region module loading -->
+    <logger name="OpenSim.ApplicationPlugins.RegionModulesController.RegionModulesControllerPlugin">
+      <level value="INFO"/>
+    </logger>
+
+    <!-- used for stats recording -->
+    <logger name="special.StatsLogger">
+      <appender-ref ref="StatsLogFileAppender"/>
+    </logger>
   </log4net>
 </configuration>
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config
index 8a891f4..b2cb4e5 100755
--- a/bin/OpenSim.exe.config
+++ b/bin/OpenSim.exe.config
@@ -11,6 +11,10 @@
   </appSettings>
   <log4net>
     <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
+      <filter type="log4net.Filter.LoggerMatchFilter">
+        <loggerToMatch value="special"/>
+        <acceptOnMatch value="false"/>
+      </filter>
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date{HH:mm:ss} - %message" />
         <!-- console log with milliseconds.  Useful for debugging -->
@@ -21,11 +25,23 @@
     <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
       <file value="OpenSim.log" />
       <appendToFile value="true" />
+      <filter type="log4net.Filter.LoggerMatchFilter">
+        <loggerToMatch value="special"/>
+        <acceptOnMatch value="false"/>
+      </filter>
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date %-5level - %logger %message%newline" />
       </layout>
     </appender>
 
+    <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
+      <file value="OpenSimStats.log"/>
+      <appendToFile value="true" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date - %message%newline" />
+      </layout>
+    </appender>
+
     <root>
       <level value="DEBUG" />
       <appender-ref ref="Console" />
@@ -42,5 +58,10 @@
       <level value="INFO"/>
     </logger>
 
+    <!-- used for stats recording -->
+    <logger name="special.StatsLogger">
+      <appender-ref ref="StatsLogFileAppender"/>
+    </logger>
+
   </log4net>
 </configuration>
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 842043e..313466c 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -180,10 +180,6 @@
     ;; if the first change occurred this number of seconds ago.
     ; MaximumTimeBeforePersistenceConsidered = 600
 
-    ;# {see_into_this_sim_from_neighbor} {} {Should avatars in neighbor sims see objects in this sim?} {true false} true
-    ;; Should avatars in neighbor sims see objects in this sim?
-    ; see_into_this_sim_from_neighbor = true
-
     ;# {physical_prim} {} {Allow prims to be physical?} {true false} true
     ;; 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.
@@ -264,7 +260,7 @@
     ; AllowedClients =
 
     ;# {BannedClients} {} {Bar (|) separated list of banned clients} {}
-    ;# Bar (|) separated list of viewers which may not gain access to the regions.
+    ;; Bar (|) separated list of viewers which may not gain access to the regions.
     ;; One can use a Substring of the viewer name to disable only certain
     ;; versions
     ;; Example: Agent uses the viewer "Imprudence 1.3.2.0"
@@ -283,7 +279,7 @@
     ;; both to set this to false and comment out the [Modules] MapImageServiceModule setting in config-include/
     ; GenerateMaptiles = true
 
-    ;# {MapImageModule} [] {The map image module to use} {MapImageModule Warp3DImageModule} MapImageModule
+    ;# {MapImageModule} {} {The map image module to use} {MapImageModule Warp3DImageModule} MapImageModule
     ;; The module to use in order to generate map images.
     ;; MapImageModule is the default.  Warp3DImageModule is an alternative experimental module that can 
     ;; generate better images.
@@ -470,7 +466,10 @@
     ;# {XmlRpcPort} {} {Port for incoming llRemoteData xmlrpc calls} {} 20800
     ;XmlRpcPort = 20800
 
-    ;# {XmlRpcHubURI} {XmlRpcRouterModule} {URI for external service used to register xmlrpc channels created in the simulator. This depends on XmlRpcRouterModule being set to XmlRpcGridRouterModule} http://example.com
+
+;;    {option} {depends on} {question to ask} {choices} default value
+
+    ;# {XmlRpcHubURI} {XmlRpcRouterModule} {URI for external service used to register xmlrpc channels created in the simulator. This depends on XmlRpcRouterModule being set to XmlRpcGridRouterModule} {} http://example.com
     ;; If XmlRpcRouterModule is set to XmlRpcGridRouterModule, the simulator
     ;; will use this address to register xmlrpc channels on the external
     ;; service 
@@ -503,8 +502,10 @@
     ;;   "<url>" -- capability enabled and served by some other server
     ;;
     ; These are enabled by default to localhost. Change if you see fit.
-      Cap_GetTexture = "localhost"
+    Cap_GetTexture = "localhost"
     Cap_GetMesh = "localhost"
+        Cap_AvatarPickerSearch = "localhost"
+
     ; This is disabled by default. Change if you see fit. Note that
     ; serving this cap from the simulators may lead to poor performace.
     Cap_WebFetchInventoryDescendents = ""
@@ -532,7 +533,7 @@
     ;; Distance in meters that ordinary chat should travel.
     ; say_distance = 20
 
-    ;# {shout_distance} {Distance at which a shout is heard, in meters?} {} 100
+    ;# {shout_distance} {} {Distance at which a shout is heard, in meters?} {} 100
     ;; Distance in meters that shouts should travel.
     ; shout_distance = 100
 
@@ -570,9 +571,9 @@
     ;; must be set to allow offline messaging to work.
     ; MuteListURL = http://yourserver/Mute.php
 
-    ;; Control whether group messages are forwarded to offline users.
+    ;; Control whether group invites and notices are stored for offline users.
     ;; Default is true.
-    ;; This applies to the core groups module (Flotsam) only.
+    ;; This applies to both core groups module.
     ; ForwardOfflineGroupMessages = true
 
 
@@ -607,7 +608,8 @@
     ;; the "password" parameter)
     ; access_password = ""
 
-    ;# List the IP addresses allowed to call RemoteAdmin
+    ;# {access_ip_addresses} {enabled:true} {List the IP addresses allowed to call RemoteAdmin?} {}
+    ;; List the IP addresses allowed to call RemoteAdmin
     ;; If access_ip_addresses isn't set, then all IP addresses can access RemoteAdmin.
     ;; access_ip_addresses = 0.0.0.0, 0.0.0.0 ...
     ; access_ip_addresses =
@@ -792,7 +794,7 @@
     ; ScriptStopStrategy = abort
     
 
-    ;# {DeleteScriptsOnStartup} {} {Delete previously compiled script DLLs on startup?} (true false) true
+    ;# {DeleteScriptsOnStartup} {} {Delete previously compiled script DLLs on startup?} {true false} true
     ;; Controls whether previously compiled scripts DLLs are deleted on sim restart. If you set this to false
     ;; then startup will be considerably faster since scripts won't need to be recompiled. However, then it becomes your responsibility to delete the
     ;; compiled scripts if you're recompiling OpenSim from source code and internal interfaces used
@@ -945,6 +947,10 @@
     ;; Enables the groups module
     ; Enabled = false
 
+    ;# {LevelGroupCreate} {Enabled:true} {User level for creating groups} {} 0
+    ;; Minimum user level required to create groups
+    ; LevelGroupCreate = 0
+
     ;# {Module} {Enabled:true} {Groups module to use? (Use GroupsModule to use Flotsam/Simian)} {Default "Groups Module V2"} Default
     ;; The default module can use a PHP XmlRpc server from the Flotsam project at
     ;; http://code.google.com/p/flotsam/
@@ -996,6 +1002,12 @@
     ;; Enable Group Notices
     ; NoticesEnabled = true
 
+    ;# {MessageOnlineUsersOnly} {Module:GroupsModule Module} {Message online users only?} {true false} false
+    ; Experimental option to only message online users rather than all users
+    ; Should make large groups with few online members messaging faster, as the expense of more calls to presence service
+    ; Applies Flotsam Group only. V2 has this always on, no other option
+    ; MessageOnlineUsersOnly = false
+
     ;; This makes the Groups modules very chatty on the console.
     ; DebugEnabled = false
 
@@ -1026,6 +1038,12 @@
     ;# {InitialTerrain} {} {Initial terrain type} {pinhead-island flat} pinhead-island
     ; InitialTerrain = "pinhead-island"
 
+[UserProfiles]
+  ;# {ProfileURL} {} {Set url to UserProfilesService} {}
+  ;; Set the value of the url to your UserProfilesService
+  ;; If un-set / "" the module is disabled
+  ;; ProfileServiceURL = http://127.0.0.1:8002
+
 [Architecture]
     ;# {Include-Architecture} {} {Choose one of the following architectures} {config-include/Standalone.ini config-include/StandaloneHypergrid.ini config-include/Grid.ini config-include/GridHypergrid.ini config-include/SimianGrid.ini config-include/HyperSimianGrid.ini} config-include/Standalone.ini
     ;; Uncomment one of the following includes as required.  For instance, to create a standalone OpenSim,
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 3eaef61..67963a5 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -43,9 +43,14 @@
     ; 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
+    ;
+    ; UnsafeQueueUserWorkItem refers to the fact that the code creating the event could elevate its security 
+    ; privileges.  However, as calling code is trusted anyway this is safe (if you set
+    ;  TrustedBinaries = true in the [XEngine] section then you already have to trust that incoming code for other reasons).
     async_call_method = SmartThreadPool
 
     ; Max threads to allocate on the FireAndForget thread pool
@@ -81,6 +86,13 @@
     ;; from the selected region_info_source.
     allow_regionless = false
 
+        ;; Allow child agents to see into the region even if their root counterpart isn't allowed in here
+        see_into_region = true
+
+    ; 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
 
@@ -252,8 +264,15 @@
 
     ; Simulator Stats URI
     ; Enable JSON simulator data by setting a URI name (case sensitive)
+    ; Returns regular sim stats (SimFPS, ...)
     ; Stats_URI = "jsonSimStats"
 
+    ; Simulator StatsManager URI
+    ; Enable fetch of StatsManager registered stats. Fetch is query which can optionally
+    ; specify category, container and stat to fetch. If not selected, returns all of that type.
+    ; http://simulatorHTTPport/ManagedStats/?cat=Category&cont=Container&stat=Statistic
+    ; ManagedStatsRemoteFetchURI = "ManagedStats"
+
     ; Make OpenSim start all regions woth logins disabled. They will need
     ; to be enabled from the console if this is set
     ; StartDisabled = false
@@ -368,6 +387,19 @@
     AllowRegionRestartFromClient = true
 
 
+[UserProfiles]
+  ;# {ProfileURL} {} {Set url to UserProfilesService} {}
+  ;; Set the value of the url to your UserProfilesService
+  ;; If un-set / "" the module is disabled
+  ;; If the ProfileURL is not set, then very BASIC
+  ;; profile support will be configured. If the ProfileURL is set to a 
+  ;; valid URL, then full profile support will be configured. The URL 
+  ;; points to your grid's Robust user profiles service
+  ;; 
+  ; ProfileURL = http://127.0.0.1:9000
+
+
+
 [SMTP]
     enabled = false
 
@@ -536,7 +568,6 @@
     ;; in OpenSim.ini
     ;;
     Cap_AttachmentResources = ""
-    Cap_AvatarPickerSearch = ""
     Cap_ChatSessionRequest = ""
     Cap_CopyInventoryFromNotecard = "localhost"
     Cap_DispatchRegionInfo = ""
@@ -600,6 +631,10 @@
     Cap_WebFetchInventoryDescendents = ""
     Cap_FetchInventoryDescendents2 = "localhost"
     Cap_FetchInventory2 = "localhost"
+
+        ; Capability for searching for people
+        Cap_AvatarPickerSearch = "localhost"
+
     
 
 [Chat]
@@ -671,12 +706,22 @@
     ; in other situations (e.g. appearance baking failures where the avatar only appears as a cloud to others).
     ResendAppearanceUpdates = true
 
+    ; Turning this on responds to CachedTexture packets to possibly avoid rebaking the avatar 
+    ; on every login
+    ReuseTextures = false
+
 
 [Attachments]
     ; Controls whether avatar attachments are enabled.
     ; Defaults to true - only set to false for debugging purposes
     Enabled = true
 
+    ; Controls the number of milliseconds that are slept per 100 prims rezzed in attachments
+    ; Experimental setting to control CPU spiking when avatars with many attachments login/change outfit
+    ; or when multiple avatars with medium level attachments login/change outfit simultaneously.
+    ; If 0 then no throttling is performed.
+    ThrottlePer100PrimsRezzed = 0;
+
 
 [Mesh]
     ; enable / disable Collada mesh support
@@ -891,71 +936,82 @@
     ; ## 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
+    ; 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.
+    ; 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
 
 [BulletSim]
-    ; World parameters
-
-    ; There are two bullet physics libraries, bulletunmanaged is the default and is a native c++ dll
-    ; bulletxna is a managed C# dll.  They have comparible functionality..   the c++ is much faster.
+    ; All the BulletSim parameters can be displayed with the console command
+    ;   "physics get all" and all are defined in the source file
+    ;    OpenSim/Regions/Physics/BulletSPlugin/BSParam.cs.
 
+    ; There are two bullet physics libraries, bulletunmanaged is the default and is a
+    ;   native c++ dll bulletxna is a managed C# dll.  They have comparible functionality
+    ;   but the c++ one is much faster.
     BulletEngine = "bulletunmanaged"
     ; BulletEngine = "bulletxna"
 
-    ; Terrain Implementation {1|0} 0 for HeightField, 1 for Mesh terrain.  If you're using the bulletxna engine, 
-    ;  you will want to switch to the heightfield option
-    TerrainImplementation = 1
-    ; TerrainImplementation = 0
-
-    Gravity = -9.80665
-
-    TerrainFriction = 0.30
-    TerrainHitFraction = 0.8
-    TerrainRestitution = 0
-    TerrainCollisionMargin = 0.04
-
-    AvatarFriction = 0.2
-    AvatarStandingFriction = 0.95
-    AvatarRestitution = 0.0
-    AvatarDensity = 3.5
-    AvatarCapsuleWidth = 0.6
-    AvatarCapsuleDepth = 0.45
-    AvatarCapsuleHeight = 1.5
-    AvatarContactProcessingThreshold = 0.1
+    ; BulletSim can run on its own thread independent of the simulator's heartbeat
+    ;   thread. Enabling this will nto let the physics engine slow down avatar movement, etc.
+    UseSeparatePhysicsThread = false
 
-    MaxObjectMass = 10000.01
-
-    CollisionMargin = 0.04
-
-    ; Linkset implmentation
+    ; Terrain implementation can use either Bullet's heightField or BulletSim can build
+    ;   a mesh. 0=heightField, 1=mesh
+    TerrainImplementation = 1
+    ; For mesh terrain, the detail of the created mesh. '1' gives 256x256 (heightfield
+    ;   resolution). '2' gives 512x512. Etc. Cannot be larger than '4'. Higher
+    ;   magnification uses lots of memory.
+    TerrainMeshMagnification = 2
+
+    ; Avatar physics height adjustments.
+    ;   http://opensimulator.org/wiki/BulletSim#Adjusting_Avatar_Height
+    AvatarHeightLowFudge = -0.2     ; Adjustment at low end of height range
+    AvatarHeightMidFudge = 0.1      ; Adjustment at mid point of avatar height range
+    AvatarHeightHighFudge = 0.1     ; Adjustment at high end of height range
+
+    ; Default linkset implmentation
+    ; 'Constraint' uses physics constraints to hold linkset together. 'Compound'
+    ;    builds a compound shape from the children shapes to create a single physical
+    ;    shape. 'Compound' uses a lot less CPU time.
     LinkImplementation = 1      ; 0=constraint, 1=compound
 
-    ; Whether to mesh sculpties
+        ; If 'true', offset a linkset's origin based on mass of linkset parts.
+        LinksetOffsetCenterOfMass = false
+
+    ; If 'true', turn scuplties into meshes
     MeshSculptedPrim = true
 
     ; If 'true', force simple prims (box and sphere) to be meshed
+    ; If 'false', the Bullet native special case shape is used for square rectangles
+    ;   and even dimensioned spheres.
     ForceSimplePrimMeshing = false
 
-    ; Bullet step parameters
-    MaxSubSteps = 10
-    FixedTimeStep = .01667
+    ; If 'true', when creating meshes, remove all triangles that have two equal vertexes.
+    ;   Happens often in sculpties. If turned off, there will be some doorways
+    ;   that cannot be walked through.
+    ShouldRemoveZeroWidthTriangles = true
+
+    ; If 'true', use convex hull definition in mesh asset if present.
+    ShouldUseAssetHulls = true
 
+    ; If there are thousands of physical objects, these maximums should be increased.
     MaxCollisionsPerFrame = 2048
     MaxUpdatesPerFrame = 8192
 
-    ; Detailed physics debug logging
+    ; Detailed physics debug logging. Very verbose.
     PhysicsLoggingEnabled = False
     PhysicsLoggingDir = "."
     VehicleLoggingEnabled = False
@@ -1570,7 +1626,7 @@
 
     ; Experimental option to only message cached online users rather than all users
     ; Should make large group with few online members messaging faster, as the expense of more calls to ROBUST presence service
-    ; This currently only applies to the Flotsam XmlRpc backend
+        ; (Flotsam groups only; in V2 this is always on)
     MessageOnlineUsersOnly = false
 
     ; Service connectors to the Groups Service.  Select one depending on whether you're using a Flotsam XmlRpc backend or a SimianGrid backend
@@ -1688,5 +1744,9 @@ MaxStringSpace = 0
         ;; {MaxDistance} {} {Cut-off distance at which sounds will not be sent to users} {100.0}
         MaxDistance = 100.0
 
+[ServiceThrottle]
+    ;; Default time interval (in ms) for the throttle service thread to wake up
+    Interval = 5000
+
 [Modules]
     Include-modules = "addon-modules/*/config/*.ini"
diff --git a/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config b/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config
index 1bc7e41..2763525 100755
--- a/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config
+++ b/bin/Physics/OpenSim.Region.Physics.BulletSPlugin.dll.config
@@ -1,6 +1,8 @@
 <configuration>
   <dllmap os="windows" cpu="x86" dll="BulletSim" target="lib32/BulletSim" />
   <dllmap os="windows" cpu="x86-64,ia64" dll="BulletSim" target="lib64/BulletSim" />
+  <dllmap os="osx" cpu="x86" dll="BulletSim" target="lib32/libBulletSim.dylib" />
+  <dllmap os="osx" cpu="x86-64,ia64" dll="BulletSim" target="lib32/libBulletSim.dylib" />
   <dllmap os="!windows,osx" cpu="x86" dll="BulletSim" target="lib32/libBulletSim.so" />
   <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="BulletSim" target="lib64/libBulletSim.so" />
 </configuration>
diff --git a/bin/Robust.32BitLaunch.exe.config b/bin/Robust.32BitLaunch.exe.config
index dae45ff..ec17049 100644
--- a/bin/Robust.32BitLaunch.exe.config
+++ b/bin/Robust.32BitLaunch.exe.config
@@ -11,22 +11,44 @@
   </appSettings>
   <log4net>
     <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
+      <filter type="log4net.Filter.LoggerMatchFilter">
+        <loggerToMatch value="special"/>
+        <acceptOnMatch value="false"/>
+      </filter>
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
       </layout>
     </appender>
+
     <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
       <file value="Robust.32BitLaunch.log" />
       <appendToFile value="true" />
+      <filter type="log4net.Filter.LoggerMatchFilter">
+        <loggerToMatch value="special"/>
+        <acceptOnMatch value="false"/>
+      </filter>
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date %-5level - %logger %message%newline" />
       </layout>
     </appender>
 
+    <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
+      <file value="RobustStats.log"/>
+      <appendToFile value="true" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date - %message%newline" />
+      </layout>
+    </appender>
+
     <root>
       <level value="DEBUG" />
       <appender-ref ref="Console" />
       <appender-ref ref="LogFileAppender" />
     </root>
+
+    <!-- used for stats recording -->
+    <logger name="special.StatsLogger">
+      <appender-ref ref="StatsLogFileAppender"/>
+    </logger>
   </log4net>
 </configuration>
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 581c31d..8fe6d0c 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -21,18 +21,21 @@
 ; * [[<ConfigName>@]<port>/]<dll name>[:<class name>]
 ; *
 [Startup]
-
-        ; Plugin Registry Location
-        ; Set path to directory for plugin registry. Information
-        ; about the registered repositories and installed plugins
-        ; will be stored here
-        ; The Robust.exe process must have R/W access to the location 
-        RegistryLocation = "."
-
-        ; Modular configurations
-        ; Set path to directory for modular ini files...
-        ; The Robust.exe process must have R/W access to the location 
-        ConfigDirectory = "/home/opensim/etc/Configs"
+  ; Place to create a PID file
+  ; If no path if specified then a PID file is not created.
+  ; PIDFile = "/tmp/my.pid"
+
+  ; Plugin Registry Location
+  ; Set path to directory for plugin registry. Information
+  ; about the registered repositories and installed plugins
+  ; will be stored here
+  ; The Robust.exe process must have R/W access to the location 
+  RegistryLocation = "."
+
+  ; Modular configurations
+  ; Set path to directory for modular ini files...
+  ; The Robust.exe process must have R/W access to the location 
+  ConfigDirectory = "."
 
 [ServiceList]
 
@@ -68,10 +71,12 @@ HGInventoryServiceConnector = "HGInventoryService@8002/OpenSim.Server.Handlers.d
 HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:AssetServiceConnector"
 ;; Uncomment this if you want Groups V2, HG to work
 ; HGGroupsServiceConnector = "8002/OpenSim.Addons.Groups.dll:HGGroupsServiceRobustConnector"
-
 ;; Additions for other add-on modules. For example:
 ;; WifiServerConnector = "8002/Diva.Wifi.dll:WifiServerConnector"
 
+;; Uncomment for UserProfiles see [UserProfilesService] to configure...
+; UserProfilesServiceConnector = "8002/OpenSim.Server.Handlers.dll:UserProfilesConnector"
+
 ; * This is common for all services, it's the network setup for the entire
 ; * server instance, if none is specified above
 ; *
@@ -146,7 +151,8 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
 ; *
 [GridService]
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
-        HypergridLinker = true
+
+    HypergridLinker = true
 
     ; Realm = "regions"
     ; AllowDuplicateNames = "True"
@@ -163,16 +169,31 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
     ;; Next, we can specify properties of regions, including default and fallback regions
     ;; The syntax is: Region_<RegionName> = "<flags>"
     ;; or:            Region_<RegionID> = "<flags>"
-    ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut,Reservation,NoMove,Authenticate
-    ;; For example: 
+    ;; where <flags> can be DefaultRegion, DefaultHGRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut, Reservation, NoMove, Authenticate
+    ;;  
+    ;; DefaultRegion    If a local login cannot be placed in the required region (e.g. home region does not exist, avatar is not allowed entry, etc.)
+    ;;                  then this region becomes the destination.  Only the first online default region will be used.  If no DefaultHGRegion
+    ;;                  is specified then this will also be used as the region for hypergrid connections that require it (commonly because they have not specified
+    ;;                  an explicit region.
+    ;;  
+    ;; DefaultHGRegion  If an avatar connecting via the hypergrid does not specify a region, then they are placed here.  Only the first online
+    ;;                  region will be used.
+    ;;  
+    ;; FallbackRegion   If the DefaultRegion is not available for a local login, then any FallbackRegions are tried instead.  These are tried in the 
+    ;;                  order specified.  This only applies to local logins at this time, not Hypergrid connections.
+    ;;  
+    ;; NoDirectLogin    A hypergrid user cannot directly connect to this region.  This does not apply to local logins.
+    ;;  
+    ;; Persistent       When the simulator is shutdown, the region is signalled as offline but left registered on the grid.
+    ;;
     ; Region_Welcome_Area = "DefaultRegion, FallbackRegion"
     ; (replace spaces with underscore)
 
-        ;; Allow Hyperlinks to be created at the console
+    ;; Allow Hyperlinks to be created at the console
     HypergridLinker = true
 
-        ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
-        ; GatekeeperURI = "http://127.0.0.1:8002"
+    ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
+    ; GatekeeperURI = "http://127.0.0.1:8002"
 
 
 ; * This is the configuration for the freeswitch server in grid mode
@@ -306,6 +327,9 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
     ;; Ask co-operative viewers to use a different currency name
     ;Currency = ""
 
+    ;; Set minimum fee to publish classified
+    ; ClassifiedFee = 0
+
     WelcomeMessage = "Welcome, Avatar!"
     AllowRemoteSetLoginLevel = "false"
 
@@ -322,6 +346,12 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
     ; For V2/V3 webapp authentication SSO
     ; OpenIDServerURL = "http://127.0.0.1/openid/openidserver/"
 
+    ; For V3 destination guide
+    ; DestinationGuide = "http://127.0.0.1/guide"
+
+    ; For V3 avatar picker (( work in progress ))
+    ; AvatarPicker = "http://127.0.0.1/avatars"
+
     ; If you run this login server behind a proxy, set this to true
     ; HasProxy = false
     
@@ -586,4 +616,12 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
         ;; Can overwrite the default in [Hypergrid], but probably shouldn't
         ; HomeURI = "http://127.0.0.1:8002"
 
+[UserProfilesService]
+    LocalServiceModule = "OpenSim.Services.UserProfilesService.dll:UserProfilesService"
+    Enabled = false
+    ;; Configure this for separate profiles database
+    ;; ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;"
+    ;; Realm = UserProfiles
+    UserAccountService = OpenSim.Services.UserAccountService.dll:UserAccountService
+    AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
 
diff --git a/bin/Robust.exe.config b/bin/Robust.exe.config
index 4914f55..62975fd 100644
--- a/bin/Robust.exe.config
+++ b/bin/Robust.exe.config
@@ -11,6 +11,10 @@
   </appSettings>
   <log4net>
     <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
+      <filter type="log4net.Filter.LoggerMatchFilter">
+        <loggerToMatch value="special"/>
+        <acceptOnMatch value="false"/>
+      </filter>
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
       </layout>
@@ -19,15 +23,32 @@
     <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
       <file value="Robust.log" />
       <appendToFile value="true" />
+      <filter type="log4net.Filter.LoggerMatchFilter">
+        <loggerToMatch value="special"/>
+        <acceptOnMatch value="false"/>
+      </filter>
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date %-5level - %logger %message%newline" />
       </layout>
     </appender>
 
+    <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
+      <file value="RobustStats.log"/>
+      <appendToFile value="true" />
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date - %message%newline" />
+      </layout>
+    </appender>
+
     <root>
       <level value="DEBUG" />
       <appender-ref ref="Console" />
       <appender-ref ref="LogFileAppender" />
     </root>
+
+    <!-- used for stats recording -->
+    <logger name="special.StatsLogger">
+      <appender-ref ref="StatsLogFileAppender"/>
+    </logger>
   </log4net>
 </configuration>
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index d932ce7..de6fc28 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -13,19 +13,21 @@
 ; * [[<ConfigName>@]<port>/]<dll name>[:<class name>]
 ; *
 [Startup]
-
-        ; Plugin Registry Location
-        ; Set path to directory for plugin registry. Information
-        ; about the registered repositories and installed plugins
-        ; will be stored here
-        ; The Robust.exe process must hvae R/W access to the location 
-        RegistryLocation = "."
-
-
-        ; Modular configurations
-        ; Set path to directory for modular ini files...
-        ; The Robust.exe process must hvae R/W access to the location 
-        ConfigDirectory = "/home/opensim/etc/Configs"
+  ; Place to create a PID file
+  ; If no path if specified then a PID file is not created.
+  ; PIDFile = "/tmp/my.pid"
+
+  ; Plugin Registry Location
+  ; Set path to directory for plugin registry. Information
+  ; about the registered repositories and installed plugins
+  ; will be stored here
+  ; The Robust.exe process must have R/W access to the location 
+  RegistryLocation = "."
+
+  ; Modular configurations
+  ; Set path to directory for modular ini files...
+  ; The Robust.exe process must have R/W access to the location 
+  ConfigDirectory = "."
 
 [ServiceList]
 AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector"
@@ -49,6 +51,8 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
 ;; Uncomment this if you want Groups V2 to work
 ;GroupsServiceConnector = "8003/OpenSim.Addons.Groups.dll:GroupsServiceRobustConnector"
 
+;; Uncomment for UserProfiles see [UserProfilesService] to configure...
+; UserProfilesServiceConnector = "8002/OpenSim.Server.Handlers.dll:UserProfilesConnector"
 
 ; * This is common for all services, it's the network setup for the entire
 ; * server instance, if none is specified above
@@ -128,8 +132,24 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
     ;; Next, we can specify properties of regions, including default and fallback regions
     ;; The syntax is: Region_<RegionName> = "<flags>"
     ;; or:            Region_<RegionID> = "<flags>"
-    ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut,Reservation,NoMove,Authenticate
-    ;; For example:
+    ;; where <flags> can be DefaultRegion, DefaultHGRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut, Reservation, NoMove, Authenticate
+    ;;
+    ;; DefaultRegion    If a local login cannot be placed in the required region (e.g. home region does not exist, avatar is not allowed entry, etc.)
+    ;;                  then this region becomes the destination.  Only the first online default region will be used.  If no DefaultHGRegion
+    ;;                  is specified then this will also be used as the region for hypergrid connections that require it (commonly because they have not specified
+    ;;                  an explicit region.
+    ;;
+    ;; DefaultHGRegion  If an avatar connecting via the hypergrid does not specify a region, then they are placed here.  Only the first online
+    ;;                  region will be used.
+    ;;
+    ;; FallbackRegion   If the DefaultRegion is not available for a local login, then any FallbackRegions are tried instead.  These are tried in the 
+    ;;                  order specified.  This only applies to local logins at this time, not Hypergrid connections.
+    ;;
+    ;; NoDirectLogin    A hypergrid user cannot directly connect to this region.  This does not apply to local logins.
+    ;;
+    ;; Persistent       When the simulator is shutdown, the region is signalled as offline but left registered on the grid.
+    ;;
+    ;; Example specification:
     ; Region_Welcome_Area = "DefaultRegion, FallbackRegion"
     ; (replace spaces with underscore)
 
@@ -270,6 +290,9 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
     ; Ask co-operative viewers to use a different currency name
     ;Currency = ""
 
+    ;; Set minimum fee to publish classified
+    ; ClassifiedFee = 0
+
     WelcomeMessage = "Welcome, Avatar!"
     AllowRemoteSetLoginLevel = "false"
 
@@ -286,6 +309,12 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
     ; For V2/V3 webapp authentication SSO
     ; OpenIDServerURL = "http://127.0.0.1/openid/openidserver/"
 
+    ; For V3 destination guide
+    ; DestinationGuide = "http://127.0.0.1/guide"
+
+    ; For V3 avatar picker (( work in progress ))
+    ; AvatarPicker = "http://127.0.0.1/avatars"
+
     ; If you run this login server behind a proxy, set this to true
     ; HasProxy = false
 
@@ -383,4 +412,13 @@ MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnecto
     ; password help: optional: page providing password assistance for users of your grid
     ;password = http://127.0.0.1/password
 
+[UserProfilesService]
+    LocalServiceModule = "OpenSim.Services.UserProfilesService.dll:UserProfilesService"
+    Enabled = false
+    ;; Configure this for separate profiles database
+    ;; ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=*****;Old Guids=true;"
+    ;; Realm = UserProfiles
+    UserAccountService = OpenSim.Services.UserAccountService.dll:UserAccountService
+    AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+
 
diff --git a/bin/assets/TexturesAssetSet/IMG_BLOOM1.jp2 b/bin/assets/TexturesAssetSet/IMG_BLOOM1.jp2
new file mode 100644
index 0000000..8186d49
--- /dev/null
+++ b/bin/assets/TexturesAssetSet/IMG_BLOOM1.jp2
diff --git a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
index a4a0cba..a29ac38 100644
--- a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
+++ b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
@@ -746,4 +746,16 @@
      <Key Name="assetType" Value="0" />
      <Key Name="fileName" Value="735198cf-6ea0-2550-e222-21d3c6a341ae.j2c" />
   </Section>
+
+  <!-- 
+    Texture expected by viewers for properly displaying stars in the night sky
+    Name derives from label in viewer code
+  -->
+  <Section Name="IMG_BLOOM1 Texture">
+    <Key Name="assetID" Value="3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3bef"/>
+    <Key Name="name" Value="IMG_BLOOM1 Texture"/>
+    <Key Name="assetType" Value="0" />
+    <Key Name="fileName" Value="IMG_BLOOM1.jp2" />
+  </Section>
+
 </Nini>
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index cb3a5c8..1837bdd 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -23,12 +23,24 @@
     InventoryAccessModule       = "BasicInventoryAccessModule"
     LandServices            = "RemoteLandServicesConnector"
         MapImageService                 = "MapImageServiceModule"
+        SearchModule                    = "BasicSearchModule"
     
     LandServiceInConnector                      = true
     NeighbourServiceInConnector         = true
     SimulationServiceInConnector        = true
     LibraryModule                                       = true
 
+[SimulationService]
+    ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
+    ; It is used to control the teleport handoff process.
+    ; Valid values are 
+    ; "SIMULATION/0.2"
+    ;   - this is the default.  A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol
+    ;   - this protocol is more efficient than "SIMULATION/0.1"
+    ; "SIMULATION/0.1" 
+    ;   - this is an older teleport protocol used in OpenSimulator 0.7.5 and before.
+    ConnectorProtocolVersion = "SIMULATION/0.2"
+
 [SimulationDataStore]
     LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
 
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index d12ea5b..920a691 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -205,3 +205,12 @@
         ; DisallowResidents -- only Admins and Managers allowed
         ; Example:
         ; Region_Test_1 = "DisallowForeigners"
+
+
+;; Uncomment if you are using SimianGrid for grid services
+[SimianGrid]
+        ;; SimianGrid services URL
+        ;; SimianServiceURL = "http://grid.sciencesim.com/Grid/"
+
+        ;; Capability assigned by the grid administrator for the simulator
+        ;; SimulatorCapability = "00000000-0000-0000-0000-000000000000"
\ No newline at end of file
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 31a4059..7edcafb 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -28,6 +28,7 @@
         FriendsModule                   = "HGFriendsModule"
         MapImageService                 = "MapImageServiceModule"
         UserManagementModule    = "HGUserManagementModule"
+        SearchModule                    = "BasicSearchModule"
     
     LandServiceInConnector                      = true
     NeighbourServiceInConnector         = true
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index ba72fe7..7b7beb2 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -19,12 +19,24 @@
     EntityTransferModule    = "BasicEntityTransferModule"
     InventoryAccessModule   = "BasicInventoryAccessModule"
     MapImageService                     = "MapImageServiceModule"
+        SearchModule                    = "BasicSearchModule"
 
     LibraryModule              = true
     LLLoginServiceInConnector  = true
     GridInfoServiceInConnector = true
     MapImageServiceInConnector = true
 
+[SimulationService]
+    ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
+    ; It is used to control the teleport handoff process.
+    ; Valid values are 
+    ; "SIMULATION/0.2"
+    ;   - this is the default.  A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol 
+    ;   - this protocol is more efficient than "SIMULATION/0.1"
+    ; "SIMULATION/0.1" 
+    ;   - this is an older teleport protocol used in OpenSimulator 0.7.5 and before.
+    ConnectorProtocolVersion = "SIMULATION/0.2"
+
 [SimulationDataStore]
     LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
 
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index f80044e..f7545d4 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -81,11 +81,27 @@
     ;; Next, we can specify properties of regions, including default and fallback regions
     ;; The syntax is: Region_<RegioName> = "<flags>"
     ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut
+    ;;  
+    ;; DefaultRegion    If a local login cannot be placed in the required region (e.g. home region does not exist, avatar is not allowed entry, etc.)
+    ;;                  then this region becomes the destination.  Only the first online default region will be used.  If no DefaultHGRegion
+    ;;                  is specified then this will also be used as the region for hypergrid connections that require it (commonly because they have not specified
+    ;;                  an explicit region.
+    ;;  
+    ;; DefaultHGRegion  If an avatar connecting via the hypergrid does not specify a region, then they are placed here.  Only the first online
+    ;;                  region will be used.
+    ;;  
+    ;; FallbackRegion   If the DefaultRegion is not available for a local login, then any FallbackRegions are tried instead.  These are tried in the 
+    ;;                  order specified.  This only applies to local logins at this time, not Hypergrid connections.
+    ;;  
+    ;; NoDirectLogin    A hypergrid user cannot directly connect to this region.  This does not apply to local logins.
+    ;;  
+    ;; Persistent       When the simulator is shutdown, the region is signalled as offline but left registered on the grid.
+    ;;
     ;; For example:
     Region_Welcome_Area = "DefaultRegion, FallbackRegion"
 
     ; === HG ONLY ===
-        ;; If you have this set under [Startup], no need to set it here, leave it commented
+    ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
     ; GatekeeperURI="http://127.0.0.1:9000"
 
 [LibraryModule]
@@ -94,7 +110,7 @@
 
 [LoginService]
     WelcomeMessage = "Welcome, Avatar!"
-        ;; If you have Gatekeeper set under [Startup], no need to set it here, leave it commented
+    ;; If you have Gatekeeper set under [Hypergrid], no need to set it here, leave it commented
     ; GatekeeperURI = "http://127.0.0.1:9000"
 
     SRV_HomeURI = "http://127.0.0.1:9000"    
@@ -115,6 +131,9 @@
     ;; Ask co-operative viewers to use a different currency name
     ;Currency = ""
 
+    ;; Set minimum fee to publish classified
+    ; ClassifiedFee = 0
+
     ;; Regular expressions for controlling which client versions are accepted/denied.
     ;; An empty string means nothing is checked.
     ;;
@@ -240,7 +259,7 @@
 ;; HG configurations
 ;;
 [GatekeeperService]
-        ;; If you have GatekeeperURI set under [Startup], no need to set it here, leave it commented
+        ;; If you have GatekeeperURI set under [Hypergrid], no need to set it here, leave it commented
     ; ExternalName = "http://127.0.0.1:9000"
 
     ; Does this grid allow incoming links to any region in it?
@@ -297,11 +316,11 @@
     ; AllowExcept_Level_200 = "http://griefer.com:8002, http://enemy.com:8002"
 
 [HGInventoryService]
-        ;; If you have this set under [Startup], no need to set it here, leave it commented
+        ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
     ; HomeURI = "http://127.0.0.1:9000"
 
 [HGAssetService]
-        ;; If you have this set under [Startup], no need to set it here, leave it commented
+        ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
     ; HomeURI = "http://127.0.0.1:9000"
 
     ;; The asset types that this grid can export to / import from other grids.
@@ -318,7 +337,7 @@
 
 
 [HGInventoryAccessModule]
-        ;; If you have these set under [Startup], no need to set it here, leave it commented
+        ;; If you have these set under [Hypergrid], no need to set it here, leave it commented
     ; HomeURI = "http://127.0.0.1:9000"
         ; GatekeeperURI = "http://127.0.0.1:9000"
 
@@ -337,7 +356,7 @@
 
 [Messaging]
     ; === HG ONLY ===
-        ;; If you have this set under [Startup], no need to set it here, leave it commented
+        ;; If you have this set under [Hypergrid], no need to set it here, leave it commented
     ; GatekeeperURI = "http://127.0.0.1:9000"
 
 
@@ -352,3 +371,19 @@
         ;; If appearance is restricted, which accounts' appearances are allowed to be exported?
         ;; Comma-separated list of account names
     AccountForAppearance = "Test User, Astronaut Smith"
+
+;; UserProfiles Service
+;;
+;; To use, set Enabled to true then configure for your site...
+[UserProfilesService]
+    LocalServiceModule = "OpenSim.Services.UserProfilesService.dll:UserProfilesService"
+    Enabled = false
+
+    ;; Configure this for separate databse
+    ; ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
+    ; Realm = UserProfiles
+
+    UserAccountService = OpenSim.Services.UserAccountService.dll:UserAccountService
+    AuthenticationServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
+
+
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 195e780..3abf49b 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -19,11 +19,13 @@
     GridUserServices        = "LocalGridUserServicesConnector"
     SimulationServices          = "RemoteSimulationConnectorModule"
     AvatarServices                      = "LocalAvatarServicesConnector"
+    UserProfilesServices    = "LocalUserProfilesServicesConnector"
         MapImageService                 = "MapImageServiceModule"
     EntityTransferModule        = "HGEntityTransferModule"
     InventoryAccessModule       = "HGInventoryAccessModule"
     FriendsModule                       = "HGFriendsModule"
         UserManagementModule    = "HGUserManagementModule"
+        SearchModule                    = "BasicSearchModule"
     
     InventoryServiceInConnector                 = true
     AssetServiceInConnector                             = true
@@ -55,8 +57,6 @@
     HypergridAssetService = "OpenSim.Services.Connectors.dll:HGAssetServiceConnector"
 
 [InventoryService]
-    LocalServiceModule    = "OpenSim.Services.InventoryService.dll:XInventoryService"
-
     ; For HGInventoryBroker
     LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:XInventoryService"
 
@@ -147,6 +147,9 @@
     FriendsService      = "OpenSim.Services.FriendsService.dll:FriendsService"
     UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
 
+    ;; This switch creates the minimum set of body parts and avatar entries for a viewer 2 to show a default "Ruth" avatar rather than a cloud.
+    CreateDefaultAvatarEntries = true
+
         
 ;; The interface that local users get when they are in other grids
 ;; This greatly restricts the inventory operations while in other grids
@@ -183,7 +186,6 @@
         UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
         InGatekeeper = True
 
-
 ;; This should always be the very last thing on this file
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"
diff --git a/bin/data/LICENSE-README-IMPORTANT.txt b/bin/data/LICENSE-README-IMPORTANT.txt
index a1ac20c..dd8671d 100644
--- a/bin/data/LICENSE-README-IMPORTANT.txt
+++ b/bin/data/LICENSE-README-IMPORTANT.txt
@@ -2,4 +2,4 @@ Not all of the files in this directory are licensed under the BSD license. Some
 
 These files are:
 
-- avataranimations.xml (Derivative work of viewerart.ini, Creative Commons Attribution+Share-Alike v2.5 License)

+- avataranimations.xml (Derivative work of viewerart.ini, Creative Commons Attribution+Share-Alike v2.5 License)
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 689b34f..bc0e222 100755
--- a/bin/lib32/BulletSim.dll
+++ b/bin/lib32/BulletSim.dll
diff --git a/bin/lib32/libBulletSim.dylib b/bin/lib32/libBulletSim.dylib
new file mode 100755
index 0000000..02f8a7f
--- /dev/null
+++ b/bin/lib32/libBulletSim.dylib
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index b8c813e..e09dd27 100755
--- a/bin/lib32/libBulletSim.so
+++ b/bin/lib32/libBulletSim.so
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index 33c4d08..5fc09f6 100755
--- a/bin/lib64/BulletSim.dll
+++ b/bin/lib64/BulletSim.dll
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index 79207fe..925269d 100755
--- a/bin/lib64/libBulletSim.so
+++ b/bin/lib64/libBulletSim.so
diff --git a/bin/libopenjpeg-dotnet-2-1.5.0-dotnet-1-i686.so b/bin/libopenjpeg-dotnet-2-1.5.0-dotnet-1-i686.so
new file mode 100644
index 0000000..193eca4
--- /dev/null
+++ b/bin/libopenjpeg-dotnet-2-1.5.0-dotnet-1-i686.so
diff --git a/bin/libopenjpeg-dotnet-2-1.5.0-dotnet-1-x86_64.so b/bin/libopenjpeg-dotnet-2-1.5.0-dotnet-1-x86_64.so
new file mode 100644
index 0000000..7a9bdfc
--- /dev/null
+++ b/bin/libopenjpeg-dotnet-2-1.5.0-dotnet-1-x86_64.so
diff --git a/bin/libopenjpeg-dotnet-2-1.5.0-dotnet-1.dylib b/bin/libopenjpeg-dotnet-2-1.5.0-dotnet-1.dylib
new file mode 100644
index 0000000..91f7264
--- /dev/null
+++ b/bin/libopenjpeg-dotnet-2-1.5.0-dotnet-1.dylib
diff --git a/bin/pCampBot.ini.example b/bin/pCampBot.ini.example
new file mode 100644
index 0000000..2952bb0
--- /dev/null
+++ b/bin/pCampBot.ini.example
@@ -0,0 +1,19 @@
+; This is the example config file for pCampbot
+; To use it, copy this file to pCampbot.ini and change settings if required
+
+[BotManager]
+  ; Number of milliseconds to wait between bot logins
+  LoginDelay = 5000
+
+[Bot]
+  ; Control whether bots should regularly send agent updates
+  ; Not doing this will reduce CPU requirements for pCampbot but greatly 
+  ; reduce the realism compared to viewers which are constantly sending AgentUpdates UDP packets.
+  ; Defaults to true.
+  SendAgentUpdates = true
+
+  ; Control whether bots will requests textures when receiving object information
+  ; Not doing this will reduce CPU requirements for pCampbot but greatly 
+  ; reduce the realism compared to viewers which requests such texture data if not already cached.
+  ; Defaults to true.
+  RequestObjectTextures = true
diff --git a/prebuild.xml b/prebuild.xml
index 20b9c9d..87c07a7 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -157,6 +157,7 @@
       <Reference name="System"/>
       <Reference name="System.Core"/>
       <Reference name="log4net" path="../../../bin/"/>
+      <Reference name="Nini" path="../../../bin/"/>
       <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
       <Reference name="OpenMetaverse" path="../../../bin/"/>
       <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
@@ -282,6 +283,7 @@
       <Reference name="System.Data"/>
       <Reference name="XMLRPC" path="../../bin/"/>
       <Reference name="OpenMetaverse" path="../../bin/"/>
+      <Reference name="OpenMetaverse.StructuredData" path="../../bin/"/>
       <Reference name="OpenMetaverseTypes" path="../../bin/"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="log4net" path="../../bin/"/>
@@ -862,6 +864,7 @@
       <Reference name="Mono.Addins.Setup" path="../../../bin/"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Framework.Monitoring"/>
       <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>
       <Reference name="Nini" path="../../../bin/"/>
@@ -985,8 +988,10 @@
       <Reference name="Mono.Addins" path="../../../bin/"/>
       <Reference name="OpenSim.Data"/>
       <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Capabilities"/>
       <Reference name="OpenSim.Framework.Communications"/>
       <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
       <Reference name="OpenSim.Region.Framework"/>
       <Reference name="OpenSim.Server.Base"/>
       <Reference name="OpenSim.Services.Base"/>
@@ -1360,6 +1365,42 @@
       </Files>
     </Project>
 
+    <Project frameworkVersion="v3_5" name="OpenSim.Services.UserProfilesService" path="OpenSim/Services/UserProfilesService" 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="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
+      <Reference name="OpenSim.Services.UserAccountService"/>
+      <Reference name="OpenSim.Services.Interfaces"/>
+      <Reference name="OpenSim.Services.Connectors"/>
+      <Reference name="OpenSim.Services.Base"/>
+      <Reference name="OpenSim.Server.Base"/>
+      <Reference name="OpenSim.Data"/>
+      <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
+      <Reference name="OpenMetaverse" path="../../../bin/"/>
+      <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
+      <Reference name="Nini" path="../../../bin/"/>
+      <Reference name="log4net" path="../../../bin/"/>
+
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
+
     <Project frameworkVersion="v3_5" name="OpenSim.Server.Handlers" path="OpenSim/Server/Handlers" type="Library">
       <Configuration name="Debug">
         <Options>
@@ -1563,6 +1604,7 @@
       <Reference name="System.Drawing"/>
       <Reference name="System.Xml"/>
       <Reference name="System.Web"/>
+      <Reference name="NDesk.Options" path="../../../../../bin/"/>
       <Reference name="OpenMetaverseTypes" path="../../../../../bin/"/>
       <Reference name="OpenMetaverse.StructuredData" path="../../../../../bin/"/>
       <Reference name="OpenMetaverse" path="../../../../../bin/"/>
@@ -1760,6 +1802,7 @@
       <Reference name="System.Xml"/>
       <Reference name="System.Drawing"/>
       <Reference name="System.Web"/>
+      <Reference name="Ionic.Zip" path="../../../bin/"/>
       <Reference name="NDesk.Options" path="../../../bin/"/>
       <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
       <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
@@ -1879,6 +1922,7 @@
       <Reference name="OpenSim.Region.CoreModules"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Region.Physics.Meshing" path="../../../../bin/Physics/"/>
       <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/>
       <Reference name="BulletXNA.dll" path="../../../../bin/"/>
       <Reference name="log4net.dll" path="../../../../bin/"/>
@@ -2102,6 +2146,7 @@
       <Reference name="OpenSim.Data"/>
       <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
       <Reference name="OpenMetaverse" path="../../../bin/"/>
+      <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
       <Reference name="MySql.Data" path="../../../bin/"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Region.Framework"/>
@@ -2713,6 +2758,33 @@
     </Project>
 
     <!-- Test Clients -->
+    <Project frameworkVersion="v3_5" name="OpenSim.Tests.Clients.AssetClient" path="OpenSim/Tests/Clients/Assets" type="Exe">
+      <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="OpenMetaverseTypes" path="../../../../bin/"/>
+      <Reference name="OpenMetaverse" path="../../../../bin/"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Services.Interfaces"/>
+      <Reference name="OpenSim.Services.Connectors"/>
+      <Reference name="Nini" path="../../../../bin/"/>
+      <Reference name="log4net" path="../../../../bin/"/>
+
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
     <Project frameworkVersion="v3_5" name="OpenSim.Tests.Clients.GridClient" path="OpenSim/Tests/Clients/Grid" type="Exe">
       <Configuration name="Debug">
         <Options>
@@ -3181,7 +3253,10 @@
         <Match path="Avatar/AvatarFactory/Tests" pattern="*.cs" recurse="true"/>
         <Match path="Avatar/Friends/Tests" pattern="*.cs" recurse="true"/>
         <Match path="Avatar/Inventory/Archiver/Tests" pattern="*.cs" recurse="true"/>
+        <Match path="Avatar/Inventory/Transfer/Tests" pattern="*.cs" recurse="true"/>
         <Match path="Framework/InventoryAccess/Tests" pattern="*.cs" recurse="true"/>
+        <Match path="Framework/UserManagement/Tests" pattern="*.cs" recurse="true"/>
+        <Match path="Scripting/HttpRequest/Tests" pattern="*.cs" recurse="true"/>
         <Match path="Scripting/VectorRender/Tests" pattern="*.cs" recurse="true"/>
         <Match path="World/Archiver/Tests" pattern="*.cs" recurse="true"/>
         <Match buildAction="EmbeddedResource" path="World/Archiver/Tests/Resources" pattern="*"/>
@@ -3277,6 +3352,7 @@
       <Reference name="System.Runtime.Remoting"/>
       <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
       <Reference name="OpenMetaverse" path="../../../bin/"/>
+      <Reference name="OpenSim.Capabilities"/>
       <Reference name="OpenSim.Data"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Communications"/>